[bot-automerge] llama.cpp v6729 (conda-forge#69)

Signed-off-by: Julien Jerphanion <[email protected]>
Co-authored-by: Julien Jerphanion <[email protected]>

Author: regro-cf-autotick-bot

.ci_support/linux_64_c_compiler_version13cuda_compiler_version12.6cxx_compiler_version13.yaml

@@ -8,8 +8,6 @@ c_stdlib:
 - sysroot
 c_stdlib_version:
 - '2.17'
-cdt_name:
-- conda
 channel_sources:
 - conda-forge
 channel_targets:

.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml

@@ -8,8 +8,6 @@ c_stdlib:
 - sysroot
 c_stdlib_version:
 - '2.17'
-cdt_name:
-- conda
 channel_sources:
 - conda-forge
 channel_targets:

.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_version12.6cxx_compiler_version13.yaml

@@ -8,8 +8,6 @@ c_stdlib:
 - sysroot
 c_stdlib_version:
 - '2.17'
-cdt_name:
-- conda
 channel_sources:
 - conda-forge
 channel_targets:

.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml

@@ -8,8 +8,6 @@ c_stdlib:
 - sysroot
 c_stdlib_version:
 - '2.17'
-cdt_name:
-- conda
 channel_sources:
 - conda-forge
 channel_targets:

.github/CODEOWNERS

@@ -1,23 +1,23 @@
-From ac0ca842abedfadb8f969d5f2cda04815cf5948d Mon Sep 17 00:00:00 2001
+From 228800186cab957319d187ecf6e92052ea2a3d22 Mon Sep 17 00:00:00 2001
 From: Julien Jerphanion <[email protected]>
 Date: Tue, 16 Sep 2025 11:28:30 +0200
 Subject: [PATCH] Change `gpuAddress` for `contents`
 
 Signed-off-by: Julien Jerphanion <[email protected]>
 ---
- ggml/src/ggml-metal/ggml-metal.m | 2 +-
+ ggml/src/ggml-metal/ggml-metal-device.m | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/ggml/src/ggml-metal/ggml-metal.m b/ggml/src/ggml-metal/ggml-metal.m
-index 07b96dbd..51b0c646 100644
---- a/ggml/src/ggml-metal/ggml-metal.m
-+++ b/ggml/src/ggml-metal/ggml-metal.m
-@@ -6215,7 +6215,7 @@ static ggml_backend_buffer_t ggml_backend_metal_buffer_type_alloc_buffer(ggml_ba
+diff --git a/ggml/src/ggml-metal/ggml-metal-device.m b/ggml/src/ggml-metal/ggml-metal-device.m
+index e38e70768..e0faebb66 100644
+--- a/ggml/src/ggml-metal/ggml-metal-device.m
++++ b/ggml/src/ggml-metal/ggml-metal-device.m
+@@ -989,7 +989,7 @@ ggml_metal_buffer_t ggml_metal_buffer_init(ggml_metal_device_t dev, size_t size,
              } else {
-                 ctx->buffers[0].metal = [device newBufferWithLength:size_aligned options:MTLResourceStorageModePrivate];
+                 res->buffers[0].metal = [res->device newBufferWithLength:size_aligned options:MTLResourceStorageModePrivate];
 
--                ctx->all_data = (void *) (ctx->buffers[0].metal.gpuAddress);
-+                ctx->all_data = (void *) (ctx->buffers[0].metal.contents);
+-                res->all_data = (void *) (res->buffers[0].metal.gpuAddress);
++                res->all_data = (void *) (res->buffers[0].metal.contents);
              }
          }
 

.scripts/build_steps.sh

@@ -1,6 +1,6 @@
 context:
   name: llama.cpp
-  version: "6441"
+  version: "6729"
   build: 0
 
 package:
@@ -9,7 +9,7 @@ package:
 
 source:
   url: https://github.com/ggml-org/${{ name }}/archive/b${{ version | split(".") | list | last }}.tar.gz
-  sha256: e5779ac94f3c8e32ffcc610cf4227af9637e6e81566f0ac1c0f8f7d39986cc24
+  sha256: bfe625422c8fa74cf12d1d6aff8bdbbe61c86647de1615c2e7b6f0cde4804e18
   patches:
     - 0001-Change-gpuAddress-for-contents.patch
 
@@ -198,7 +198,6 @@ tests:
           - check_file "$PREFIX/bin/llama-gguf" "llama-gguf"
           - check_file "$PREFIX/bin/llama-gguf-hash" "llama-gguf-hash"
           - check_file "$PREFIX/bin/llama-gguf-split" "llama-gguf-split"
-          - check_file "$PREFIX/bin/llama-gritlm" "llama-gritlm"
           - check_file "$PREFIX/bin/llama-imatrix" "llama-imatrix"
           - check_file "$PREFIX/bin/llama-lookahead" "llama-lookahead"
           - check_file "$PREFIX/bin/llama-lookup" "llama-lookup"