From 7011bc198ddc6a3fb2756c554915d4137893e21c Mon Sep 17 00:00:00 2001 From: Andrei Betlen Date: Sun, 6 Jul 2025 00:45:59 -0400 Subject: [PATCH 1/5] fix(ci): Update docker runner --- .github/workflows/build-docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml index b5c7346db..b290f6273 100644 --- a/.github/workflows/build-docker.yaml +++ b/.github/workflows/build-docker.yaml @@ -9,7 +9,7 @@ permissions: jobs: docker: name: Build and push Docker image - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v4 From b39e9d4518e1d747dc02fd3bb611ea3d22a9393e Mon Sep 17 00:00:00 2001 From: Andrei Betlen Date: Sun, 6 Jul 2025 00:52:13 -0400 Subject: [PATCH 2/5] feat: Update llama.cpp --- vendor/llama.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/llama.cpp b/vendor/llama.cpp index 8846aace4..a0374a67e 160000 --- a/vendor/llama.cpp +++ b/vendor/llama.cpp @@ -1 +1 @@ -Subproject commit 8846aace4934ad29651ea61b8c7e3f6b0556e3d2 +Subproject commit a0374a67e2924f2e845cdc59dd67d9a44065a89c From 98fda8cdf9097a5cd8d59347ea4b8e7012f32a8a Mon Sep 17 00:00:00 2001 From: Andrei Betlen Date: Sun, 6 Jul 2025 00:55:34 -0400 Subject: [PATCH 3/5] fix(ci): Temporarily disable windows cuda wheels --- .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 63b4c26ea..07b30cfc0 100644 --- a/.github/workflows/build-wheels-cuda.yaml +++ b/.github/workflows/build-wheels-cuda.yaml @@ -8,7 +8,7 @@ permissions: jobs: define_matrix: name: Define Build Matrix - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} defaults: @@ -20,7 +20,7 @@ jobs: id: set-matrix run: | $matrix = @{ - 'os' = @('ubuntu-22.04', 'windows-2022') + '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") 'releasetag' = @("basic") From 8866fbd7159736d776e1269ce778872a20e25cc2 Mon Sep 17 00:00:00 2001 From: Andrei Betlen Date: Sun, 6 Jul 2025 00:56:40 -0400 Subject: [PATCH 4/5] chore: Bump version --- CHANGELOG.md | 4 ++++ llama_cpp/__init__.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e336962f..6017812bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.3.12] + +- feat: Update llama.cpp to ggerganov/llama.cpp@a0374a67e2924f2e845cdc59dd67d9a44065a89c + ## [0.3.11] - fix: Update reference to `llama_kv_cache_clear` in Llama.embed. Closes #2037 by @abetlen in 9e5a4eaa84156084ed7bbb91e6efcc91dc6217bc diff --git a/llama_cpp/__init__.py b/llama_cpp/__init__.py index e35c5014e..b16bb7dc9 100644 --- a/llama_cpp/__init__.py +++ b/llama_cpp/__init__.py @@ -1,4 +1,4 @@ from .llama_cpp import * from .llama import * -__version__ = "0.3.11" +__version__ = "0.3.12" From cce48873166e6b6fbfe0d944a6184ef11858e735 Mon Sep 17 00:00:00 2001 From: Andrei Betlen Date: Sun, 6 Jul 2025 01:32:07 -0400 Subject: [PATCH 5/5] fix(ci): Fix macos cpu builds --- .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 29a6913c2..7eaf017fb 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -74,6 +74,7 @@ jobs: 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