From 7c7a7f2ec1169c48a2c662be8a4c11695d18e718 Mon Sep 17 00:00:00 2001
From: Jasonzzt <ziteng.zhang@intel.com>
Date: Wed, 1 Nov 2023 13:17:13 +0800
Subject: [PATCH] spr & arc ut with python3,9&3.10&3.11

---
 .github/workflows/llm-binary-build.yml | 30 ++++++++++++++++++++++++++
 .github/workflows/llm_unit_tests.yml   |  6 ++++++
 python/llm/setup.py                    |  6 ++++--
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/llm-binary-build.yml b/.github/workflows/llm-binary-build.yml
index d48fc9b8..fee8f6d8 100644
--- a/.github/workflows/llm-binary-build.yml
+++ b/.github/workflows/llm-binary-build.yml
@@ -62,6 +62,8 @@ jobs:
           conda create -n python39 python=3.9 -y
           conda remove -n python310 --all -y
           conda create -n python310 python=3.10 -y
+          conda remove -n python311 --all -y
+          conda create -n python311 python=3.11 -y
       - uses: actions/checkout@v3
         with:
           repository: "intel-analytics/llm.cpp"
@@ -117,6 +119,18 @@ jobs:
         shell: bash
         run: |
           mv src/chatglm/build/_C.cpython-310-x86_64-linux-gnu.so release/chatglm_C.cpython-310-x86_64-linux-gnu.so
+      - name: Build Chatglm Py311
+        shell: bash
+        run: |
+          source activate python311 || conda activate python311
+          cd src/chatglm
+          rm -r build
+          scl enable gcc-toolset-11 "cmake -B build"
+          scl enable gcc-toolset-11 "cmake --build build --config Release -j"
+      - name: Move Chatglm binaries Py311
+        shell: bash
+        run: |
+          mv src/chatglm/build/_C.cpython-311-x86_64-linux-gnu.so release/chatglm_C.cpython-311-x86_64-linux-gnu.so
       - name: Archive build files
         uses: actions/upload-artifact@v3
         with:
@@ -129,6 +143,7 @@ jobs:
           make clean
           conda remove -n python39 --all -y
           conda remove -n python310 --all -y
+          conda remove -n python311 --all -y
 
   check-linux-avx512-artifact:
     runs-on: ubuntu-latest
@@ -431,6 +446,21 @@ jobs:
         shell: powershell
         run: |
           mv src/chatglm/build/Release/_C.cp310-win_amd64.pyd release/chatglm_C.cp310-win_amd64.pyd
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
+      - name: Build Chatglm Py311
+        shell: powershell
+        run: |
+          cd src/chatglm
+          rm -r build
+          cmake -DAVXVNNI=ON -B build
+          cmake --build build --config Release -j
+      - name: Move Chatglm binaries Py311
+        shell: powershell
+        run: |
+          mv src/chatglm/build/Release/_C.cp311-win_amd64.pyd release/chatglm_C.cp311-win_amd64.pyd
       - name: Archive build files
         uses: actions/upload-artifact@v3
         with:
diff --git a/.github/workflows/llm_unit_tests.yml b/.github/workflows/llm_unit_tests.yml
index b9994826..a1ac64ff 100644
--- a/.github/workflows/llm_unit_tests.yml
+++ b/.github/workflows/llm_unit_tests.yml
@@ -56,6 +56,12 @@ jobs:
           - os: ubuntu-20.04-lts
             instruction: avx512
             python-version: "3.10"
+          - os: windows
+            instruction: avx2
+            python-version: "3.11"
+          - os: ubuntu-20.04-lts
+            instruction: avx512
+            python-version: "3.11"
     runs-on: [self-hosted, llm, "${{matrix.instruction}}", "${{matrix.os}}"]
     env:
       THREAD_NUM: 24
diff --git a/python/llm/setup.py b/python/llm/setup.py
index 36bacb20..44ee4578 100644
--- a/python/llm/setup.py
+++ b/python/llm/setup.py
@@ -86,7 +86,8 @@ windows_binarys = [
 
     "main-chatglm_vnni.exe",
     "chatglm_C.cp39-win_amd64.pyd",
-    "chatglm_C.cp310-win_amd64.pyd"
+    "chatglm_C.cp310-win_amd64.pyd",
+    "chatglm_C.cp311-win_amd64.pyd"
 ]
 linux_binarys = [
     "libllama_avx.so",
@@ -125,7 +126,8 @@ linux_binarys = [
     "main-chatglm_vnni",
     "main-chatglm_amx",
     "chatglm_C.cpython-39-x86_64-linux-gnu.so",
-    "chatglm_C.cpython-310-x86_64-linux-gnu.so"
+    "chatglm_C.cpython-310-x86_64-linux-gnu.so",
+    "chatglm_C.cpython-311-x86_64-linux-gnu.so"
 ]
 
 ext_lib_urls = [