This commit is contained in:
Jasonzzt 2023-11-01 15:30:34 +08:00
parent 8f6e979fad
commit cb7ef38e86
3 changed files with 44 additions and 44 deletions

View file

@ -62,8 +62,8 @@ jobs:
conda create -n python39 python=3.9 -y conda create -n python39 python=3.9 -y
conda remove -n python310 --all -y conda remove -n python310 --all -y
conda create -n python310 python=3.10 -y conda create -n python310 python=3.10 -y
# conda remove -n python311 --all -y conda remove -n python311 --all -y
# conda create -n python311 python=3.11 -y conda create -n python311 python=3.11 -y
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
repository: "intel-analytics/llm.cpp" repository: "intel-analytics/llm.cpp"
@ -119,18 +119,18 @@ jobs:
shell: bash shell: bash
run: | run: |
mv src/chatglm/build/_C.cpython-310-x86_64-linux-gnu.so release/chatglm_C.cpython-310-x86_64-linux-gnu.so 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 - name: Build Chatglm Py311
# shell: bash shell: bash
# run: | run: |
# source activate python311 || conda activate python311 source activate python311 || conda activate python311
# cd src/chatglm cd src/chatglm
# rm -r build rm -r build
# scl enable gcc-toolset-11 "cmake -B build" scl enable gcc-toolset-11 "cmake -B build"
# scl enable gcc-toolset-11 "cmake --build build --config Release -j" scl enable gcc-toolset-11 "cmake --build build --config Release -j"
# - name: Move Chatglm binaries Py311 - name: Move Chatglm binaries Py311
# shell: bash shell: bash
# run: | run: |
# mv src/chatglm/build/_C.cpython-311-x86_64-linux-gnu.so release/chatglm_C.cpython-311-x86_64-linux-gnu.so 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 - name: Archive build files
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
@ -143,7 +143,7 @@ jobs:
make clean make clean
conda remove -n python39 --all -y conda remove -n python39 --all -y
conda remove -n python310 --all -y conda remove -n python310 --all -y
# conda remove -n python311 --all -y conda remove -n python311 --all -y
check-linux-avx512-artifact: check-linux-avx512-artifact:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -446,21 +446,21 @@ jobs:
shell: powershell shell: powershell
run: | run: |
mv src/chatglm/build/Release/_C.cp310-win_amd64.pyd release/chatglm_C.cp310-win_amd64.pyd mv src/chatglm/build/Release/_C.cp310-win_amd64.pyd release/chatglm_C.cp310-win_amd64.pyd
# - name: Set up Python - name: Set up Python
# uses: actions/setup-python@v4 uses: actions/setup-python@v4
# with: with:
# python-version: "3.11" python-version: "3.11"
# - name: Build Chatglm Py311 - name: Build Chatglm Py311
# shell: powershell shell: powershell
# run: | run: |
# cd src/chatglm cd src/chatglm
# rm -r build rm -r build
# cmake -DAVXVNNI=ON -B build cmake -DAVXVNNI=ON -B build
# cmake --build build --config Release -j cmake --build build --config Release -j
# - name: Move Chatglm binaries Py311 - name: Move Chatglm binaries Py311
# shell: powershell shell: powershell
# run: | run: |
# mv src/chatglm/build/Release/_C.cp311-win_amd64.pyd release/chatglm_C.cp311-win_amd64.pyd mv src/chatglm/build/Release/_C.cp311-win_amd64.pyd release/chatglm_C.cp311-win_amd64.pyd
- name: Archive build files - name: Archive build files
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:

View file

@ -43,18 +43,18 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
# - os: windows - os: windows
# instruction: avx2 instruction: avx2
# python-version: "3.9" python-version: "3.9"
# - os: ubuntu-20.04-lts - os: ubuntu-20.04-lts
# instruction: avx512 instruction: avx512
# python-version: "3.9" python-version: "3.9"
# - os: windows - os: windows
# instruction: avx2 instruction: avx2
# python-version: "3.10" python-version: "3.10"
# - os: ubuntu-20.04-lts - os: ubuntu-20.04-lts
# instruction: avx512 instruction: avx512
# python-version: "3.10" python-version: "3.10"
- os: windows - os: windows
instruction: avx2 instruction: avx2
python-version: "3.11" python-version: "3.11"

View file

@ -87,7 +87,7 @@ windows_binarys = [
"main-chatglm_vnni.exe", "main-chatglm_vnni.exe",
"chatglm_C.cp39-win_amd64.pyd", "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 = [ linux_binarys = [
"libllama_avx.so", "libllama_avx.so",
@ -127,7 +127,7 @@ linux_binarys = [
"main-chatglm_amx", "main-chatglm_amx",
"chatglm_C.cpython-39-x86_64-linux-gnu.so", "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 = [ ext_lib_urls = [