From 4d4788eceefe8be73da8a58e37d362e73bc9d80a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 11 Jun 2026 20:15:35 +0200 Subject: [PATCH 1/2] 9596; fix M5 performance; check for llama --- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- recipe/conda_build_config.yaml | 6 ++++-- recipe/recipe.yaml | 5 +++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 8eb4f01..0e5ed99 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' MACOSX_SDK_VERSION: -- '11.0' +- '26.1' blas_impl: - accelerate c_compiler: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 540a5c2..57376de 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' MACOSX_SDK_VERSION: -- '11.0' +- '26.1' blas_impl: - accelerate c_compiler: diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 92a2747..83d3ef2 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,5 +1,7 @@ -c_stdlib_version: # [osx and x86_64] - - '11.0' # [osx and x86_64] +c_stdlib_version: # [osx] + - '11.0' # [osx] +MACOSX_SDK_VERSION: # [osx] + - '26.1' # [osx] blas_impl: - mkl # [(linux and not aarch64) or win] diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index 606ec4f..de2c316 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -1,6 +1,6 @@ context: name: llama.cpp - version: "9574" + version: "9596" build: 0 # ensure arm_variant_type gets detected as a used variable touch_arm_variant_type: ${{ arm_variant_type if (linux and aarch64) else "None" }} @@ -11,7 +11,7 @@ package: source: url: https://github.com/ggml-org/${{ name }}/archive/b${{ version ~ "" | split(".") | list | last }}.tar.gz - sha256: a482a5d45e291aff8eca06ee3c902f7f4af665a451feeac6dcbb504ab365b420 + sha256: c80caadf88a211c6d6e7820ded7258a6c2c0a476926a04dd7e8708ba3e552c93 build: # See https://conda-forge.org/docs/user/tipsandtricks/#installing-cuda-enabled-packages-like-tensorflow-and-pytorch @@ -228,6 +228,7 @@ tests: # Check binaries - echo "Checking binary files..." + - check_file "$PREFIX/bin/llama" "llama" - check_file "$PREFIX/bin/llama-batched" "llama-batched" - check_file "$PREFIX/bin/llama-batched-bench" "llama-batched-bench" - check_file "$PREFIX/bin/llama-bench" "llama-bench" From f4c964ef6878fb62c28d7bfabcca3b8a52ca316c Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 11 Jun 2026 20:17:25 +0200 Subject: [PATCH 2/2] Build more releases --- conda-forge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-forge.yml b/conda-forge.yml index 466a5ba..39f2e6f 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -3,7 +3,7 @@ azure: bot: automerge: true version_updates: - random_fraction_to_keep: 0.02 + random_fraction_to_keep: 0.2 conda_build: error_overlinking: true conda_build_tool: rattler-build