From cb7ef38e86573c0f3823299e1df9d7d819e0437e Mon Sep 17 00:00:00 2001 From: Jasonzzt Date: Wed, 1 Nov 2023 15:30:34 +0800 Subject: [PATCH] rerun --- .github/workflows/llm-binary-build.yml | 60 +++++++++++++------------- .github/workflows/llm_unit_tests.yml | 24 +++++------ python/llm/setup.py | 4 +- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/.github/workflows/llm-binary-build.yml b/.github/workflows/llm-binary-build.yml index 8ac7809b..fee8f6d8 100644 --- a/.github/workflows/llm-binary-build.yml +++ b/.github/workflows/llm-binary-build.yml @@ -62,8 +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 + conda remove -n python311 --all -y + conda create -n python311 python=3.11 -y - uses: actions/checkout@v3 with: repository: "intel-analytics/llm.cpp" @@ -119,18 +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: 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: @@ -143,7 +143,7 @@ jobs: make clean conda remove -n python39 --all -y conda remove -n python310 --all -y - # conda remove -n python311 --all -y + conda remove -n python311 --all -y check-linux-avx512-artifact: runs-on: ubuntu-latest @@ -446,21 +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: 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 df012e53..21bbe829 100644 --- a/.github/workflows/llm_unit_tests.yml +++ b/.github/workflows/llm_unit_tests.yml @@ -43,18 +43,18 @@ jobs: fail-fast: false matrix: include: - # - os: windows - # instruction: avx2 - # python-version: "3.9" - # - os: ubuntu-20.04-lts - # instruction: avx512 - # python-version: "3.9" - # - os: windows - # instruction: avx2 - # python-version: "3.10" - # - os: ubuntu-20.04-lts - # instruction: avx512 - # python-version: "3.10" + - os: windows + instruction: avx2 + python-version: "3.9" + - os: ubuntu-20.04-lts + instruction: avx512 + python-version: "3.9" + - os: windows + instruction: avx2 + python-version: "3.10" + - os: ubuntu-20.04-lts + instruction: avx512 + python-version: "3.10" - os: windows instruction: avx2 python-version: "3.11" diff --git a/python/llm/setup.py b/python/llm/setup.py index 22c1d4a5..44ee4578 100644 --- a/python/llm/setup.py +++ b/python/llm/setup.py @@ -87,7 +87,7 @@ windows_binarys = [ "main-chatglm_vnni.exe", "chatglm_C.cp39-win_amd64.pyd", "chatglm_C.cp310-win_amd64.pyd", - + "chatglm_C.cp311-win_amd64.pyd" ] linux_binarys = [ "libllama_avx.so", @@ -127,7 +127,7 @@ linux_binarys = [ "main-chatglm_amx", "chatglm_C.cpython-39-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 = [