From b7c4fb8d290d55bbdc85b35954fa6bce748e5014 Mon Sep 17 00:00:00 2001 From: Johnny Date: Mon, 7 Jul 2025 12:34:21 +0200 Subject: [PATCH 01/10] Update build-wheels-cuda.yaml --- .github/workflows/build-wheels-cuda.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-wheels-cuda.yaml b/.github/workflows/build-wheels-cuda.yaml index 07b30cfc0..0bd57a08e 100644 --- a/.github/workflows/build-wheels-cuda.yaml +++ b/.github/workflows/build-wheels-cuda.yaml @@ -20,9 +20,9 @@ jobs: id: set-matrix run: | $matrix = @{ - 'os' = @('ubuntu-22.04') #, 'windows-2022') - 'pyver' = @("3.9", "3.10", "3.11", "3.12") - 'cuda' = @("12.1.1", "12.2.2", "12.3.2", "12.4.1") #, "12.5.1", "12.6.1") + 'os' = @('ubuntu-22.04', 'ubuntu-24.04-arm', 'windows-2022') + 'pyver' = @(3.10", "3.11", "3.12", "3.13") + 'cuda' = @("12.6.3", "12.8.1", "12.9.1") #, "12.5.1", "12.6.1") 'releasetag' = @("basic") } From b2e427af676361b9977e437d94e24c9d7480541f Mon Sep 17 00:00:00 2001 From: Johnny Date: Mon, 7 Jul 2025 12:37:15 +0200 Subject: [PATCH 02/10] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 36 ++---------------------- 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 7eaf017fb..54149ec9d 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-22.04, windows-2022, macos-14, macos-15] + os: [ubuntu-22.04, ubuntu-22.04-arm, windows-2022, macos-13, macos-15] steps: - uses: actions/checkout@v4 @@ -42,7 +42,7 @@ jobs: shell: cmd - name: Build wheels - uses: pypa/cibuildwheel@v2.22.0 + uses: pypa/cibuildwheel@v3.0.0 env: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" @@ -55,36 +55,6 @@ jobs: 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.22.0 - env: - CIBW_SKIP: "*musllinux* pp*" - CIBW_REPAIR_WHEEL_COMMAND: "" - CIBW_ARCHS: "aarch64" - CIBW_ENVIRONMENT: CMAKE_ARGS="-DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_APPLE_SILICON_PROCESSOR=arm64 -DCMAKE_CROSSCOMPILING=ON" - CIBW_BUILD: "cp38-* 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 @@ -129,7 +99,7 @@ jobs: release: name: Release - needs: [build_wheels, build_wheels_arm64, build_sdist] + needs: [build_wheels, build_sdist] runs-on: ubuntu-latest steps: From e9a656c67c0b5a96844acb8f93653beae0abbd40 Mon Sep 17 00:00:00 2001 From: Johnny Date: Mon, 7 Jul 2025 12:43:43 +0200 Subject: [PATCH 03/10] Update test.yaml --- .github/workflows/test.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 95f6e5a27..1de4fb63b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -31,10 +31,11 @@ jobs: build-linux: needs: download-model - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12"] + os: ["ubuntu-latest", "ubuntu-24.04-arm"] + python-version: ["3.10", "3.11", "3.12", "3.13"] steps: - uses: actions/checkout@v4 with: From ccb11eaed3a5f28272abb0e4400969b48770dd8e Mon Sep 17 00:00:00 2001 From: Johnny Date: Mon, 7 Jul 2025 12:44:51 +0200 Subject: [PATCH 04/10] Update build-docker.yaml --- .github/workflows/build-docker.yaml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml index b290f6273..1425dfc73 100644 --- a/.github/workflows/build-docker.yaml +++ b/.github/workflows/build-docker.yaml @@ -9,19 +9,16 @@ permissions: jobs: docker: name: Build and push Docker image - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: ["ubuntu-latest", "ubuntu-24.04-arm"] steps: - name: Checkout uses: actions/checkout@v4 with: submodules: "recursive" - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - + - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: From f75afbe9543a9459e73ce4134f514546ae62cf40 Mon Sep 17 00:00:00 2001 From: Johnny Date: Mon, 7 Jul 2025 13:15:49 +0200 Subject: [PATCH 05/10] 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 0bd57a08e..cf52ae990 100644 --- a/.github/workflows/build-wheels-cuda.yaml +++ b/.github/workflows/build-wheels-cuda.yaml @@ -21,7 +21,7 @@ jobs: run: | $matrix = @{ 'os' = @('ubuntu-22.04', 'ubuntu-24.04-arm', 'windows-2022') - 'pyver' = @(3.10", "3.11", "3.12", "3.13") + 'pyver' = @("3.10", "3.11", "3.12", "3.13") 'cuda' = @("12.6.3", "12.8.1", "12.9.1") #, "12.5.1", "12.6.1") 'releasetag' = @("basic") } From f0e2ad0867e44c98404d3654dfb619c7a2ad5c7d Mon Sep 17 00:00:00 2001 From: Johnny Date: Mon, 7 Jul 2025 13:21:24 +0200 Subject: [PATCH 06/10] 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 cf52ae990..f6da5476d 100644 --- a/.github/workflows/build-wheels-cuda.yaml +++ b/.github/workflows/build-wheels-cuda.yaml @@ -47,7 +47,7 @@ jobs: if: runner.os == 'Windows' uses: microsoft/setup-msbuild@v2 with: - vs-version: '[16.11,16.12)' + vs-version: '[17.0)' - uses: actions/checkout@v4 with: From cce3a5538b3c0094535a05816fc379399d8f49b7 Mon Sep 17 00:00:00 2001 From: Johnny Date: Mon, 7 Jul 2025 13:24:44 +0200 Subject: [PATCH 07/10] 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 f6da5476d..e7bce7626 100644 --- a/.github/workflows/build-wheels-cuda.yaml +++ b/.github/workflows/build-wheels-cuda.yaml @@ -47,7 +47,7 @@ jobs: if: runner.os == 'Windows' uses: microsoft/setup-msbuild@v2 with: - vs-version: '[17.0)' + vs-version: 'latest' - uses: actions/checkout@v4 with: From 030d1cb5aef8ce5c1ad59dbfc713d3f86f381ffa Mon Sep 17 00:00:00 2001 From: Johnny Date: Mon, 7 Jul 2025 13:27:53 +0200 Subject: [PATCH 08/10] 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 e7bce7626..797557bec 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-22.04', 'ubuntu-24.04-arm', 'windows-2022') + 'os' = @('ubuntu-22.04', 'ubuntu-22.04-arm', 'windows-2022') 'pyver' = @("3.10", "3.11", "3.12", "3.13") 'cuda' = @("12.6.3", "12.8.1", "12.9.1") #, "12.5.1", "12.6.1") 'releasetag' = @("basic") @@ -59,7 +59,7 @@ jobs: cache: 'pip' - name: Setup Mamba - uses: conda-incubator/setup-miniconda@v3.1.0 + uses: conda-incubator/setup-miniconda@v3.2.0 with: activate-environment: "llamacpp" python-version: ${{ matrix.pyver }} From 8bf8683874597c1a15fbc8a4705b49a3c145119f Mon Sep 17 00:00:00 2001 From: Johnny Date: Mon, 7 Jul 2025 13:32:31 +0200 Subject: [PATCH 09/10] 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 797557bec..3d9e5ea22 100644 --- a/.github/workflows/build-wheels-cuda.yaml +++ b/.github/workflows/build-wheels-cuda.yaml @@ -89,7 +89,7 @@ jobs: if: runner.os == 'Windows' run: | $y = (gi '.\MSBuildExtensions').fullname + '\*' - (gi 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Microsoft\VC\*\BuildCustomizations').fullname.foreach({cp $y $_}) + (gi 'C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\VC\*\BuildCustomizations').fullname.foreach({cp $y $_}) $cupath = 'CUDA_PATH_V' + $env:CUDAVER.Remove($env:CUDAVER.LastIndexOf('.')).Replace('.','_') echo "$cupath=$env:CONDA_PREFIX" >> $env:GITHUB_ENV From 1a67961bb5b81e707194a105399fd9eab275ed49 Mon Sep 17 00:00:00 2001 From: Johnny Date: Mon, 7 Jul 2025 13:39:06 +0200 Subject: [PATCH 10/10] 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 3d9e5ea22..2d83851c3 100644 --- a/.github/workflows/build-wheels-cuda.yaml +++ b/.github/workflows/build-wheels-cuda.yaml @@ -89,7 +89,7 @@ jobs: if: runner.os == 'Windows' run: | $y = (gi '.\MSBuildExtensions').fullname + '\*' - (gi 'C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\VC\*\BuildCustomizations').fullname.foreach({cp $y $_}) + (gi 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\VC\*\BuildCustomizations').fullname.foreach({cp $y $_}) $cupath = 'CUDA_PATH_V' + $env:CUDAVER.Remove($env:CUDAVER.LastIndexOf('.')).Replace('.','_') echo "$cupath=$env:CONDA_PREFIX" >> $env:GITHUB_ENV