From d2c1973ab521ebc9f935ab9f40a60be22ad704b4 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Tue, 30 Apr 2024 21:07:48 +0200 Subject: [PATCH 001/112] Update build-wheels-cuda.yaml --- .github/workflows/build-wheels-cuda.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-wheels-cuda.yaml b/.github/workflows/build-wheels-cuda.yaml index ae9e8632c..6e760309c 100644 --- a/.github/workflows/build-wheels-cuda.yaml +++ b/.github/workflows/build-wheels-cuda.yaml @@ -23,7 +23,7 @@ jobs: 'os' = @('ubuntu-20.04', 'windows-latest') 'pyver' = @("3.10", "3.11", "3.12") 'cuda' = @("12.1.1", "12.2.2", "12.3.2", "12.4.1") - 'releasetag' = @("basic") + 'releasetag' = @("basic", "AVX", "AVX512") } $matrixOut = ConvertTo-Json $matrix -Compress @@ -126,6 +126,6 @@ jobs: with: files: dist/* # Set tag_name to -cu - tag_name: ${{ github.ref_name }}-cu${{ env.CUDA_VERSION }} + tag_name: ${{ github.ref_name }}-cu${{ env.CUDA_VERSION }}-${{ env:AVXVER }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 4f0cd4139c6433c346df291d272427c7236eb504 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Tue, 30 Apr 2024 21:17:12 +0200 Subject: [PATCH 002/112] Update build-wheels-cuda.yaml --- .github/workflows/build-wheels-cuda.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-wheels-cuda.yaml b/.github/workflows/build-wheels-cuda.yaml index 6e760309c..71af4733a 100644 --- a/.github/workflows/build-wheels-cuda.yaml +++ b/.github/workflows/build-wheels-cuda.yaml @@ -23,7 +23,7 @@ jobs: 'os' = @('ubuntu-20.04', 'windows-latest') 'pyver' = @("3.10", "3.11", "3.12") 'cuda' = @("12.1.1", "12.2.2", "12.3.2", "12.4.1") - 'releasetag' = @("basic", "AVX", "AVX512") + 'releasetag' = @("basic", "AVX", "AVX2", "AVX512") } $matrixOut = ConvertTo-Json $matrix -Compress @@ -121,11 +121,12 @@ jobs: python -m build --wheel # write the build tag to the output Write-Output "CUDA_VERSION=$cudaVersion" >> $env:GITHUB_ENV + Write-Output "AVX_VERSION=$env:AVXVER" >> $env:GITHUB_ENV - uses: softprops/action-gh-release@v2 with: files: dist/* # Set tag_name to -cu - tag_name: ${{ github.ref_name }}-cu${{ env.CUDA_VERSION }}-${{ env:AVXVER }} + tag_name: ${{ github.ref_name }}-cu${{ env.CUDA_VERSION }}-${{ env.AVX_VERSION }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 04f509df2baa861ea8f776bc0c028ade892aa9fc Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 1 May 2024 20:52:23 +0200 Subject: [PATCH 003/112] revert --- .github/workflows/build-wheels-cuda.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-wheels-cuda.yaml b/.github/workflows/build-wheels-cuda.yaml index 71af4733a..ae9e8632c 100644 --- a/.github/workflows/build-wheels-cuda.yaml +++ b/.github/workflows/build-wheels-cuda.yaml @@ -23,7 +23,7 @@ jobs: 'os' = @('ubuntu-20.04', 'windows-latest') 'pyver' = @("3.10", "3.11", "3.12") 'cuda' = @("12.1.1", "12.2.2", "12.3.2", "12.4.1") - 'releasetag' = @("basic", "AVX", "AVX2", "AVX512") + 'releasetag' = @("basic") } $matrixOut = ConvertTo-Json $matrix -Compress @@ -121,12 +121,11 @@ jobs: python -m build --wheel # write the build tag to the output Write-Output "CUDA_VERSION=$cudaVersion" >> $env:GITHUB_ENV - Write-Output "AVX_VERSION=$env:AVXVER" >> $env:GITHUB_ENV - uses: softprops/action-gh-release@v2 with: files: dist/* # Set tag_name to -cu - tag_name: ${{ github.ref_name }}-cu${{ env.CUDA_VERSION }}-${{ env.AVX_VERSION }} + tag_name: ${{ github.ref_name }}-cu${{ env.CUDA_VERSION }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 34d44752af6a7a207c00ea8a2e3d44de30ec51fe Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 1 May 2024 20:57:45 +0200 Subject: [PATCH 004/112] Bump pyhton from 3.8 to 3.9 --- .github/workflows/build-and-release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 8fbd68f4a..1b557162c 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -21,7 +21,7 @@ jobs: # Used to host cibuildwheel - uses: actions/setup-python@v5 with: - python-version: "3.8" + python-version: "3.9" - name: Install dependencies run: | @@ -81,7 +81,7 @@ jobs: submodules: "recursive" - uses: actions/setup-python@v5 with: - python-version: "3.8" + python-version: "3.9" - name: Install dependencies run: | python -m pip install --upgrade pip build From f7b3dd0873f5aef2a66a1fff8aaf352fe2f3bbb5 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 1 May 2024 20:59:37 +0200 Subject: [PATCH 005/112] Remove python 3.8 --- .github/workflows/test.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 292343c2b..54c9ad582 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 @@ -37,7 +37,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 @@ -60,7 +60,7 @@ jobs: runs-on: macos-13 strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 @@ -113,10 +113,10 @@ jobs: - uses: actions/checkout@v4 with: submodules: "recursive" - - name: Set up Python 3.8 + - name: Set up Python 3.9 uses: actions/setup-python@v5 with: - python-version: "3.8" + python-version: "3.9" - name: Install dependencies run: | python3 -m pip install --upgrade pip From a9035721ff7b4a8a1878aa1203c7ba35bb88b59c Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 1 May 2024 21:00:48 +0200 Subject: [PATCH 006/112] Remove Python 3.7 and 3.8 deprecated --- .github/workflows/test-pypi.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-pypi.yaml b/.github/workflows/test-pypi.yaml index aa8e8fa0b..ecfdb8112 100644 --- a/.github/workflows/test-pypi.yaml +++ b/.github/workflows/test-pypi.yaml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - name: Set up Python ${{ matrix.python-version }} @@ -28,7 +28,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - name: Set up Python ${{ matrix.python-version }} @@ -48,7 +48,7 @@ jobs: runs-on: macos-latest strategy: matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - name: Set up Python ${{ matrix.python-version }} From e890e2efaf4cd78905ed8ead9337c62eab45694e Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 1 May 2024 21:01:37 +0200 Subject: [PATCH 007/112] Bump python from 3.8 to 3.9 --- .github/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index bc4ec9063..d96c804d1 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -16,7 +16,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.8" + python-version: "3.9" - name: Install dependencies run: | python3 -m pip install --upgrade pip build From 0ce29fe1b515c7a53f0d7f67d346e78cce248848 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 1 May 2024 21:03:15 +0200 Subject: [PATCH 008/112] Add python 3.9 --- .github/workflows/build-wheels-cuda.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-wheels-cuda.yaml b/.github/workflows/build-wheels-cuda.yaml index ae9e8632c..9b113efde 100644 --- a/.github/workflows/build-wheels-cuda.yaml +++ b/.github/workflows/build-wheels-cuda.yaml @@ -21,7 +21,7 @@ jobs: run: | $matrix = @{ 'os' = @('ubuntu-20.04', 'windows-latest') - 'pyver' = @("3.10", "3.11", "3.12") + 'pyver' = @("3.9", "3.10", "3.11", "3.12") 'cuda' = @("12.1.1", "12.2.2", "12.3.2", "12.4.1") 'releasetag' = @("basic") } From 63c74d7b3d8afd1f1d24da3c9a1c7a19ac40a721 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 1 May 2024 21:04:33 +0200 Subject: [PATCH 009/112] Add python 3.9, remove macos-11 deprecated, add macos-14 --- .github/workflows/build-wheels-metal.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-wheels-metal.yaml b/.github/workflows/build-wheels-metal.yaml index fc798c84e..d1554600e 100644 --- a/.github/workflows/build-wheels-metal.yaml +++ b/.github/workflows/build-wheels-metal.yaml @@ -20,8 +20,8 @@ jobs: id: set-matrix run: | $matrix = @{ - 'os' = @('macos-11', 'macos-12', 'macos-13') - 'pyver' = @('3.10', '3.11', '3.12') + 'os' = @('macos-12', 'macos-13', 'macos-14') + 'pyver' = @('3.9', '3.10', '3.11', '3.12') } $matrixOut = ConvertTo-Json $matrix -Compress From 864d190b881693c91f5c3c54d4328322ec63244d Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 1 May 2024 21:06:00 +0200 Subject: [PATCH 010/112] Bump python 3.8 to 3.9 --- .github/workflows/publish-to-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-to-test.yaml b/.github/workflows/publish-to-test.yaml index 2bf0ea9ba..6f99534b4 100644 --- a/.github/workflows/publish-to-test.yaml +++ b/.github/workflows/publish-to-test.yaml @@ -22,7 +22,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.8" + python-version: "3.9" - name: Append Dev Version to __version__ run: | DEV_VERSION=${{ github.event.inputs.dev_version }} From 1934440c22ed44970ce48c3b6d4e75b1e21a3603 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 1 May 2024 21:15:38 +0200 Subject: [PATCH 011/112] Add python 3.13 --- .github/workflows/test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 54c9ad582..b3664363e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] steps: - uses: actions/checkout@v4 @@ -37,7 +37,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] steps: - uses: actions/checkout@v4 @@ -60,7 +60,7 @@ jobs: runs-on: macos-13 strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] steps: - uses: actions/checkout@v4 From 525b7af5600f0d5db495f8f82a9ed9b33928b216 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 1 May 2024 21:17:14 +0200 Subject: [PATCH 012/112] Add python 3.13 --- .github/workflows/test-pypi.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-pypi.yaml b/.github/workflows/test-pypi.yaml index ecfdb8112..5f46e3fa5 100644 --- a/.github/workflows/test-pypi.yaml +++ b/.github/workflows/test-pypi.yaml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] steps: - name: Set up Python ${{ matrix.python-version }} @@ -28,7 +28,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] steps: - name: Set up Python ${{ matrix.python-version }} @@ -48,7 +48,7 @@ jobs: runs-on: macos-latest strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] steps: - name: Set up Python ${{ matrix.python-version }} From b94a9e23126fb2111fce420054422810953eba30 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 1 May 2024 21:20:40 +0200 Subject: [PATCH 013/112] python 3.13 remove --- .github/workflows/test-pypi.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-pypi.yaml b/.github/workflows/test-pypi.yaml index 5f46e3fa5..ecfdb8112 100644 --- a/.github/workflows/test-pypi.yaml +++ b/.github/workflows/test-pypi.yaml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - name: Set up Python ${{ matrix.python-version }} @@ -28,7 +28,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - name: Set up Python ${{ matrix.python-version }} @@ -48,7 +48,7 @@ jobs: runs-on: macos-latest strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - name: Set up Python ${{ matrix.python-version }} From d24c882a12e280bce7f06ad51d06024b19259a9c Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 1 May 2024 21:23:07 +0200 Subject: [PATCH 014/112] remove python 3.13 --- .github/workflows/test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index b3664363e..54c9ad582 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 @@ -37,7 +37,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 @@ -60,7 +60,7 @@ jobs: runs-on: macos-13 strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 From a5d4a37db7897efec0f5b034325ce0b51afaeabb Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 1 May 2024 22:00:49 +0200 Subject: [PATCH 015/112] remove python 3.8 --- .github/workflows/build-and-release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 1b557162c..f26229b4c 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, windows-2019, macos-11] + os: [ubuntu-20.04, windows-2019, macos-12] steps: - uses: actions/checkout@v4 @@ -61,7 +61,7 @@ jobs: CIBW_SKIP: "*musllinux* pp*" CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ARCHS: "aarch64" - CIBW_BUILD: "cp38-* cp39-* cp310-* cp311-* cp312-*" + CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-*" with: output-dir: wheelhouse From 2e412afb294d8ad8ab10ae0e44becea0a8ecd5cb Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 1 May 2024 22:06:34 +0200 Subject: [PATCH 016/112] Bump macos-13 to macos-14 --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 54c9ad582..eefb43f33 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -57,7 +57,7 @@ jobs: build-macos: - runs-on: macos-13 + runs-on: macos-14 strategy: matrix: python-version: ["3.9", "3.10", "3.11", "3.12"] @@ -107,7 +107,7 @@ jobs: build-macos-metal: - runs-on: macos-13 + runs-on: macos-14 steps: - uses: actions/checkout@v4 From b1a7cde691aca25aa20b74f5fd5c6edb770d76f7 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 1 May 2024 22:08:34 +0200 Subject: [PATCH 017/112] Update build-wheels-metal.yaml --- .github/workflows/build-wheels-metal.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-wheels-metal.yaml b/.github/workflows/build-wheels-metal.yaml index d1554600e..d511daae5 100644 --- a/.github/workflows/build-wheels-metal.yaml +++ b/.github/workflows/build-wheels-metal.yaml @@ -20,7 +20,7 @@ jobs: id: set-matrix run: | $matrix = @{ - 'os' = @('macos-12', 'macos-13', 'macos-14') + 'os' = @('macos-12', 'macos-13') 'pyver' = @('3.9', '3.10', '3.11', '3.12') } From 8517a8034f7dda38693ca61c1d4e592ab4c28253 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 1 May 2024 22:10:31 +0200 Subject: [PATCH 018/112] Update build-wheels-metal.yaml --- .github/workflows/build-wheels-metal.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-wheels-metal.yaml b/.github/workflows/build-wheels-metal.yaml index d511daae5..5485ae4c5 100644 --- a/.github/workflows/build-wheels-metal.yaml +++ b/.github/workflows/build-wheels-metal.yaml @@ -56,7 +56,6 @@ jobs: export CMAKE_ARGS="-DLLAMA_NATIVE=off -DLLAMA_METAL=on" [[ "$OSVER" == "macos-13" ]] && export CC="${XCODE15BINPATH}/cc" && export CXX="${XCODE15BINPATH}/c++" && export MACOSX_DEPLOYMENT_TARGET="13.0" [[ "$OSVER" == "macos-12" ]] && export MACOSX_DEPLOYMENT_TARGET="12.0" - [[ "$OSVER" == "macos-11" ]] && export MACOSX_DEPLOYMENT_TARGET="11.0" export CMAKE_OSX_ARCHITECTURES="arm64" && export ARCHFLAGS="-arch arm64" VERBOSE=1 python -m build --wheel From d24d08a36a8ce66afcf41b0c5c85ad6d29d09cfb Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 1 May 2024 22:42:07 +0200 Subject: [PATCH 019/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 114 ++++++++++++++++++++++- 1 file changed, 113 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index f26229b4c..3ffdcebf0 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -33,6 +33,7 @@ jobs: env: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" + CIBW_ENVIRONMENT: CMAKE_ARGS = '-DLLAMA_CUBLAS=on -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' with: package-dir: . output-dir: wheelhouse @@ -41,6 +42,117 @@ jobs: with: name: wheels-${{ matrix.os }} path: ./wheelhouse/*.whl + + build_wheels_avx: + name: Build wheels on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-20.04, windows-2019, macos-12] + + steps: + - uses: actions/checkout@v4 + with: + submodules: "recursive" + + # Used to host cibuildwheel + - uses: actions/setup-python@v5 + with: + python-version: "3.9" + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install -e .[all] + + - name: Build wheels + uses: pypa/cibuildwheel@v2.17.0 + env: + # disable repair + CIBW_REPAIR_WHEEL_COMMAND: "" + CIBW_ENVIRONMENT: CMAKE_ARGS = '-DLLAMA_CUBLAS=on -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' + with: + package-dir: . + output-dir: wheelhouse + + - uses: actions/upload-artifact@v4 + with: + name: wheels-avx${{ matrix.os }} + path: ./wheelhouse/*.whl + + build_wheels_avx2: + name: Build wheels on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-20.04, windows-2019, macos-12] + + steps: + - uses: actions/checkout@v4 + with: + submodules: "recursive" + + # Used to host cibuildwheel + - uses: actions/setup-python@v5 + with: + python-version: "3.9" + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install -e .[all] + + - name: Build wheels + uses: pypa/cibuildwheel@v2.17.0 + env: + # disable repair + CIBW_REPAIR_WHEEL_COMMAND: "" + CIBW_ENVIRONMENT: CMAKE_ARGS = '-DLLAMA_CUBLAS=on' + with: + package-dir: . + output-dir: wheelhouse + + - uses: actions/upload-artifact@v4 + with: + name: wheels-avx2-${{ matrix.os }} + path: ./wheelhouse/*.whl + + build_wheels_avx512: + name: Build wheels on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-20.04, windows-2019, macos-12] + + steps: + - uses: actions/checkout@v4 + with: + submodules: "recursive" + + # Used to host cibuildwheel + - uses: actions/setup-python@v5 + with: + python-version: "3.9" + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install -e .[all] + + - name: Build wheels + uses: pypa/cibuildwheel@v2.17.0 + env: + # disable repair + CIBW_REPAIR_WHEEL_COMMAND: "" + CIBW_ENVIRONMENT: CMAKE_ARGS = '-DLLAMA_CUBLAS=on -DLLAMA_AVX512=on' + with: + package-dir: . + output-dir: wheelhouse + + - uses: actions/upload-artifact@v4 + with: + name: wheels-avx512-${{ matrix.os }} + path: ./wheelhouse/*.whl build_wheels_arm64: name: Build arm64 wheels @@ -96,7 +208,7 @@ jobs: release: name: Release - needs: [build_wheels, build_wheels_arm64, build_sdist] + needs: [build_wheels, build_wheels_avx, build_wheels_avx2, build_wheels_avx512, build_wheels_arm64, build_sdist] runs-on: ubuntu-latest steps: From 9efb21f80b14c574d1ad9668705ce2111b8a28fe Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 1 May 2024 22:59:54 +0200 Subject: [PATCH 020/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 3ffdcebf0..0879a6c35 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -31,6 +31,7 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.17.0 env: + CIBW_BUILD_FRONTEND: "build" # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS = '-DLLAMA_CUBLAS=on -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' @@ -68,6 +69,7 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.17.0 env: + CIBW_BUILD_FRONTEND: "build" # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS = '-DLLAMA_CUBLAS=on -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' @@ -105,9 +107,10 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.17.0 env: + CIBW_BUILD_FRONTEND: "build" # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" - CIBW_ENVIRONMENT: CMAKE_ARGS = '-DLLAMA_CUBLAS=on' + CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_CUBLAS=on' with: package-dir: . output-dir: wheelhouse From 15be4a2acdd270b0d471bb9646c73eeadd0bc431 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 1 May 2024 23:00:28 +0200 Subject: [PATCH 021/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 0879a6c35..d33a49fd4 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -34,7 +34,7 @@ jobs: CIBW_BUILD_FRONTEND: "build" # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" - CIBW_ENVIRONMENT: CMAKE_ARGS = '-DLLAMA_CUBLAS=on -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' + CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_CUBLAS=on -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' with: package-dir: . output-dir: wheelhouse @@ -72,7 +72,7 @@ jobs: CIBW_BUILD_FRONTEND: "build" # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" - CIBW_ENVIRONMENT: CMAKE_ARGS = '-DLLAMA_CUBLAS=on -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' + CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_CUBLAS=on -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' with: package-dir: . output-dir: wheelhouse From d67c7a6b912ea5349ed96ffb35a7364548eac481 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 1 May 2024 23:03:57 +0200 Subject: [PATCH 022/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index d33a49fd4..964da1fc8 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -147,7 +147,7 @@ jobs: env: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" - CIBW_ENVIRONMENT: CMAKE_ARGS = '-DLLAMA_CUBLAS=on -DLLAMA_AVX512=on' + CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_CUBLAS=on -DLLAMA_AVX512=on' with: package-dir: . output-dir: wheelhouse From 561e1bacfff489ef2ccb31b3e837fa7cc5717e82 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 1 May 2024 23:10:28 +0200 Subject: [PATCH 023/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 964da1fc8..e48b72abb 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -31,7 +31,6 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.17.0 env: - CIBW_BUILD_FRONTEND: "build" # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_CUBLAS=on -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' @@ -69,7 +68,6 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.17.0 env: - CIBW_BUILD_FRONTEND: "build" # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_CUBLAS=on -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' @@ -107,7 +105,6 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.17.0 env: - CIBW_BUILD_FRONTEND: "build" # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_CUBLAS=on' From 848622995d1d0d4c31cb8148fc6722739e994588 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 1 May 2024 23:20:42 +0200 Subject: [PATCH 024/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index e48b72abb..19f268b8a 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -33,7 +33,7 @@ jobs: env: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" - CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_CUBLAS=on -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' + CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' with: package-dir: . output-dir: wheelhouse @@ -70,7 +70,7 @@ jobs: env: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" - CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_CUBLAS=on -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' + CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' with: package-dir: . output-dir: wheelhouse @@ -107,7 +107,7 @@ jobs: env: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" - CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_CUBLAS=on' + CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS' with: package-dir: . output-dir: wheelhouse @@ -144,7 +144,7 @@ jobs: env: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" - CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_CUBLAS=on -DLLAMA_AVX512=on' + CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX512=on' with: package-dir: . output-dir: wheelhouse From 56b5a0834d58f15509cfd885232b4b732786c6a8 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Thu, 2 May 2024 01:44:23 +0200 Subject: [PATCH 025/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 170 ++++++++++++----------- 1 file changed, 88 insertions(+), 82 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 19f268b8a..c2270d50b 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -42,9 +42,78 @@ jobs: with: name: wheels-${{ matrix.os }} path: ./wheelhouse/*.whl - + + build_wheels_arm64: + name: Build arm64 wheels + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + submodules: "recursive" + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + with: + platforms: linux/arm64 + + - name: Build wheels + uses: pypa/cibuildwheel@v2.17.0 + env: + CIBW_SKIP: "*musllinux* pp*" + CIBW_REPAIR_WHEEL_COMMAND: "" + CIBW_ARCHS: "aarch64" + CIBW_BUILD: "cp3(9,10,11,12)-*" + with: + output-dir: wheelhouse + + - name: Upload wheels as artifacts + uses: actions/upload-artifact@v4 + with: + name: wheels_arm64 + path: ./wheelhouse/*.whl + + build_sdist: + name: Build source distribution + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + with: + submodules: "recursive" + - uses: actions/setup-python@v5 + with: + python-version: "3.9" + - name: Install dependencies + run: | + python -m pip install --upgrade pip build + python -m pip install -e .[all] + - name: Build source distribution + run: | + python -m build --sdist + - uses: actions/upload-artifact@v4 + with: + name: sdist + path: ./dist/*.tar.gz + + release: + name: Release + needs: [build_wheels, build_wheels_arm64, build_sdist] + runs-on: ubuntu-latest + + steps: + - uses: actions/download-artifact@v4 + with: + merge-multiple: true + path: dist + + - uses: softprops/action-gh-release@v2 + with: + files: dist/* + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + build_wheels_avx: - name: Build wheels on ${{ matrix.os }} + name: Build wheels on ${{ matrix.os }} - AVX runs-on: ${{ matrix.os }} strategy: matrix: @@ -73,15 +142,17 @@ jobs: CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' with: package-dir: . - output-dir: wheelhouse + output-dir: wheelhouse_avx - - uses: actions/upload-artifact@v4 + - uses: softprops/action-gh-release@v2 with: - name: wheels-avx${{ matrix.os }} - path: ./wheelhouse/*.whl + files: wheelhouse_avx/* + tag_name: ${{ github.ref_name }}-avx + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} build_wheels_avx2: - name: Build wheels on ${{ matrix.os }} + name: Build wheels on ${{ matrix.os }} - AVX2 runs-on: ${{ matrix.os }} strategy: matrix: @@ -110,15 +181,17 @@ jobs: CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS' with: package-dir: . - output-dir: wheelhouse + output-dir: wheelhouse_avx2 - - uses: actions/upload-artifact@v4 + - uses: softprops/action-gh-release@v2 with: - name: wheels-avx2-${{ matrix.os }} - path: ./wheelhouse/*.whl + files: wheelhouse_avx2/* + tag_name: ${{ github.ref_name }}-avx2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} build_wheels_avx512: - name: Build wheels on ${{ matrix.os }} + name: Build wheels on ${{ matrix.os }} - AVX512 runs-on: ${{ matrix.os }} strategy: matrix: @@ -147,78 +220,11 @@ jobs: CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX512=on' with: package-dir: . - output-dir: wheelhouse - - - uses: actions/upload-artifact@v4 - with: - name: wheels-avx512-${{ matrix.os }} - path: ./wheelhouse/*.whl - - build_wheels_arm64: - name: Build arm64 wheels - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - submodules: "recursive" - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - with: - platforms: linux/arm64 - - - name: Build wheels - uses: pypa/cibuildwheel@v2.17.0 - env: - CIBW_SKIP: "*musllinux* pp*" - CIBW_REPAIR_WHEEL_COMMAND: "" - CIBW_ARCHS: "aarch64" - CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-*" - with: - output-dir: wheelhouse - - - name: Upload wheels as artifacts - uses: actions/upload-artifact@v4 - with: - name: wheels_arm64 - path: ./wheelhouse/*.whl - - build_sdist: - name: Build source distribution - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - with: - submodules: "recursive" - - uses: actions/setup-python@v5 - with: - python-version: "3.9" - - name: Install dependencies - run: | - python -m pip install --upgrade pip build - python -m pip install -e .[all] - - name: Build source distribution - run: | - python -m build --sdist - - uses: actions/upload-artifact@v4 - with: - name: sdist - path: ./dist/*.tar.gz - - release: - name: Release - needs: [build_wheels, build_wheels_avx, build_wheels_avx2, build_wheels_avx512, build_wheels_arm64, build_sdist] - runs-on: ubuntu-latest - - steps: - - uses: actions/download-artifact@v4 - with: - merge-multiple: true - path: dist + output-dir: wheelhouse_avx512 - uses: softprops/action-gh-release@v2 with: - files: dist/* + files: wheelhouse_avx512/* + tag_name: ${{ github.ref_name }}-avx512 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 3a6b448918c239bb7bcbb0ad4d1a35a8553e8362 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Thu, 2 May 2024 01:54:41 +0200 Subject: [PATCH 026/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index c2270d50b..406642f22 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -62,7 +62,7 @@ jobs: CIBW_SKIP: "*musllinux* pp*" CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ARCHS: "aarch64" - CIBW_BUILD: "cp3(9,10,11,12)-*" + CIBW_BUILD: "cp38-* cp39-* cp310-* cp311-* cp312-*" with: output-dir: wheelhouse From 7f8954fe0d63fe2f23bbbf94d13a27bc2f274550 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Thu, 2 May 2024 02:04:11 +0200 Subject: [PATCH 027/112] Update build-wheels-metal.yaml --- .github/workflows/build-wheels-metal.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-wheels-metal.yaml b/.github/workflows/build-wheels-metal.yaml index 5485ae4c5..f61f57429 100644 --- a/.github/workflows/build-wheels-metal.yaml +++ b/.github/workflows/build-wheels-metal.yaml @@ -56,7 +56,8 @@ jobs: export CMAKE_ARGS="-DLLAMA_NATIVE=off -DLLAMA_METAL=on" [[ "$OSVER" == "macos-13" ]] && export CC="${XCODE15BINPATH}/cc" && export CXX="${XCODE15BINPATH}/c++" && export MACOSX_DEPLOYMENT_TARGET="13.0" [[ "$OSVER" == "macos-12" ]] && export MACOSX_DEPLOYMENT_TARGET="12.0" - + # [[ "$OSVER" == "macos-11" ]] && export MACOSX_DEPLOYMENT_TARGET="11.0" + export CMAKE_OSX_ARCHITECTURES="arm64" && export ARCHFLAGS="-arch arm64" VERBOSE=1 python -m build --wheel From cfead6aee0bf1bf6fc1963e98e1ea960b6643869 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Thu, 2 May 2024 04:02:52 +0200 Subject: [PATCH 028/112] Update generate-index-from-release.yaml Add avx, avx2 and avx512 --- .github/workflows/generate-index-from-release.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/generate-index-from-release.yaml b/.github/workflows/generate-index-from-release.yaml index 500c4613c..21648768b 100644 --- a/.github/workflows/generate-index-from-release.yaml +++ b/.github/workflows/generate-index-from-release.yaml @@ -35,6 +35,9 @@ jobs: - name: Build run: | ./scripts/releases-to-pep-503.sh index/whl/cpu '^[v]?[0-9]+\.[0-9]+\.[0-9]+$' + ./scripts/releases-to-pep-503.sh index/whl/cpu_avx '^[v]?[0-9]+\.[0-9]+\.[0-9]+-avx$' + ./scripts/releases-to-pep-503.sh index/whl/cpu_avx2 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-avx2$' + ./scripts/releases-to-pep-503.sh index/whl/cpu_avx512 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-avx512$' ./scripts/releases-to-pep-503.sh index/whl/cu121 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu121$' ./scripts/releases-to-pep-503.sh index/whl/cu122 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu122$' ./scripts/releases-to-pep-503.sh index/whl/cu123 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu123$' From 976cb03df572932931f3509b796cd5e238691f9b Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 3 May 2024 06:02:03 +0200 Subject: [PATCH 029/112] Update test.yaml --- .github/workflows/test.yaml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index eefb43f33..1052157fc 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -26,11 +26,11 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | - python3 -m pip install --upgrade pip - python3 -m pip install .[all] -v + python -m pip install --upgrade pip + python -m pip install .[all] -v - name: Test with pytest run: | - python3 -m pytest + python -m pytest build-windows: @@ -49,11 +49,11 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | - python3 -m pip install --upgrade pip - python3 -m pip install .[all] -v + python -m pip install --upgrade pip + python -m pip install .[all] -v - name: Test with pytest run: | - python3 -m pytest + python -m pytest build-macos: @@ -72,11 +72,11 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | - python3 -m pip install --upgrade pip - python3 -m pip install .[all] --verbose + python -m pip install --upgrade pip + python -m pip install .[all] --verbose - name: Test with pytest run: | - python3 -m pytest + python -m pytest # build-linux-opencl: @@ -98,11 +98,11 @@ jobs: # sudo apt-get install -y --no-install-recommends llvm intel-oneapi-runtime-opencl intel-oneapi-runtime-compilers libclblast-dev # - name: Install dependencies # run: | - # python3 -m pip install --upgrade pip - # CMAKE_ARGS="-DLLAMA_CLBLAST=on" python3 -m pip install .[all] --verbose + # python -m pip install --upgrade pip + # CMAKE_ARGS="-DLLAMA_CLBLAST=on" python -m pip install .[all] --verbose # - name: Test with pytest # run: | - # python3 -m pytest + # python -m pytest build-macos-metal: @@ -119,8 +119,8 @@ jobs: python-version: "3.9" - name: Install dependencies run: | - python3 -m pip install --upgrade pip - CMAKE_ARGS="-DLLAMA_METAL=on" python3 -m pip install .[all] --verbose + python -m pip install --upgrade pip + CMAKE_ARGS="-DLLAMA_METAL=on" python -m pip install .[all] --verbose - name: Test with pytest run: | - python3 -m pytest + python -m pytest From bc992850a424f8ddbb27df69bb18efa833529d55 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 3 May 2024 06:02:36 +0200 Subject: [PATCH 030/112] Update test-pypi.yaml --- .github/workflows/test-pypi.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test-pypi.yaml b/.github/workflows/test-pypi.yaml index ecfdb8112..c5d9d5298 100644 --- a/.github/workflows/test-pypi.yaml +++ b/.github/workflows/test-pypi.yaml @@ -17,11 +17,11 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | - python3 -m pip install --upgrade pip - python3 -m pip install --verbose llama-cpp-python[all] + python -m pip install --upgrade pip + python -m pip install --verbose llama-cpp-python[all] - name: Test with pytest run: | - python3 -c "import llama_cpp" + python -c "import llama_cpp" build-windows: @@ -37,11 +37,11 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | - python3 -m pip install --upgrade pip - python3 -m pip install --verbose llama-cpp-python[all] + python -m pip install --upgrade pip + python -m pip install --verbose llama-cpp-python[all] - name: Test with pytest run: | - python3 -c "import llama_cpp" + python -c "import llama_cpp" build-macos: @@ -57,8 +57,8 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | - python3 -m pip install --upgrade pip - python3 -m pip install --verbose llama-cpp-python[all] + python -m pip install --upgrade pip + python -m pip install --verbose llama-cpp-python[all] - name: Test with pytest run: | - python3 -c "import llama_cpp" + python -c "import llama_cpp" From 1b620c47a1a02b83476c372a253a1d3197d6af76 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 3 May 2024 06:03:04 +0200 Subject: [PATCH 031/112] Update publish.yaml --- .github/workflows/publish.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index d96c804d1..c6abb43b3 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -19,11 +19,11 @@ jobs: python-version: "3.9" - name: Install dependencies run: | - python3 -m pip install --upgrade pip build - python3 -m pip install -e .[all] + python -m pip install --upgrade pip build + python -m pip install -e .[all] - name: Build source distribution run: | - python3 -m build --sdist + python -m build --sdist - name: Publish distribution to PyPI # TODO: move to tag based releases # if: startsWith(github.ref, 'refs/tags') From e2f02594917176c835e8dc2af8d4cd11708170ef Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 3 May 2024 06:08:05 +0200 Subject: [PATCH 032/112] Update publish-to-test.yaml --- .github/workflows/publish-to-test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-to-test.yaml b/.github/workflows/publish-to-test.yaml index 6f99534b4..a4a62ba98 100644 --- a/.github/workflows/publish-to-test.yaml +++ b/.github/workflows/publish-to-test.yaml @@ -31,11 +31,11 @@ jobs: sed -i 's/__version__ = \".*\"/__version__ = \"'"${NEW_VERSION}"'\"/' llama_cpp/__init__.py - name: Install dependencies run: | - python3 -m pip install --upgrade pip build - python3 -m pip install -e .[all] + python -m pip install --upgrade pip build + python -m pip install -e .[all] - name: Build source distribution run: | - python3 -m build --sdist + python -m build --sdist - name: Publish to Test PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: From 319ddf1602e85bc94523d15636d75b90e8b47c68 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 3 May 2024 06:14:44 +0200 Subject: [PATCH 033/112] Update build-wheels-cuda.yaml Cuda with AVX2 by default --- .github/workflows/build-wheels-cuda.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-wheels-cuda.yaml b/.github/workflows/build-wheels-cuda.yaml index 9b113efde..b471d6e00 100644 --- a/.github/workflows/build-wheels-cuda.yaml +++ b/.github/workflows/build-wheels-cuda.yaml @@ -109,15 +109,15 @@ jobs: $env:VERBOSE = '1' $env:CMAKE_ARGS = '-DLLAMA_CUBLAS=on -DCMAKE_CUDA_ARCHITECTURES=all' $env:CMAKE_ARGS = "-DLLAMA_CUDA_FORCE_MMQ=ON $env:CMAKE_ARGS" - if ($env:AVXVER -eq 'AVX') { - $env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' - } - if ($env:AVXVER -eq 'AVX512') { - $env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DLLAMA_AVX512=on' - } - if ($env:AVXVER -eq 'basic') { - $env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' - } + # if ($env:AVXVER -eq 'AVX') { + # $env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' + # } + # if ($env:AVXVER -eq 'AVX512') { + # $env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DLLAMA_AVX512=on' + # } + # if ($env:AVXVER -eq 'basic') { + # $env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' + # } python -m build --wheel # write the build tag to the output Write-Output "CUDA_VERSION=$cudaVersion" >> $env:GITHUB_ENV From eb3f734692953c7692c05c6fbeb6f2e818a3778d Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 3 May 2024 06:16:03 +0200 Subject: [PATCH 034/112] Update build-wheels-cuda.yaml --- .github/workflows/build-wheels-cuda.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-wheels-cuda.yaml b/.github/workflows/build-wheels-cuda.yaml index b471d6e00..da63ddbfd 100644 --- a/.github/workflows/build-wheels-cuda.yaml +++ b/.github/workflows/build-wheels-cuda.yaml @@ -116,7 +116,7 @@ jobs: # $env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DLLAMA_AVX512=on' # } # if ($env:AVXVER -eq 'basic') { - # $env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' + # $env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' # } python -m build --wheel # write the build tag to the output From 3a612069aeac2c8f2d66dcdc553479fc96dac948 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 3 May 2024 16:33:35 +0200 Subject: [PATCH 035/112] remove DEPRECATED 32 bits --- .github/workflows/build-and-release.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 406642f22..ca0d9345c 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -32,6 +32,7 @@ jobs: uses: pypa/cibuildwheel@v2.17.0 env: # disable repair + CIBW_SKIP: "*-win32 *-manylinux_i686" CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' with: @@ -138,6 +139,7 @@ jobs: uses: pypa/cibuildwheel@v2.17.0 env: # disable repair + CIBW_SKIP: "*-win32 *-manylinux_i686" CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' with: @@ -177,6 +179,7 @@ jobs: uses: pypa/cibuildwheel@v2.17.0 env: # disable repair + CIBW_SKIP: "*-win32 *-manylinux_i686" CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS' with: @@ -216,6 +219,7 @@ jobs: uses: pypa/cibuildwheel@v2.17.0 env: # disable repair + CIBW_SKIP: "*-win32 *-manylinux_i686" CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX512=on' with: From 2095372e311888142a3dd3d1799e0fda5db94bd2 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 3 May 2024 16:58:36 +0200 Subject: [PATCH 036/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index ca0d9345c..814dd7d54 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -31,8 +31,8 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.17.0 env: - # disable repair CIBW_SKIP: "*-win32 *-manylinux_i686" + # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' with: @@ -61,6 +61,7 @@ jobs: uses: pypa/cibuildwheel@v2.17.0 env: CIBW_SKIP: "*musllinux* pp*" + # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ARCHS: "aarch64" CIBW_BUILD: "cp38-* cp39-* cp310-* cp311-* cp312-*" @@ -138,8 +139,8 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.17.0 env: - # disable repair CIBW_SKIP: "*-win32 *-manylinux_i686" + # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' with: @@ -178,8 +179,8 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.17.0 env: - # disable repair CIBW_SKIP: "*-win32 *-manylinux_i686" + # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS' with: @@ -218,8 +219,8 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.17.0 env: - # disable repair CIBW_SKIP: "*-win32 *-manylinux_i686" + # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX512=on' with: From 4ebedc1e8d9390e77bfd7709eb2ac61bdf307e28 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 3 May 2024 19:34:55 +0200 Subject: [PATCH 037/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 814dd7d54..1bcde4677 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -31,7 +31,6 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.17.0 env: - CIBW_SKIP: "*-win32 *-manylinux_i686" # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' @@ -64,7 +63,7 @@ jobs: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ARCHS: "aarch64" - CIBW_BUILD: "cp38-* cp39-* cp310-* cp311-* cp312-*" + CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-*" with: output-dir: wheelhouse From 8c2120d8c37bb280fcae7e933896134db1787fbd Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 3 May 2024 19:50:55 +0200 Subject: [PATCH 038/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 1bcde4677..174a680b2 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -34,6 +34,7 @@ jobs: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' + CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-*" with: package-dir: . output-dir: wheelhouse @@ -142,6 +143,7 @@ jobs: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' + CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-*" with: package-dir: . output-dir: wheelhouse_avx @@ -182,6 +184,7 @@ jobs: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS' + CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-*" with: package-dir: . output-dir: wheelhouse_avx2 @@ -222,6 +225,7 @@ jobs: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX512=on' + CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-*" with: package-dir: . output-dir: wheelhouse_avx512 From 1b8f088aa2c930f95842375978689f9e385ccbb7 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 3 May 2024 19:54:53 +0200 Subject: [PATCH 039/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 174a680b2..10aea33b7 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -34,7 +34,7 @@ jobs: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' - CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-*" + CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-* pp311-* pp312-*" with: package-dir: . output-dir: wheelhouse @@ -143,7 +143,7 @@ jobs: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' - CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-*" + CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-* pp311-* pp312-*" with: package-dir: . output-dir: wheelhouse_avx @@ -184,7 +184,7 @@ jobs: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS' - CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-*" + CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-* pp311-* pp312-*" with: package-dir: . output-dir: wheelhouse_avx2 @@ -225,7 +225,7 @@ jobs: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX512=on' - CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-*" + CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-* pp311-* pp312-*" with: package-dir: . output-dir: wheelhouse_avx512 From bfced4f29f154cdc15104f5125264df022449e9e Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 3 May 2024 20:07:35 +0200 Subject: [PATCH 040/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 10aea33b7..0a887b1e4 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -34,7 +34,7 @@ jobs: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' - CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-* pp311-* pp312-*" + CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-*" with: package-dir: . output-dir: wheelhouse @@ -143,7 +143,7 @@ jobs: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' - CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-* pp311-* pp312-*" + CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-*" with: package-dir: . output-dir: wheelhouse_avx @@ -184,7 +184,7 @@ jobs: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS' - CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-* pp311-* pp312-*" + CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-*" with: package-dir: . output-dir: wheelhouse_avx2 @@ -225,7 +225,7 @@ jobs: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX512=on' - CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-* pp311-* pp312-*" + CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-*" with: package-dir: . output-dir: wheelhouse_avx512 From 698efb7acdf4a53d6228f7ca4495afc1d09abfb0 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 3 May 2024 20:16:57 +0200 Subject: [PATCH 041/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 0a887b1e4..aef09180c 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -139,7 +139,7 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.17.0 env: - CIBW_SKIP: "*-win32 *-manylinux_i686" + CIBW_ARCHS: "auto64" # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' @@ -180,7 +180,7 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.17.0 env: - CIBW_SKIP: "*-win32 *-manylinux_i686" + CIBW_ARCHS: "auto64" # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS' @@ -221,7 +221,7 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.17.0 env: - CIBW_SKIP: "*-win32 *-manylinux_i686" + CIBW_ARCHS: "auto64" # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX512=on' From 6af39340edea7fc65803abfbd9fd263944be0146 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 3 May 2024 20:29:19 +0200 Subject: [PATCH 042/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index aef09180c..359eb94c9 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -31,6 +31,7 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.17.0 env: + CIBW_ARCHS: "auto32" # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' From 74f6cdf5c063b25cb5997e947071211f477ee639 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 3 May 2024 20:29:58 +0200 Subject: [PATCH 043/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 359eb94c9..d29f4291a 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -31,7 +31,7 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.17.0 env: - CIBW_ARCHS: "auto32" + CIBW_ARCHS: "auto" # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' From 0aefa55c437c09de50a53786436eba5396295595 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 3 May 2024 20:41:33 +0200 Subject: [PATCH 044/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index d29f4291a..d138b4adc 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -31,10 +31,10 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.17.0 env: - CIBW_ARCHS: "auto" + CIBW_ARCHS: "auto32" # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" - CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' + CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-*" with: package-dir: . @@ -140,7 +140,7 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.17.0 env: - CIBW_ARCHS: "auto64" + CIBW_ARCHS: "auto" # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' From caceb89932535e72428bbdffeaab80f25a65e964 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sat, 4 May 2024 12:04:48 +0200 Subject: [PATCH 045/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 43 ++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index d138b4adc..add43dfaa 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, windows-2019, macos-12] + os: [ubuntu-20.04, windows-2019] steps: - uses: actions/checkout@v4 @@ -45,6 +45,45 @@ jobs: name: wheels-${{ matrix.os }} path: ./wheelhouse/*.whl + build_wheels_mac: + name: Build wheels on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [macos-12] + + steps: + - uses: actions/checkout@v4 + with: + submodules: "recursive" + + # Used to host cibuildwheel + - uses: actions/setup-python@v5 + with: + python-version: "3.9" + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install -e .[all] + + - name: Build wheels + uses: pypa/cibuildwheel@v2.17.0 + env: + CIBW_ARCHS: "auto" + # disable repair + CIBW_REPAIR_WHEEL_COMMAND: "" + CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' + CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-*" + with: + package-dir: . + output-dir: wheelhouse + + - uses: actions/upload-artifact@v4 + with: + name: wheels-mac_${{ matrix.os }} + path: ./wheelhouse/*.whl + build_wheels_arm64: name: Build arm64 wheels runs-on: ubuntu-latest @@ -100,7 +139,7 @@ jobs: release: name: Release - needs: [build_wheels, build_wheels_arm64, build_sdist] + needs: [build_wheels, build_wheels_mac, build_wheels_arm64, build_sdist] runs-on: ubuntu-latest steps: From 78b9de31c3477caa89803a265a9854898e7bedcf Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sat, 4 May 2024 12:18:25 +0200 Subject: [PATCH 046/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index add43dfaa..6190aa3a7 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -70,7 +70,7 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.17.0 env: - CIBW_ARCHS: "auto" + CIBW_ARCHS: "auto64" # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' From 1552e8efee5e9b74d751671c143e3702ec0cc0a1 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sat, 4 May 2024 12:21:43 +0200 Subject: [PATCH 047/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 6190aa3a7..d9cf60754 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -104,6 +104,7 @@ jobs: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ARCHS: "aarch64" + CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS' CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-*" with: output-dir: wheelhouse From f342418dde9a9e4dafcb4b478060df34cb64cfb1 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sun, 5 May 2024 08:29:55 +0200 Subject: [PATCH 048/112] Update build-and-release.yaml Upgrade matrix os to latest version --- .github/workflows/build-and-release.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index d9cf60754..57e4dd816 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, windows-2019] + os: [ubuntu-latest, windows-latest] steps: - uses: actions/checkout@v4 @@ -50,7 +50,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-12] + os: [macos-latest] steps: - uses: actions/checkout@v4 @@ -160,7 +160,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, windows-2019, macos-12] + os: [ubuntu-latest, windows-latest, macos-latest] steps: - uses: actions/checkout@v4 @@ -201,7 +201,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, windows-2019, macos-12] + os: [ubuntu-latest, windows-latest, macos-latest] steps: - uses: actions/checkout@v4 @@ -242,7 +242,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, windows-2019, macos-12] + os: [ubuntu-latest, windows-latest, macos-latest] steps: - uses: actions/checkout@v4 From 0ce4fabde4509fdf2f2a31d036b403146792b155 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sun, 5 May 2024 08:37:00 +0200 Subject: [PATCH 049/112] Update build-wheels-metal.yaml --- .github/workflows/build-wheels-metal.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-wheels-metal.yaml b/.github/workflows/build-wheels-metal.yaml index f61f57429..41584691d 100644 --- a/.github/workflows/build-wheels-metal.yaml +++ b/.github/workflows/build-wheels-metal.yaml @@ -20,7 +20,7 @@ jobs: id: set-matrix run: | $matrix = @{ - 'os' = @('macos-12', 'macos-13') + 'os' = @('macos-12', 'macos-13', 'macos-14') 'pyver' = @('3.9', '3.10', '3.11', '3.12') } From 32d77b92569911c41d3de36fbc5ea621778fa63f Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sun, 5 May 2024 08:38:20 +0200 Subject: [PATCH 050/112] Update build-wheels-cuda.yaml --- .github/workflows/build-wheels-cuda.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-wheels-cuda.yaml b/.github/workflows/build-wheels-cuda.yaml index da63ddbfd..b00aec130 100644 --- a/.github/workflows/build-wheels-cuda.yaml +++ b/.github/workflows/build-wheels-cuda.yaml @@ -20,7 +20,7 @@ jobs: id: set-matrix run: | $matrix = @{ - 'os' = @('ubuntu-20.04', 'windows-latest') + 'os' = @('ubuntu-latest', 'windows-latest') 'pyver' = @("3.9", "3.10", "3.11", "3.12") 'cuda' = @("12.1.1", "12.2.2", "12.3.2", "12.4.1") 'releasetag' = @("basic") @@ -110,7 +110,7 @@ jobs: $env:CMAKE_ARGS = '-DLLAMA_CUBLAS=on -DCMAKE_CUDA_ARCHITECTURES=all' $env:CMAKE_ARGS = "-DLLAMA_CUDA_FORCE_MMQ=ON $env:CMAKE_ARGS" # if ($env:AVXVER -eq 'AVX') { - # $env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' + $env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' # } # if ($env:AVXVER -eq 'AVX512') { # $env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DLLAMA_AVX512=on' From d61dbd80932ce933f53901f3514d7a59face42d8 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sun, 5 May 2024 08:43:14 +0200 Subject: [PATCH 051/112] Update test.yaml --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 1052157fc..6207fe620 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -57,7 +57,7 @@ jobs: build-macos: - runs-on: macos-14 + runs-on: macos-latest strategy: matrix: python-version: ["3.9", "3.10", "3.11", "3.12"] @@ -107,7 +107,7 @@ jobs: build-macos-metal: - runs-on: macos-14 + runs-on: macos-latest steps: - uses: actions/checkout@v4 From 816476f1ba6e1c9733272928e10f4ba7bf7a6117 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sun, 5 May 2024 08:45:30 +0200 Subject: [PATCH 052/112] Update test-pypi.yaml --- .github/workflows/test-pypi.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test-pypi.yaml b/.github/workflows/test-pypi.yaml index c5d9d5298..d7131956d 100644 --- a/.github/workflows/test-pypi.yaml +++ b/.github/workflows/test-pypi.yaml @@ -15,6 +15,7 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + cache: 'pip' - name: Install dependencies run: | python -m pip install --upgrade pip @@ -35,6 +36,7 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + cache: 'pip' - name: Install dependencies run: | python -m pip install --upgrade pip @@ -55,6 +57,7 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + cache: 'pip' - name: Install dependencies run: | python -m pip install --upgrade pip From d15fec67070c3c3d5a02a8eaebf49c5dc6b40490 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sun, 5 May 2024 08:46:32 +0200 Subject: [PATCH 053/112] Update test.yaml Add cache: 'pip' --- .github/workflows/test.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 6207fe620..6d8231d18 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -24,6 +24,7 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + cache: 'pip' - name: Install dependencies run: | python -m pip install --upgrade pip @@ -47,6 +48,7 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + cache: 'pip' - name: Install dependencies run: | python -m pip install --upgrade pip @@ -70,6 +72,7 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + cache: 'pip' - name: Install dependencies run: | python -m pip install --upgrade pip From 3c9ab30d78c5458fa81beb58e901da65435047dc Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sun, 5 May 2024 08:47:41 +0200 Subject: [PATCH 054/112] Update publish-to-test.yaml --- .github/workflows/publish-to-test.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-to-test.yaml b/.github/workflows/publish-to-test.yaml index a4a62ba98..19613233b 100644 --- a/.github/workflows/publish-to-test.yaml +++ b/.github/workflows/publish-to-test.yaml @@ -22,7 +22,8 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.9" + python-version: "3.11" + cache: 'pip' - name: Append Dev Version to __version__ run: | DEV_VERSION=${{ github.event.inputs.dev_version }} From 0752f74060e98d67fded578444c4a9d32137ab19 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sun, 5 May 2024 08:48:54 +0200 Subject: [PATCH 055/112] Update build-wheels-metal.yaml Add cache: 'pip' --- .github/workflows/build-wheels-metal.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-wheels-metal.yaml b/.github/workflows/build-wheels-metal.yaml index 41584691d..72ee4829b 100644 --- a/.github/workflows/build-wheels-metal.yaml +++ b/.github/workflows/build-wheels-metal.yaml @@ -44,6 +44,7 @@ jobs: - uses: actions/setup-python@v5 with: python-version: ${{ matrix.pyver }} + cache: 'pip' - name: Install Dependencies run: | From 8aaba56287e1dc2dfd4167743417eb1d531a8cb8 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sun, 5 May 2024 08:50:31 +0200 Subject: [PATCH 056/112] Update build-wheels-cuda.yaml --- .github/workflows/build-wheels-cuda.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-wheels-cuda.yaml b/.github/workflows/build-wheels-cuda.yaml index b00aec130..b8496d850 100644 --- a/.github/workflows/build-wheels-cuda.yaml +++ b/.github/workflows/build-wheels-cuda.yaml @@ -50,6 +50,7 @@ jobs: - uses: actions/setup-python@v5 with: python-version: ${{ matrix.pyver }} + cache: 'pip' - name: Setup Mamba uses: conda-incubator/setup-miniconda@v3.0.4 From c6f2df8fcd568f269ba8c9912c089e2670663a13 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sun, 5 May 2024 10:35:36 +0200 Subject: [PATCH 057/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 57e4dd816..7060eb35d 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -21,7 +21,8 @@ jobs: # Used to host cibuildwheel - uses: actions/setup-python@v5 with: - python-version: "3.9" + python-version: "3.12" + cache: 'pip' - name: Install dependencies run: | @@ -60,7 +61,8 @@ jobs: # Used to host cibuildwheel - uses: actions/setup-python@v5 with: - python-version: "3.9" + python-version: "3.12" + cache: 'pip' - name: Install dependencies run: | @@ -125,7 +127,8 @@ jobs: submodules: "recursive" - uses: actions/setup-python@v5 with: - python-version: "3.9" + python-version: "3.12" + cache: 'pip' - name: Install dependencies run: | python -m pip install --upgrade pip build @@ -170,7 +173,8 @@ jobs: # Used to host cibuildwheel - uses: actions/setup-python@v5 with: - python-version: "3.9" + python-version: "3.12" + cache: 'pip' - name: Install dependencies run: | @@ -211,7 +215,8 @@ jobs: # Used to host cibuildwheel - uses: actions/setup-python@v5 with: - python-version: "3.9" + python-version: "3.12" + cache: 'pip' - name: Install dependencies run: | @@ -253,6 +258,7 @@ jobs: - uses: actions/setup-python@v5 with: python-version: "3.9" + cache: 'pip' - name: Install dependencies run: | From 04af8b6ecd1ab0957144f5986dd8c67ad48713f3 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sun, 5 May 2024 13:28:44 +0200 Subject: [PATCH 058/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 7060eb35d..23542e115 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -257,7 +257,7 @@ jobs: # Used to host cibuildwheel - uses: actions/setup-python@v5 with: - python-version: "3.9" + python-version: "3.12" cache: 'pip' - name: Install dependencies From df611356e6ede37b25fa6a3cf94e5e915919e2df Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 10 May 2024 16:43:21 +0200 Subject: [PATCH 059/112] Update build-wheels-metal.yaml remove x86_64 --- .github/workflows/build-wheels-metal.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-wheels-metal.yaml b/.github/workflows/build-wheels-metal.yaml index 72ee4829b..e592db2c6 100644 --- a/.github/workflows/build-wheels-metal.yaml +++ b/.github/workflows/build-wheels-metal.yaml @@ -70,8 +70,8 @@ jobs: for file in ./dist/*.whl; do cp "$file" "${file/arm64.whl/aarch64.whl}"; done - export CMAKE_OSX_ARCHITECTURES="x86_64" && export CMAKE_ARGS="-DLLAMA_NATIVE=off -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off -DLLAMA_METAL=on" && export ARCHFLAGS="-arch x86_64" - VERBOSE=1 python -m build --wheel + # export CMAKE_OSX_ARCHITECTURES="x86_64" && export CMAKE_ARGS="-DLLAMA_NATIVE=off -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off -DLLAMA_METAL=on" && export ARCHFLAGS="-arch x86_64" + # VERBOSE=1 python -m build --wheel if [[ "$OSVER" == "macos-13" ]]; then export SDKROOT="${XCODE15PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.0.sdk" From 561013fe38b94b4e7a0012a894c86e1c1a90cf84 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 10 May 2024 16:44:17 +0200 Subject: [PATCH 060/112] Update build-wheels-metal.yaml --- .github/workflows/build-wheels-metal.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-wheels-metal.yaml b/.github/workflows/build-wheels-metal.yaml index e592db2c6..b81ec72eb 100644 --- a/.github/workflows/build-wheels-metal.yaml +++ b/.github/workflows/build-wheels-metal.yaml @@ -73,11 +73,11 @@ jobs: # export CMAKE_OSX_ARCHITECTURES="x86_64" && export CMAKE_ARGS="-DLLAMA_NATIVE=off -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off -DLLAMA_METAL=on" && export ARCHFLAGS="-arch x86_64" # VERBOSE=1 python -m build --wheel - if [[ "$OSVER" == "macos-13" ]]; then - export SDKROOT="${XCODE15PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.0.sdk" - export MACOSX_DEPLOYMENT_TARGET="14.0" - VERBOSE=1 python -m build --wheel - fi + # if [[ "$OSVER" == "macos-13" ]]; then + # export SDKROOT="${XCODE15PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.0.sdk" + # export MACOSX_DEPLOYMENT_TARGET="14.0" + # VERBOSE=1 python -m build --wheel + # fi - uses: softprops/action-gh-release@v2 with: From 39e74ca74e17b132c03c57899802b986f8e363a1 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sat, 11 May 2024 12:29:19 +0200 Subject: [PATCH 061/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 23542e115..a2b6617a5 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -51,7 +51,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-latest] + os: [macos-12, macos-13, macos-14] steps: - uses: actions/checkout@v4 @@ -72,7 +72,7 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.17.0 env: - CIBW_ARCHS: "auto64" + CIBW_ARCHS: "x86_64" # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' From e15305fdfffbac16ba0045d83c217781024a5d93 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sat, 11 May 2024 12:30:09 +0200 Subject: [PATCH 062/112] Update build-wheels-metal.yaml --- .github/workflows/build-wheels-metal.yaml | 92 ++++++++++------------- 1 file changed, 38 insertions(+), 54 deletions(-) diff --git a/.github/workflows/build-wheels-metal.yaml b/.github/workflows/build-wheels-metal.yaml index b81ec72eb..69b3bb08d 100644 --- a/.github/workflows/build-wheels-metal.yaml +++ b/.github/workflows/build-wheels-metal.yaml @@ -6,79 +6,63 @@ permissions: contents: write jobs: - define_matrix: - name: Define Build Matrix - runs-on: ubuntu-latest - outputs: - matrix: ${{ steps.set-matrix.outputs.matrix }} - defaults: - run: - shell: pwsh - - steps: - - name: Define Job Output - id: set-matrix - run: | - $matrix = @{ - 'os' = @('macos-12', 'macos-13', 'macos-14') - 'pyver' = @('3.9', '3.10', '3.11', '3.12') - } - - $matrixOut = ConvertTo-Json $matrix -Compress - Write-Output ('matrix=' + $matrixOut) >> $env:GITHUB_OUTPUT - build_wheels: - name: ${{ matrix.os }} Python ${{ matrix.pyver }} - needs: define_matrix + name: Build wheels on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: - matrix: ${{ fromJSON(needs.define_matrix.outputs.matrix) }} - env: - OSVER: ${{ matrix.os }} + matrix: + os: [macos-12, macos-13, macos-14] steps: - uses: actions/checkout@v4 with: submodules: "recursive" + # Used to host cibuildwheel - uses: actions/setup-python@v5 with: - python-version: ${{ matrix.pyver }} + python-version: "3.12" cache: 'pip' - - name: Install Dependencies + - name: Install dependencies run: | - python -m pip install build wheel cmake + python -m pip install --upgrade pip + python -m pip install -e .[all] - - name: Build Wheel - run: | - XCODE15PATH="/Applications/Xcode_15.0.app/Contents/Developer" - XCODE15BINPATH="${XCODE15PATH}/Toolchains/XcodeDefault.xctoolchain/usr/bin" - export CMAKE_ARGS="-DLLAMA_NATIVE=off -DLLAMA_METAL=on" - [[ "$OSVER" == "macos-13" ]] && export CC="${XCODE15BINPATH}/cc" && export CXX="${XCODE15BINPATH}/c++" && export MACOSX_DEPLOYMENT_TARGET="13.0" - [[ "$OSVER" == "macos-12" ]] && export MACOSX_DEPLOYMENT_TARGET="12.0" - # [[ "$OSVER" == "macos-11" ]] && export MACOSX_DEPLOYMENT_TARGET="11.0" - - export CMAKE_OSX_ARCHITECTURES="arm64" && export ARCHFLAGS="-arch arm64" - VERBOSE=1 python -m build --wheel - - if [[ "$OSVER" == "macos-13" ]]; then - export SDKROOT="${XCODE15PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.0.sdk" - export MACOSX_DEPLOYMENT_TARGET="14.0" - VERBOSE=1 python -m build --wheel - fi + - name: Build wheels + uses: pypa/cibuildwheel@v2.17.0 + env: + # disable repair + CIBW_REPAIR_WHEEL_COMMAND: "" + CIBW_ARCHS: "arm64" + CIBW_ENVIRONMENT: CMAKE_ARGS="-DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_APPLE_SILICON_PROCESSOR=arm64 -DLLAMA_METAL=on" + CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-*" + with: + package-dir: . + output-dir: wheelhouse - for file in ./dist/*.whl; do cp "$file" "${file/arm64.whl/aarch64.whl}"; done + - uses: actions/upload-artifact@v4 + with: + name: wheels-mac_${{ matrix.os }} + path: ./wheelhouse/*.whl - # export CMAKE_OSX_ARCHITECTURES="x86_64" && export CMAKE_ARGS="-DLLAMA_NATIVE=off -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off -DLLAMA_METAL=on" && export ARCHFLAGS="-arch x86_64" - # VERBOSE=1 python -m build --wheel + release: + name: Release + needs: [build_wheels] + runs-on: ubuntu-latest - # if [[ "$OSVER" == "macos-13" ]]; then - # export SDKROOT="${XCODE15PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.0.sdk" - # export MACOSX_DEPLOYMENT_TARGET="14.0" - # VERBOSE=1 python -m build --wheel - # fi + steps: + - uses: actions/download-artifact@v4 + with: + merge-multiple: true + path: dist + - uses: softprops/action-gh-release@v2 + with: + files: dist/* + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - uses: softprops/action-gh-release@v2 with: files: dist/* From ccd8bbb344abf3db1c12986c237109e423365e8f Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sat, 11 May 2024 12:33:59 +0200 Subject: [PATCH 063/112] Update build-wheels-metal.yaml --- .github/workflows/build-wheels-metal.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-wheels-metal.yaml b/.github/workflows/build-wheels-metal.yaml index 69b3bb08d..658e887cf 100644 --- a/.github/workflows/build-wheels-metal.yaml +++ b/.github/workflows/build-wheels-metal.yaml @@ -34,9 +34,10 @@ jobs: env: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" + CIBW_PLATFORM: "macos" CIBW_ARCHS: "arm64" CIBW_ENVIRONMENT: CMAKE_ARGS="-DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_APPLE_SILICON_PROCESSOR=arm64 -DLLAMA_METAL=on" - CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-*" + CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-*" with: package-dir: . output-dir: wheelhouse From bc406adc0af761d0765dc43e5634f74f47d3aff9 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sat, 11 May 2024 12:50:06 +0200 Subject: [PATCH 064/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index a2b6617a5..22c1f87b3 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -51,7 +51,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-12, macos-13, macos-14] + os: [macos-latest] steps: - uses: actions/checkout@v4 From 0c0946ec90aff3a4b766322ce44a962796ac40dd Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sat, 11 May 2024 13:22:46 +0200 Subject: [PATCH 065/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 22c1f87b3..b74be17a4 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -72,9 +72,10 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.17.0 env: - CIBW_ARCHS: "x86_64" # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" + CIBW_PLATFORM: "macos" + CIBW_ARCHS: "arm64" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-*" with: From a4f25b45d848276f5672e97f4a3f2ea989d3ed05 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sat, 11 May 2024 17:31:28 +0200 Subject: [PATCH 066/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index b74be17a4..b565729ea 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -75,7 +75,7 @@ jobs: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_PLATFORM: "macos" - CIBW_ARCHS: "arm64" + CIBW_ARCHS: "x86_64" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-*" with: From 5e1d021369c201779269ade43ca23fc7c9b02324 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sat, 11 May 2024 17:35:46 +0200 Subject: [PATCH 067/112] Update build-wheels-metal.yaml --- .github/workflows/build-wheels-metal.yaml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-wheels-metal.yaml b/.github/workflows/build-wheels-metal.yaml index 658e887cf..d55e6749f 100644 --- a/.github/workflows/build-wheels-metal.yaml +++ b/.github/workflows/build-wheels-metal.yaml @@ -34,18 +34,17 @@ jobs: env: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" - CIBW_PLATFORM: "macos" CIBW_ARCHS: "arm64" CIBW_ENVIRONMENT: CMAKE_ARGS="-DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_APPLE_SILICON_PROCESSOR=arm64 -DLLAMA_METAL=on" CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-*" with: package-dir: . - output-dir: wheelhouse + output-dir: wheelhouse2 - uses: actions/upload-artifact@v4 with: name: wheels-mac_${{ matrix.os }} - path: ./wheelhouse/*.whl + path: ./wheelhouse2/*.whl release: name: Release @@ -56,17 +55,11 @@ jobs: - uses: actions/download-artifact@v4 with: merge-multiple: true - path: dist - - - uses: softprops/action-gh-release@v2 - with: - files: dist/* - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + path: dist2 - uses: softprops/action-gh-release@v2 with: - files: dist/* + files: dist2/* # set release name to -metal tag_name: ${{ github.ref_name }}-metal env: From 79619a517fab733971eab5c0523fb28ed26dd205 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sat, 11 May 2024 18:00:40 +0200 Subject: [PATCH 068/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index b565729ea..10808438d 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -74,8 +74,7 @@ jobs: env: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" - CIBW_PLATFORM: "macos" - CIBW_ARCHS: "x86_64" + CIBW_ARCHS_MACOS: "x86_64" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-*" with: From 0e7d13528637007ebd61e9fbd45a0fe9c9c83dc6 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sat, 11 May 2024 18:05:13 +0200 Subject: [PATCH 069/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 10808438d..9046ad2bd 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -45,7 +45,7 @@ jobs: with: name: wheels-${{ matrix.os }} path: ./wheelhouse/*.whl - + build_wheels_mac: name: Build wheels on ${{ matrix.os }} runs-on: ${{ matrix.os }} @@ -72,9 +72,9 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.17.0 env: + CIBW_ARCHS: "auto64" # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" - CIBW_ARCHS_MACOS: "x86_64" CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-*" with: From 2fba497df12de25ed76a01021b437991ddd087b5 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sat, 11 May 2024 19:42:03 +0200 Subject: [PATCH 070/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 9046ad2bd..7dcc4a59b 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -51,7 +51,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-latest] + os: [macos-13] steps: - uses: actions/checkout@v4 From 1ed20b85d226f15962b5d5e7d48fbf10ede5f251 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 29 May 2024 12:15:24 +0200 Subject: [PATCH 071/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index ba1e29c46..49ce55bdb 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -70,7 +70,7 @@ jobs: python -m pip install -e .[all] - name: Build wheels - uses: pypa/cibuildwheel@v2.17.0 + uses: pypa/cibuildwheel@v2.18.1 env: CIBW_ARCHS: "auto64" # disable repair @@ -182,7 +182,7 @@ jobs: python -m pip install -e .[all] - name: Build wheels - uses: pypa/cibuildwheel@v2.17.0 + uses: pypa/cibuildwheel@v2.18.1 env: CIBW_ARCHS: "auto" # disable repair @@ -224,7 +224,7 @@ jobs: python -m pip install -e .[all] - name: Build wheels - uses: pypa/cibuildwheel@v2.17.0 + uses: pypa/cibuildwheel@v2.18.1 env: CIBW_ARCHS: "auto64" # disable repair @@ -266,7 +266,7 @@ jobs: python -m pip install -e .[all] - name: Build wheels - uses: pypa/cibuildwheel@v2.17.0 + uses: pypa/cibuildwheel@v2.18.1 env: CIBW_ARCHS: "auto64" # disable repair From bb98fa5258c7d81353f268fe31d3b85e6d6a8aa6 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Wed, 29 May 2024 12:16:12 +0200 Subject: [PATCH 072/112] Update build-wheels-metal.yaml --- .github/workflows/build-wheels-metal.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-wheels-metal.yaml b/.github/workflows/build-wheels-metal.yaml index d55e6749f..f007eb398 100644 --- a/.github/workflows/build-wheels-metal.yaml +++ b/.github/workflows/build-wheels-metal.yaml @@ -30,7 +30,7 @@ jobs: python -m pip install -e .[all] - name: Build wheels - uses: pypa/cibuildwheel@v2.17.0 + uses: pypa/cibuildwheel@v2.18.1 env: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" From 496a437ace257ae19fcdfeec144c30005dc12027 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 7 Jun 2024 00:22:32 +0200 Subject: [PATCH 073/112] revert --- .github/workflows/build-and-release.yaml | 183 +---------------------- 1 file changed, 5 insertions(+), 178 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 49ce55bdb..957912d09 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest] + os: [ubuntu-20.04, windows-2019, macos-11] steps: - uses: actions/checkout@v4 @@ -21,8 +21,7 @@ jobs: # Used to host cibuildwheel - uses: actions/setup-python@v5 with: - python-version: "3.12" - cache: 'pip' + python-version: "3.8" - name: Install dependencies run: | @@ -32,11 +31,8 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.18.1 env: - CIBW_ARCHS: "auto32" # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" - CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' - CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-*" with: package-dir: . output-dir: wheelhouse @@ -45,46 +41,6 @@ jobs: with: name: wheels-${{ matrix.os }} path: ./wheelhouse/*.whl - - build_wheels_mac: - name: Build wheels on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [macos-13] - - steps: - - uses: actions/checkout@v4 - with: - submodules: "recursive" - - # Used to host cibuildwheel - - uses: actions/setup-python@v5 - with: - python-version: "3.12" - cache: 'pip' - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - python -m pip install -e .[all] - - - name: Build wheels - uses: pypa/cibuildwheel@v2.18.1 - env: - CIBW_ARCHS: "auto64" - # disable repair - CIBW_REPAIR_WHEEL_COMMAND: "" - CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' - CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-*" - with: - package-dir: . - output-dir: wheelhouse - - - uses: actions/upload-artifact@v4 - with: - name: wheels-mac_${{ matrix.os }} - path: ./wheelhouse/*.whl build_wheels_arm64: name: Build arm64 wheels @@ -103,11 +59,9 @@ jobs: uses: pypa/cibuildwheel@v2.18.1 env: CIBW_SKIP: "*musllinux* pp*" - # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" CIBW_ARCHS: "aarch64" - CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS' - CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-*" + CIBW_BUILD: "cp38-* cp39-* cp310-* cp311-* cp312-*" with: output-dir: wheelhouse @@ -127,8 +81,7 @@ jobs: submodules: "recursive" - uses: actions/setup-python@v5 with: - python-version: "3.12" - cache: 'pip' + python-version: "3.8" - name: Install dependencies run: | python -m pip install --upgrade pip build @@ -143,7 +96,7 @@ jobs: release: name: Release - needs: [build_wheels, build_wheels_mac, build_wheels_arm64, build_sdist] + needs: [build_wheels, build_wheels_arm64, build_sdist] runs-on: ubuntu-latest steps: @@ -157,129 +110,3 @@ jobs: files: dist/* env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - build_wheels_avx: - name: Build wheels on ${{ matrix.os }} - AVX - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, windows-latest, macos-latest] - - steps: - - uses: actions/checkout@v4 - with: - submodules: "recursive" - - # Used to host cibuildwheel - - uses: actions/setup-python@v5 - with: - python-version: "3.12" - cache: 'pip' - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - python -m pip install -e .[all] - - - name: Build wheels - uses: pypa/cibuildwheel@v2.18.1 - env: - CIBW_ARCHS: "auto" - # disable repair - CIBW_REPAIR_WHEEL_COMMAND: "" - CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off' - CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-*" - with: - package-dir: . - output-dir: wheelhouse_avx - - - uses: softprops/action-gh-release@v2 - with: - files: wheelhouse_avx/* - tag_name: ${{ github.ref_name }}-avx - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - build_wheels_avx2: - name: Build wheels on ${{ matrix.os }} - AVX2 - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, windows-latest, macos-latest] - - steps: - - uses: actions/checkout@v4 - with: - submodules: "recursive" - - # Used to host cibuildwheel - - uses: actions/setup-python@v5 - with: - python-version: "3.12" - cache: 'pip' - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - python -m pip install -e .[all] - - - name: Build wheels - uses: pypa/cibuildwheel@v2.18.1 - env: - CIBW_ARCHS: "auto64" - # disable repair - CIBW_REPAIR_WHEEL_COMMAND: "" - CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS' - CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-*" - with: - package-dir: . - output-dir: wheelhouse_avx2 - - - uses: softprops/action-gh-release@v2 - with: - files: wheelhouse_avx2/* - tag_name: ${{ github.ref_name }}-avx2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - build_wheels_avx512: - name: Build wheels on ${{ matrix.os }} - AVX512 - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, windows-latest, macos-latest] - - steps: - - uses: actions/checkout@v4 - with: - submodules: "recursive" - - # Used to host cibuildwheel - - uses: actions/setup-python@v5 - with: - python-version: "3.12" - cache: 'pip' - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - python -m pip install -e .[all] - - - name: Build wheels - uses: pypa/cibuildwheel@v2.18.1 - env: - CIBW_ARCHS: "auto64" - # disable repair - CIBW_REPAIR_WHEEL_COMMAND: "" - CIBW_ENVIRONMENT: CMAKE_ARGS='-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DLLAMA_AVX512=on' - CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-*" - with: - package-dir: . - output-dir: wheelhouse_avx512 - - - uses: softprops/action-gh-release@v2 - with: - files: wheelhouse_avx512/* - tag_name: ${{ github.ref_name }}-avx512 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 6627890ecfd1122fd1e8d4d479f50709f56f7dea Mon Sep 17 00:00:00 2001 From: Andrei Betlen Date: Thu, 13 Jun 2024 10:16:45 -0400 Subject: [PATCH 074/112] Remove cpu variants --- .github/workflows/generate-index-from-release.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/generate-index-from-release.yaml b/.github/workflows/generate-index-from-release.yaml index 21648768b..500c4613c 100644 --- a/.github/workflows/generate-index-from-release.yaml +++ b/.github/workflows/generate-index-from-release.yaml @@ -35,9 +35,6 @@ jobs: - name: Build run: | ./scripts/releases-to-pep-503.sh index/whl/cpu '^[v]?[0-9]+\.[0-9]+\.[0-9]+$' - ./scripts/releases-to-pep-503.sh index/whl/cpu_avx '^[v]?[0-9]+\.[0-9]+\.[0-9]+-avx$' - ./scripts/releases-to-pep-503.sh index/whl/cpu_avx2 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-avx2$' - ./scripts/releases-to-pep-503.sh index/whl/cpu_avx512 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-avx512$' ./scripts/releases-to-pep-503.sh index/whl/cu121 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu121$' ./scripts/releases-to-pep-503.sh index/whl/cu122 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu122$' ./scripts/releases-to-pep-503.sh index/whl/cu123 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu123$' From 92c85e7bd96afb82313f3b120ffd8a9aeddf1af6 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Thu, 13 Jun 2024 21:23:09 +0200 Subject: [PATCH 075/112] Update build-wheels-metal.yaml --- .github/workflows/build-wheels-metal.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-wheels-metal.yaml b/.github/workflows/build-wheels-metal.yaml index f007eb398..11ab795c8 100644 --- a/.github/workflows/build-wheels-metal.yaml +++ b/.github/workflows/build-wheels-metal.yaml @@ -30,7 +30,7 @@ jobs: python -m pip install -e .[all] - name: Build wheels - uses: pypa/cibuildwheel@v2.18.1 + uses: pypa/cibuildwheel@v2.19.1 env: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" From b8c1341fe941e8ed84edd60a88f05261b8d7cb6e Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Thu, 13 Jun 2024 21:24:21 +0200 Subject: [PATCH 076/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index ebf52b337..b1543dffd 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, windows-2019, macos-11] + os: [ubuntu-20.04, windows-2019, macos-12] steps: - uses: actions/checkout@v4 @@ -21,7 +21,7 @@ jobs: # Used to host cibuildwheel - uses: actions/setup-python@v5 with: - python-version: "3.8" + python-version: "3.9" - name: Install dependencies run: | @@ -29,7 +29,7 @@ jobs: python -m pip install -e .[all] - name: Build wheels - uses: pypa/cibuildwheel@v2.19.0 + uses: pypa/cibuildwheel@v2.19.1 env: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" @@ -56,7 +56,7 @@ jobs: platforms: linux/arm64 - name: Build wheels - uses: pypa/cibuildwheel@v2.19.0 + uses: pypa/cibuildwheel@v2.19.1 env: CIBW_SKIP: "*musllinux* pp*" CIBW_REPAIR_WHEEL_COMMAND: "" @@ -81,7 +81,7 @@ jobs: submodules: "recursive" - uses: actions/setup-python@v5 with: - python-version: "3.8" + python-version: "3.9" - name: Install dependencies run: | python -m pip install --upgrade pip build From 4a1e933a7c8daf9909d70d8821093a6a1c16ca77 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Thu, 13 Jun 2024 21:26:26 +0200 Subject: [PATCH 077/112] Update publish-to-test.yaml --- .github/workflows/publish-to-test.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-to-test.yaml b/.github/workflows/publish-to-test.yaml index 19613233b..822c200bb 100644 --- a/.github/workflows/publish-to-test.yaml +++ b/.github/workflows/publish-to-test.yaml @@ -33,7 +33,8 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip build - python -m pip install -e .[all] + python -m pip install uv + python -m uv pip install -e .[all] - name: Build source distribution run: | python -m build --sdist From c806df1a75b4120bc2f72d8413c6a526c3d225d6 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Thu, 13 Jun 2024 21:27:49 +0200 Subject: [PATCH 078/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index b1543dffd..1a77ad267 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -26,7 +26,8 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install -e .[all] + python -m pip install uv + python -m uv pip install -e .[all] - name: Build wheels uses: pypa/cibuildwheel@v2.19.1 @@ -85,7 +86,8 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip build - python -m pip install -e .[all] + python -m pip install uv + python -m uv pip install -e .[all] - name: Build source distribution run: | python -m build --sdist From bdb1ca0fb17f90a4305f85d413d309716ebc6bbd Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Thu, 13 Jun 2024 21:28:55 +0200 Subject: [PATCH 079/112] Update build-wheels-metal.yaml --- .github/workflows/build-wheels-metal.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-wheels-metal.yaml b/.github/workflows/build-wheels-metal.yaml index 11ab795c8..ed13acbe5 100644 --- a/.github/workflows/build-wheels-metal.yaml +++ b/.github/workflows/build-wheels-metal.yaml @@ -27,7 +27,8 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install -e .[all] + python -m pip install uv + python -m pip uv install -e .[all] - name: Build wheels uses: pypa/cibuildwheel@v2.19.1 From e09a298193986766836adc8c2c7d956a4fee71ca Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Thu, 13 Jun 2024 21:29:34 +0200 Subject: [PATCH 080/112] Update publish.yaml --- .github/workflows/publish.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index c6abb43b3..7768e1f4d 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -20,7 +20,8 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip build - python -m pip install -e .[all] + python -m pip install uv + python -m uv pip install -e .[all] - name: Build source distribution run: | python -m build --sdist From 665d2cc34e119ed96ca09f4ad802a84b7cce2ada Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Thu, 13 Jun 2024 21:30:33 +0200 Subject: [PATCH 081/112] Update test-pypi.yaml --- .github/workflows/test-pypi.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-pypi.yaml b/.github/workflows/test-pypi.yaml index d7131956d..775bfdcf9 100644 --- a/.github/workflows/test-pypi.yaml +++ b/.github/workflows/test-pypi.yaml @@ -19,7 +19,8 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install --verbose llama-cpp-python[all] + python -m pip install uv + python -m uv pip install --verbose llama-cpp-python[all] - name: Test with pytest run: | python -c "import llama_cpp" @@ -40,7 +41,8 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install --verbose llama-cpp-python[all] + python -m pip install uv + python -m uv pip install --verbose llama-cpp-python[all] - name: Test with pytest run: | python -c "import llama_cpp" @@ -61,7 +63,8 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install --verbose llama-cpp-python[all] + python -m pip install uv + python -m pip uv install --verbose llama-cpp-python[all] - name: Test with pytest run: | python -c "import llama_cpp" From 86f0aa264eaee3567e6478eebfc48a9715f6d242 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Thu, 13 Jun 2024 21:32:39 +0200 Subject: [PATCH 082/112] Update test.yaml --- .github/workflows/test.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 6d8231d18..e77bf3d62 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -28,7 +28,8 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install .[all] -v + python -m pip install uv + python -m uv pip install .[all] -v - name: Test with pytest run: | python -m pytest @@ -52,7 +53,8 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install .[all] -v + python -m pip install uv + python -m uv pip install .[all] -v - name: Test with pytest run: | python -m pytest @@ -76,7 +78,8 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install .[all] --verbose + python -m pip install uv + python -m uv pip install .[all] --verbose - name: Test with pytest run: | python -m pytest @@ -123,7 +126,8 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - CMAKE_ARGS="-DLLAMA_METAL=on" python -m pip install .[all] --verbose + python -m pip install uv + CMAKE_ARGS="-DLLAMA_METAL=on" python -m uv pip install .[all] --verbose - name: Test with pytest run: | python -m pytest From 7e26b74508e0d6fba59a897884141e9075b3ca24 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 13:51:36 +0200 Subject: [PATCH 083/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 1a77ad267..4f2fb2bfb 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -27,7 +27,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install uv - python -m uv pip install -e .[all] + python -m RUST_LOG=trace uv pip install --verbose -e .[all] - name: Build wheels uses: pypa/cibuildwheel@v2.19.1 @@ -87,7 +87,7 @@ jobs: run: | python -m pip install --upgrade pip build python -m pip install uv - python -m uv pip install -e .[all] + python -m RUST_LOG=trace uv pip install --verbose -e .[all] - name: Build source distribution run: | python -m build --sdist From 290dcd598e31fd6d4e06358034c3caa537b10719 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 13:54:04 +0200 Subject: [PATCH 084/112] Update build-wheels-metal.yaml --- .github/workflows/build-wheels-metal.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-wheels-metal.yaml b/.github/workflows/build-wheels-metal.yaml index ed13acbe5..d0ab218c9 100644 --- a/.github/workflows/build-wheels-metal.yaml +++ b/.github/workflows/build-wheels-metal.yaml @@ -28,7 +28,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install uv - python -m pip uv install -e .[all] + python -m RUST_LOG=trace uv pip install --verbose -e .[all] - name: Build wheels uses: pypa/cibuildwheel@v2.19.1 From d3a20bed754430f2f4db22322543b3a196fc72ad Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 13:54:28 +0200 Subject: [PATCH 085/112] Update publish.yaml --- .github/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 7768e1f4d..3233f86bc 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -21,7 +21,7 @@ jobs: run: | python -m pip install --upgrade pip build python -m pip install uv - python -m uv pip install -e .[all] + python -m RUST_LOG=trace uv pip install --verbose -e .[all] - name: Build source distribution run: | python -m build --sdist From c1f89c993d4450876cc9804d60d81a415b7edb2e Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 13:56:35 +0200 Subject: [PATCH 086/112] Update test-pypi.yaml --- .github/workflows/test-pypi.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-pypi.yaml b/.github/workflows/test-pypi.yaml index 775bfdcf9..9e4c3341c 100644 --- a/.github/workflows/test-pypi.yaml +++ b/.github/workflows/test-pypi.yaml @@ -20,7 +20,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install uv - python -m uv pip install --verbose llama-cpp-python[all] + python -m RUST_LOG=trace uv pip install --verbose llama-cpp-python[all] - name: Test with pytest run: | python -c "import llama_cpp" @@ -42,7 +42,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install uv - python -m uv pip install --verbose llama-cpp-python[all] + python -m RUST_LOG=trace uv pip install --verbose llama-cpp-python[all] - name: Test with pytest run: | python -c "import llama_cpp" @@ -64,7 +64,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install uv - python -m pip uv install --verbose llama-cpp-python[all] + python -m RUST_LOG=trace uv pip install --verbose llama-cpp-python[all] - name: Test with pytest run: | python -c "import llama_cpp" From 460c4a8c4efdf1ad35ce8a0447539c5c6549ec0b Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 13:57:19 +0200 Subject: [PATCH 087/112] Update publish-to-test.yaml --- .github/workflows/publish-to-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-to-test.yaml b/.github/workflows/publish-to-test.yaml index 822c200bb..eb9d950c1 100644 --- a/.github/workflows/publish-to-test.yaml +++ b/.github/workflows/publish-to-test.yaml @@ -34,7 +34,7 @@ jobs: run: | python -m pip install --upgrade pip build python -m pip install uv - python -m uv pip install -e .[all] + python -m RUST_LOG=trace uv pip install --verbose -e .[all] - name: Build source distribution run: | python -m build --sdist From 6ea3acb92c2579a1f969eae2f4f6159653bf3743 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 13:59:38 +0200 Subject: [PATCH 088/112] Update test.yaml --- .github/workflows/test.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e77bf3d62..f2435f1f3 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -29,7 +29,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install uv - python -m uv pip install .[all] -v + python -m RUST_LOG=trace uv pip install --verbose -e .[all] - name: Test with pytest run: | python -m pytest @@ -54,7 +54,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install uv - python -m uv pip install .[all] -v + python -m RUST_LOG=trace uv pip install --verbose -e .[all] - name: Test with pytest run: | python -m pytest @@ -79,7 +79,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install uv - python -m uv pip install .[all] --verbose + python -m RUST_LOG=trace uv pip install --verbose -e .[all] - name: Test with pytest run: | python -m pytest @@ -127,7 +127,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install uv - CMAKE_ARGS="-DLLAMA_METAL=on" python -m uv pip install .[all] --verbose + python -m CMAKE_ARGS="-DLLAMA_METAL=on" RUST_LOG=trace uv pip install .[all] --verbose - name: Test with pytest run: | python -m pytest From 9bc8d2182cafb6dd293277bda3108a72e1c9834e Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 14:08:09 +0200 Subject: [PATCH 089/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 4f2fb2bfb..bc71a54f7 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -27,7 +27,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install uv - python -m RUST_LOG=trace uv pip install --verbose -e .[all] + RUST_LOG=trace python -m uv pip install -e .[all] --verbose - name: Build wheels uses: pypa/cibuildwheel@v2.19.1 @@ -87,7 +87,7 @@ jobs: run: | python -m pip install --upgrade pip build python -m pip install uv - python -m RUST_LOG=trace uv pip install --verbose -e .[all] + RUST_LOG=trace python -m uv pip install -e .[all] --verbose - name: Build source distribution run: | python -m build --sdist From 718ee2f1cdbc2165f0f965dfa3e681b427dfbdff Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 14:11:13 +0200 Subject: [PATCH 090/112] Update build-wheels-metal.yaml --- .github/workflows/build-wheels-metal.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-wheels-metal.yaml b/.github/workflows/build-wheels-metal.yaml index d0ab218c9..0a5d7d4bc 100644 --- a/.github/workflows/build-wheels-metal.yaml +++ b/.github/workflows/build-wheels-metal.yaml @@ -28,7 +28,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install uv - python -m RUST_LOG=trace uv pip install --verbose -e .[all] + RUST_LOG=trace python -m uv pip install -e .[all] --verbose - name: Build wheels uses: pypa/cibuildwheel@v2.19.1 From 56c0a729e527ba3367c638c0e27c8841e328bfeb Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 14:11:40 +0200 Subject: [PATCH 091/112] Update publish-to-test.yaml --- .github/workflows/publish-to-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-to-test.yaml b/.github/workflows/publish-to-test.yaml index eb9d950c1..9c357d043 100644 --- a/.github/workflows/publish-to-test.yaml +++ b/.github/workflows/publish-to-test.yaml @@ -34,7 +34,7 @@ jobs: run: | python -m pip install --upgrade pip build python -m pip install uv - python -m RUST_LOG=trace uv pip install --verbose -e .[all] + RUST_LOG=trace python -m uv pip install -e .[all] --verbose - name: Build source distribution run: | python -m build --sdist From fe6cf4f2ec1aa910900a1c3c033c73a2f1b6d0f9 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 14:12:10 +0200 Subject: [PATCH 092/112] Update publish.yaml --- .github/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 3233f86bc..e8bb8e4f9 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -21,7 +21,7 @@ jobs: run: | python -m pip install --upgrade pip build python -m pip install uv - python -m RUST_LOG=trace uv pip install --verbose -e .[all] + RUST_LOG=trace python -m uv pip install -e .[all] --verbose - name: Build source distribution run: | python -m build --sdist From 1057f27e4064aaf2b99ff387ea90478aef4679c0 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 14:13:20 +0200 Subject: [PATCH 093/112] Update test-pypi.yaml --- .github/workflows/test-pypi.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-pypi.yaml b/.github/workflows/test-pypi.yaml index 9e4c3341c..cc7fc047b 100644 --- a/.github/workflows/test-pypi.yaml +++ b/.github/workflows/test-pypi.yaml @@ -20,7 +20,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install uv - python -m RUST_LOG=trace uv pip install --verbose llama-cpp-python[all] + RUST_LOG=trace python -m uv pip install llama-cpp-python[all] --verbose - name: Test with pytest run: | python -c "import llama_cpp" @@ -42,7 +42,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install uv - python -m RUST_LOG=trace uv pip install --verbose llama-cpp-python[all] + RUST_LOG=trace python -m uv pip install llama-cpp-python[all] --verbose - name: Test with pytest run: | python -c "import llama_cpp" @@ -64,7 +64,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install uv - python -m RUST_LOG=trace uv pip install --verbose llama-cpp-python[all] + RUST_LOG=trace python -m uv pip install llama-cpp-python[all] --verbose - name: Test with pytest run: | python -c "import llama_cpp" From 8ccddd535300e249c40b844d5c0fbbb76caba351 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 14:14:28 +0200 Subject: [PATCH 094/112] Update test.yaml --- .github/workflows/test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index f2435f1f3..b1d9f89ca 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -54,7 +54,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install uv - python -m RUST_LOG=trace uv pip install --verbose -e .[all] + RUST_LOG=trace python -m uv pip install -e .[all] --verbose - name: Test with pytest run: | python -m pytest @@ -79,7 +79,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install uv - python -m RUST_LOG=trace uv pip install --verbose -e .[all] + RUST_LOG=trace python -m uv pip install -e .[all] --verbose - name: Test with pytest run: | python -m pytest @@ -127,7 +127,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install uv - python -m CMAKE_ARGS="-DLLAMA_METAL=on" RUST_LOG=trace uv pip install .[all] --verbose + CMAKE_ARGS="-DLLAMA_METAL=on" RUST_LOG=trace python -m uv pip install .[all] --verbose - name: Test with pytest run: | python -m pytest From 241ff8da4ce23d4d0b13bf7f535ba97ccce0872c Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 14:15:20 +0200 Subject: [PATCH 095/112] Update test.yaml --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index b1d9f89ca..6fc580fe9 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -29,7 +29,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install uv - python -m RUST_LOG=trace uv pip install --verbose -e .[all] + RUST_LOG=trace python -m uv pip install -e .[all] --verbose - name: Test with pytest run: | python -m pytest From b4062d1d9890676a3545f16797cc0c2b228d5119 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 14:43:37 +0200 Subject: [PATCH 096/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 30 +++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index bc71a54f7..ec054879f 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -23,11 +23,21 @@ jobs: with: python-version: "3.9" - - name: Install dependencies + - name: Install dependencies (Linux/MacOS) + if: runner.os != 'Windows' run: | python -m pip install --upgrade pip python -m pip install uv RUST_LOG=trace python -m uv pip install -e .[all] --verbose + shell: bash + + - name: Install dependencies (Windows) + if: runner.os == 'Windows' + run: | + python -m pip install --upgrade pip + python -m pip install uv + set RUST_LOG=trace && python -m uv pip install -e .[all] --verbose + shell: cmd - name: Build wheels uses: pypa/cibuildwheel@v2.19.1 @@ -80,17 +90,31 @@ jobs: - uses: actions/checkout@v4 with: submodules: "recursive" + - uses: actions/setup-python@v5 with: python-version: "3.9" - - name: Install dependencies + + - name: Install dependencies (Linux/MacOS) + if: runner.os != 'Windows' run: | - python -m pip install --upgrade pip build + python -m pip install --upgrade pip python -m pip install uv RUST_LOG=trace python -m uv pip install -e .[all] --verbose + shell: bash + + - name: Install dependencies (Windows) + if: runner.os == 'Windows' + run: | + python -m pip install --upgrade pip + python -m pip install uv + set RUST_LOG=trace && python -m uv pip install -e .[all] --verbose + shell: cmd + - name: Build source distribution run: | python -m build --sdist + - uses: actions/upload-artifact@v4 with: name: sdist From f6a5dba3c8fc631b27b1417cde4f63aebb20da2f Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 14:44:55 +0200 Subject: [PATCH 097/112] Update publish-to-test.yaml --- .github/workflows/publish-to-test.yaml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-to-test.yaml b/.github/workflows/publish-to-test.yaml index 9c357d043..6e7fff294 100644 --- a/.github/workflows/publish-to-test.yaml +++ b/.github/workflows/publish-to-test.yaml @@ -19,25 +19,40 @@ jobs: - uses: actions/checkout@v4 with: submodules: "recursive" + - name: Set up Python uses: actions/setup-python@v5 with: python-version: "3.11" cache: 'pip' + - name: Append Dev Version to __version__ run: | DEV_VERSION=${{ github.event.inputs.dev_version }} CURRENT_VERSION=$(awk -F= '/__version__ =/ {print $2}' llama_cpp/__init__.py | tr -d ' "') NEW_VERSION="${CURRENT_VERSION}.dev${DEV_VERSION}" sed -i 's/__version__ = \".*\"/__version__ = \"'"${NEW_VERSION}"'\"/' llama_cpp/__init__.py - - name: Install dependencies + + - name: Install dependencies (Linux/MacOS) + if: runner.os != 'Windows' run: | - python -m pip install --upgrade pip build + python -m pip install --upgrade pip python -m pip install uv RUST_LOG=trace python -m uv pip install -e .[all] --verbose + shell: bash + + - name: Install dependencies (Windows) + if: runner.os == 'Windows' + run: | + python -m pip install --upgrade pip + python -m pip install uv + set RUST_LOG=trace && python -m uv pip install -e .[all] --verbose + shell: cmd + - name: Build source distribution run: | python -m build --sdist + - name: Publish to Test PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: From 4f3d9aaacebc2e92b0524836f7df33176f763d53 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 14:45:29 +0200 Subject: [PATCH 098/112] Update build-wheels-metal.yaml --- .github/workflows/build-wheels-metal.yaml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-wheels-metal.yaml b/.github/workflows/build-wheels-metal.yaml index 0a5d7d4bc..998ef7b23 100644 --- a/.github/workflows/build-wheels-metal.yaml +++ b/.github/workflows/build-wheels-metal.yaml @@ -24,11 +24,21 @@ jobs: python-version: "3.12" cache: 'pip' - - name: Install dependencies + - name: Install dependencies (Linux/MacOS) + if: runner.os != 'Windows' run: | python -m pip install --upgrade pip python -m pip install uv RUST_LOG=trace python -m uv pip install -e .[all] --verbose + shell: bash + + - name: Install dependencies (Windows) + if: runner.os == 'Windows' + run: | + python -m pip install --upgrade pip + python -m pip install uv + set RUST_LOG=trace && python -m uv pip install -e .[all] --verbose + shell: cmd - name: Build wheels uses: pypa/cibuildwheel@v2.19.1 From 8c14e92385929c269cf67c702f32caaa79f4c6bd Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 14:47:27 +0200 Subject: [PATCH 099/112] Update test-pypi.yaml --- .github/workflows/test-pypi.yaml | 47 ++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-pypi.yaml b/.github/workflows/test-pypi.yaml index cc7fc047b..0bfcf6b48 100644 --- a/.github/workflows/test-pypi.yaml +++ b/.github/workflows/test-pypi.yaml @@ -16,11 +16,23 @@ jobs: with: python-version: ${{ matrix.python-version }} cache: 'pip' - - name: Install dependencies + + - name: Install dependencies (Linux/MacOS) + if: runner.os != 'Windows' run: | python -m pip install --upgrade pip python -m pip install uv RUST_LOG=trace python -m uv pip install llama-cpp-python[all] --verbose + shell: bash + + - name: Install dependencies (Windows) + if: runner.os == 'Windows' + run: | + python -m pip install --upgrade pip + python -m pip install uv + set RUST_LOG=trace && python -m uv pip install llama-cpp-python[all] --verbose + shell: cmd + - name: Test with pytest run: | python -c "import llama_cpp" @@ -38,11 +50,23 @@ jobs: with: python-version: ${{ matrix.python-version }} cache: 'pip' - - name: Install dependencies + + - name: Install dependencies (Linux/MacOS) + if: runner.os != 'Windows' + run: | + python -m pip install --upgrade pip + python -m pip install uv + RUST_LOG=trace python -m uv pip install llama-cpp-python[all] --verbose + shell: bash + + - name: Install dependencies (Windows) + if: runner.os == 'Windows' run: | python -m pip install --upgrade pip python -m pip install uv - RUST_LOG=trace python -m uv pip install llama-cpp-python[all] --verbose + set RUST_LOG=trace && python -m uv pip install llama-cpp-python[all] --verbose + shell: cmd + - name: Test with pytest run: | python -c "import llama_cpp" @@ -60,11 +84,24 @@ jobs: with: python-version: ${{ matrix.python-version }} cache: 'pip' - - name: Install dependencies + + + - name: Install dependencies (Linux/MacOS) + if: runner.os != 'Windows' + run: | + python -m pip install --upgrade pip + python -m pip install uv + RUST_LOG=trace python -m uv pip install llama-cpp-python[all] --verbose + shell: bash + + - name: Install dependencies (Windows) + if: runner.os == 'Windows' run: | python -m pip install --upgrade pip python -m pip install uv - RUST_LOG=trace python -m uv pip install llama-cpp-python[all] --verbose + set RUST_LOG=trace && python -m uv pip install llama-cpp-python[all] --verbose + shell: cmd + - name: Test with pytest run: | python -c "import llama_cpp" From 0ac8ec2467d1386ca0c25c36805a1d4dab115019 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 14:50:16 +0200 Subject: [PATCH 100/112] Update test.yaml --- .github/workflows/test.yaml | 62 ++++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 6fc580fe9..51e168059 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -20,16 +20,29 @@ jobs: - uses: actions/checkout@v4 with: submodules: "recursive" + - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} cache: 'pip' - - name: Install dependencies + + - name: Install dependencies (Linux/MacOS) + if: runner.os != 'Windows' run: | python -m pip install --upgrade pip python -m pip install uv RUST_LOG=trace python -m uv pip install -e .[all] --verbose + shell: bash + + - name: Install dependencies (Windows) + if: runner.os == 'Windows' + run: | + python -m pip install --upgrade pip + python -m pip install uv + set RUST_LOG=trace && python -m uv pip install -e .[all] --verbose + shell: cmd + - name: Test with pytest run: | python -m pytest @@ -45,16 +58,29 @@ jobs: - uses: actions/checkout@v4 with: submodules: "recursive" + - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} cache: 'pip' - - name: Install dependencies + + - name: Install dependencies (Linux/MacOS) + if: runner.os != 'Windows' run: | python -m pip install --upgrade pip python -m pip install uv RUST_LOG=trace python -m uv pip install -e .[all] --verbose + shell: bash + + - name: Install dependencies (Windows) + if: runner.os == 'Windows' + run: | + python -m pip install --upgrade pip + python -m pip install uv + set RUST_LOG=trace && python -m uv pip install -e .[all] --verbose + shell: cmd + - name: Test with pytest run: | python -m pytest @@ -70,16 +96,29 @@ jobs: - uses: actions/checkout@v4 with: submodules: "recursive" + - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} cache: 'pip' - - name: Install dependencies + + - name: Install dependencies (Linux/MacOS) + if: runner.os != 'Windows' run: | python -m pip install --upgrade pip python -m pip install uv RUST_LOG=trace python -m uv pip install -e .[all] --verbose + shell: bash + + - name: Install dependencies (Windows) + if: runner.os == 'Windows' + run: | + python -m pip install --upgrade pip + python -m pip install uv + set RUST_LOG=trace && python -m uv pip install -e .[all] --verbose + shell: cmd + - name: Test with pytest run: | python -m pytest @@ -119,15 +158,28 @@ jobs: - uses: actions/checkout@v4 with: submodules: "recursive" + - name: Set up Python 3.9 uses: actions/setup-python@v5 with: python-version: "3.9" - - name: Install dependencies + + - name: Install dependencies (Linux/MacOS) + if: runner.os != 'Windows' + run: | + python -m pip install --upgrade pip + python -m pip install uv + RUST_LOG=trace CMAKE_ARGS="-DLLAMA_METAL=on" python -m uv pip install .[all] --verbose + shell: bash + + - name: Install dependencies (Windows) + if: runner.os == 'Windows' run: | python -m pip install --upgrade pip python -m pip install uv - CMAKE_ARGS="-DLLAMA_METAL=on" RUST_LOG=trace python -m uv pip install .[all] --verbose + set RUST_LOG=trace && CMAKE_ARGS="-DLLAMA_METAL=on" python -m uv pip install .[all] --verbose + shell: cmd + - name: Test with pytest run: | python -m pytest From c848800054ae813ecbdb045337c7b8880098110f Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 14:54:17 +0200 Subject: [PATCH 101/112] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index ec054879f..dda314fe0 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -33,10 +33,12 @@ jobs: - name: Install dependencies (Windows) if: runner.os == 'Windows' + env: + RUST_LOG: trace run: | python -m pip install --upgrade pip python -m pip install uv - set RUST_LOG=trace && python -m uv pip install -e .[all] --verbose + python -m uv pip install -e .[all] --verbose shell: cmd - name: Build wheels @@ -105,10 +107,12 @@ jobs: - name: Install dependencies (Windows) if: runner.os == 'Windows' + env: + RUST_LOG: trace run: | python -m pip install --upgrade pip python -m pip install uv - set RUST_LOG=trace && python -m uv pip install -e .[all] --verbose + python -m uv pip install -e .[all] --verbose shell: cmd - name: Build source distribution From a6ccc6af0e5534c43b7788c1f3e0f8bb0cf744a3 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 14:54:52 +0200 Subject: [PATCH 102/112] Update build-wheels-metal.yaml --- .github/workflows/build-wheels-metal.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-wheels-metal.yaml b/.github/workflows/build-wheels-metal.yaml index 998ef7b23..f461cf7d9 100644 --- a/.github/workflows/build-wheels-metal.yaml +++ b/.github/workflows/build-wheels-metal.yaml @@ -26,10 +26,12 @@ jobs: - name: Install dependencies (Linux/MacOS) if: runner.os != 'Windows' + env: + RUST_LOG: trace run: | python -m pip install --upgrade pip python -m pip install uv - RUST_LOG=trace python -m uv pip install -e .[all] --verbose + python -m uv pip install -e .[all] --verbose shell: bash - name: Install dependencies (Windows) From 0fe0495061ae71806b68b942dd8fb24203e8f997 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 14:56:15 +0200 Subject: [PATCH 103/112] Update build-wheels-metal.yaml --- .github/workflows/build-wheels-metal.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-wheels-metal.yaml b/.github/workflows/build-wheels-metal.yaml index f461cf7d9..cce84dc65 100644 --- a/.github/workflows/build-wheels-metal.yaml +++ b/.github/workflows/build-wheels-metal.yaml @@ -23,23 +23,23 @@ jobs: with: python-version: "3.12" cache: 'pip' - + - name: Install dependencies (Linux/MacOS) if: runner.os != 'Windows' - env: - RUST_LOG: trace run: | python -m pip install --upgrade pip python -m pip install uv - python -m uv pip install -e .[all] --verbose + RUST_LOG=trace python -m uv pip install -e .[all] --verbose shell: bash - name: Install dependencies (Windows) if: runner.os == 'Windows' + env: + RUST_LOG: trace run: | python -m pip install --upgrade pip python -m pip install uv - set RUST_LOG=trace && python -m uv pip install -e .[all] --verbose + python -m uv pip install -e .[all] --verbose shell: cmd - name: Build wheels From 6c3f4431be1af5879e65bb05bf5a82a8f1ab3e34 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 14:56:59 +0200 Subject: [PATCH 104/112] Update publish.yaml --- .github/workflows/publish.yaml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index e8bb8e4f9..67816ea03 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -13,18 +13,34 @@ jobs: - uses: actions/checkout@v4 with: submodules: "recursive" + - name: Set up Python uses: actions/setup-python@v5 with: python-version: "3.9" - - name: Install dependencies + + - name: Install dependencies (Linux/MacOS) + if: runner.os != 'Windows' run: | - python -m pip install --upgrade pip build + python -m pip install --upgrade pip python -m pip install uv RUST_LOG=trace python -m uv pip install -e .[all] --verbose + shell: bash + + - name: Install dependencies (Windows) + if: runner.os == 'Windows' + env: + RUST_LOG: trace + run: | + python -m pip install --upgrade pip + python -m pip install uv + python -m uv pip install -e .[all] --verbose + shell: cmd + - name: Build source distribution run: | python -m build --sdist + - name: Publish distribution to PyPI # TODO: move to tag based releases # if: startsWith(github.ref, 'refs/tags') From a96a47080e7fd04373ae6800dddd059f0af1ff6f Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 14:59:35 +0200 Subject: [PATCH 105/112] Update publish-to-test.yaml --- .github/workflows/publish-to-test.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-to-test.yaml b/.github/workflows/publish-to-test.yaml index 6e7fff294..de3ae42aa 100644 --- a/.github/workflows/publish-to-test.yaml +++ b/.github/workflows/publish-to-test.yaml @@ -43,10 +43,12 @@ jobs: - name: Install dependencies (Windows) if: runner.os == 'Windows' + env: + RUST_LOG: trace run: | python -m pip install --upgrade pip python -m pip install uv - set RUST_LOG=trace && python -m uv pip install -e .[all] --verbose + python -m uv pip install -e .[all] --verbose shell: cmd - name: Build source distribution From 31b31059326859ec246be20741741a09816a687d Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 15:01:54 +0200 Subject: [PATCH 106/112] Update test-pypi.yaml --- .github/workflows/test-pypi.yaml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-pypi.yaml b/.github/workflows/test-pypi.yaml index 0bfcf6b48..335033bba 100644 --- a/.github/workflows/test-pypi.yaml +++ b/.github/workflows/test-pypi.yaml @@ -27,10 +27,12 @@ jobs: - name: Install dependencies (Windows) if: runner.os == 'Windows' + env: + RUST_LOG: trace run: | python -m pip install --upgrade pip python -m pip install uv - set RUST_LOG=trace && python -m uv pip install llama-cpp-python[all] --verbose + python -m uv pip install llama-cpp-python[all] --verbose shell: cmd - name: Test with pytest @@ -61,10 +63,12 @@ jobs: - name: Install dependencies (Windows) if: runner.os == 'Windows' + env: + RUST_LOG: trace run: | python -m pip install --upgrade pip python -m pip install uv - set RUST_LOG=trace && python -m uv pip install llama-cpp-python[all] --verbose + python -m uv pip install llama-cpp-python[all] --verbose shell: cmd - name: Test with pytest @@ -83,8 +87,7 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - cache: 'pip' - + cache: 'pip' - name: Install dependencies (Linux/MacOS) if: runner.os != 'Windows' @@ -96,10 +99,12 @@ jobs: - name: Install dependencies (Windows) if: runner.os == 'Windows' + env: + RUST_LOG: trace run: | python -m pip install --upgrade pip python -m pip install uv - set RUST_LOG=trace && python -m uv pip install llama-cpp-python[all] --verbose + python -m uv pip install llama-cpp-python[all] --verbose shell: cmd - name: Test with pytest From 000d8624e48f2ff9326a5fcab9768f8ced1d806c Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 15:04:28 +0200 Subject: [PATCH 107/112] Update test.yaml --- .github/workflows/test.yaml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 51e168059..cb5f62d59 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -37,10 +37,12 @@ jobs: - name: Install dependencies (Windows) if: runner.os == 'Windows' + env: + RUST_LOG: trace run: | python -m pip install --upgrade pip python -m pip install uv - set RUST_LOG=trace && python -m uv pip install -e .[all] --verbose + python -m uv pip install -e .[all] --verbose shell: cmd - name: Test with pytest @@ -75,11 +77,13 @@ jobs: - name: Install dependencies (Windows) if: runner.os == 'Windows' + env: + RUST_LOG: trace run: | python -m pip install --upgrade pip python -m pip install uv - set RUST_LOG=trace && python -m uv pip install -e .[all] --verbose - shell: cmd + python -m uv pip install -e .[all] --verbose + shell: cmd - name: Test with pytest run: | @@ -113,10 +117,12 @@ jobs: - name: Install dependencies (Windows) if: runner.os == 'Windows' + env: + RUST_LOG: trace run: | python -m pip install --upgrade pip python -m pip install uv - set RUST_LOG=trace && python -m uv pip install -e .[all] --verbose + python -m uv pip install -e .[all] --verbose shell: cmd - name: Test with pytest @@ -174,10 +180,12 @@ jobs: - name: Install dependencies (Windows) if: runner.os == 'Windows' + env: + RUST_LOG: trace run: | python -m pip install --upgrade pip python -m pip install uv - set RUST_LOG=trace && CMAKE_ARGS="-DLLAMA_METAL=on" python -m uv pip install .[all] --verbose + CMAKE_ARGS="-DLLAMA_METAL=on" python -m uv pip install .[all] --verbose shell: cmd - name: Test with pytest From ad1477f010186e230a67e9eb1262dcdb89b7261f Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 15:20:10 +0200 Subject: [PATCH 108/112] Update build-wheels-cuda.yaml --- .github/workflows/build-wheels-cuda.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-wheels-cuda.yaml b/.github/workflows/build-wheels-cuda.yaml index b8496d850..6a1a7f9d9 100644 --- a/.github/workflows/build-wheels-cuda.yaml +++ b/.github/workflows/build-wheels-cuda.yaml @@ -22,7 +22,7 @@ jobs: $matrix = @{ 'os' = @('ubuntu-latest', 'windows-latest') 'pyver' = @("3.9", "3.10", "3.11", "3.12") - 'cuda' = @("12.1.1", "12.2.2", "12.3.2", "12.4.1") + 'cuda' = @("12.1.1", "12.2.2", "12.3.2", "12.4.1", "12.5.0") 'releasetag' = @("basic") } From 099811a36499205a84244fba759b947341785c9f Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Fri, 14 Jun 2024 15:20:43 +0200 Subject: [PATCH 109/112] Update generate-index-from-release.yaml --- .github/workflows/generate-index-from-release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/generate-index-from-release.yaml b/.github/workflows/generate-index-from-release.yaml index 500c4613c..8b5ac8128 100644 --- a/.github/workflows/generate-index-from-release.yaml +++ b/.github/workflows/generate-index-from-release.yaml @@ -39,6 +39,7 @@ jobs: ./scripts/releases-to-pep-503.sh index/whl/cu122 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu122$' ./scripts/releases-to-pep-503.sh index/whl/cu123 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu123$' ./scripts/releases-to-pep-503.sh index/whl/cu124 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu124$' + ./scripts/releases-to-pep-503.sh index/whl/cu125 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu125$' ./scripts/releases-to-pep-503.sh index/whl/metal '^[v]?[0-9]+\.[0-9]+\.[0-9]+-metal$' - name: Upload artifact uses: actions/upload-pages-artifact@v3 From f7b3fca7f31a5c8fa49ab2a99c6828f76a0630cc Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sat, 15 Jun 2024 08:44:47 +0200 Subject: [PATCH 110/112] Update README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0f7abfb28..408d2173d 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Github All Releases](https://img.shields.io/github/downloads/abetlen/llama-cpp-python/total.svg?label=Github%20Downloads)]() Simple Python bindings for **@ggerganov's** [`llama.cpp`](https://github.com/ggerganov/llama.cpp) library. -This package provides: +This package provides:cud - Low-level access to C API via `ctypes` interface. - High-level Python API for text completion @@ -121,7 +121,7 @@ CMAKE_ARGS="-DLLAMA_CUDA=on" pip install llama-cpp-python It is also possible to install a pre-built wheel with CUDA support. As long as your system meets some requirements: -- CUDA Version is 12.1, 12.2, 12.3, or 12.4 +- CUDA Version is 12.1, 12.2, 12.3, 12.4 or 12.5 - Python Version is 3.10, 3.11 or 3.12 ```bash @@ -134,6 +134,7 @@ Where `` is one of the following: - `cu122`: CUDA 12.2 - `cu123`: CUDA 12.3 - `cu124`: CUDA 12.4 +- `cu124`: CUDA 12.5 For example, to install the CUDA 12.1 wheel: From f4dfa61ee8095e23d0c668eb6ba41cd06a3a5070 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sat, 15 Jun 2024 20:03:09 +0200 Subject: [PATCH 111/112] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 408d2173d..1541ec4d5 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Github All Releases](https://img.shields.io/github/downloads/abetlen/llama-cpp-python/total.svg?label=Github%20Downloads)]() Simple Python bindings for **@ggerganov's** [`llama.cpp`](https://github.com/ggerganov/llama.cpp) library. -This package provides:cud +This package provides: - Low-level access to C API via `ctypes` interface. - High-level Python API for text completion From 387b289fbacc0e5fecd9415ade802060446565ed Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sat, 15 Jun 2024 20:03:49 +0200 Subject: [PATCH 112/112] Update test.yaml --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index cb5f62d59..6be9dd33f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -185,7 +185,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install uv - CMAKE_ARGS="-DLLAMA_METAL=on" python -m uv pip install .[all] --verbose + CMAKE_ARGS="-DLLAMA_METAL=on" python -m uv pip install .[all] -vvv shell: cmd - name: Test with pytest