From 610df4cc3b53086833f4aa2ec8a3d4bb002c6996 Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Thu, 24 Apr 2025 18:59:06 +0300 Subject: [PATCH 1/3] cuda : fix unused variable compile warning (whisper/0) ggml-ci --- ggml/src/ggml-cuda/cpy.cu | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ggml/src/ggml-cuda/cpy.cu b/ggml/src/ggml-cuda/cpy.cu index 2d46176eab344..d027271fcd932 100644 --- a/ggml/src/ggml-cuda/cpy.cu +++ b/ggml/src/ggml-cuda/cpy.cu @@ -592,6 +592,8 @@ void ggml_cuda_cpy(ggml_backend_cuda_context & ctx, const ggml_tensor * src0, gg dest_ptrs_d = ctx.cuda_graph->dest_ptrs_d; graph_cpynode_index = ctx.cuda_graph->graph_cpynode_index; } +#else + GGML_UNUSED(disable_indirection_for_this_node); #endif if (src0->type == src1->type && ggml_is_contiguous(src0) && ggml_is_contiguous(src1)) { GGML_ASSERT(ggml_nbytes(src0) == ggml_nbytes(src1)); From db1ff5b63a7b8d14e1f9ed05c93fe9f664c287e7 Mon Sep 17 00:00:00 2001 From: Diego Devesa Date: Wed, 30 Apr 2025 15:20:40 +0200 Subject: [PATCH 2/3] ggml : fix ggml_gallocr_ptr type (ggml/1205) --- ggml/include/ggml-cpp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ggml/include/ggml-cpp.h b/ggml/include/ggml-cpp.h index a12342c25debe..48aa79682b65d 100644 --- a/ggml/include/ggml-cpp.h +++ b/ggml/include/ggml-cpp.h @@ -24,7 +24,7 @@ typedef std::unique_ptr gguf_context_ptr; struct ggml_gallocr_deleter { void operator()(ggml_gallocr_t galloc) { ggml_gallocr_free(galloc); } }; -typedef std::unique_ptr ggml_gallocr_ptr; +typedef std::unique_ptr ggml_gallocr_ptr; // ggml-backend From 65202d29850eb497c75aba79a934e16a33191f7e Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Thu, 1 May 2025 09:59:02 +0300 Subject: [PATCH 3/3] sync : ggml --- scripts/sync-ggml.last | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/sync-ggml.last b/scripts/sync-ggml.last index 41feffca9212d..5b798aeb49701 100644 --- a/scripts/sync-ggml.last +++ b/scripts/sync-ggml.last @@ -1 +1 @@ -13bcf9ce50651a8b4238ec6d136f46f2c1b23b6f +7734363ac74a14d7f2c8033c552d9d655c5dfc00