From 1e06072d63a78bffca6dd6d0650e1a5943fe55a1 Mon Sep 17 00:00:00 2001 From: kiwi <779490624@qq.com> Date: Wed, 2 Jul 2025 20:24:02 +0800 Subject: [PATCH 1/5] [fix] Fix 32-bit narrowing issue in export-lora and mtmd clip --- tools/export-lora/export-lora.cpp | 2 +- tools/mtmd/clip.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/export-lora/export-lora.cpp b/tools/export-lora/export-lora.cpp index 24dc85cf27336..36e8f3148d2e8 100644 --- a/tools/export-lora/export-lora.cpp +++ b/tools/export-lora/export-lora.cpp @@ -148,7 +148,7 @@ struct lora_merge_ctx { ctx_out = gguf_init_empty(); struct ggml_init_params params = { - /*.mem_size =*/ gguf_get_n_tensors(base_model.ctx_gguf)*ggml_tensor_overhead(), + /*.mem_size =*/ static_cast(gguf_get_n_tensors(base_model.ctx_gguf)*ggml_tensor_overhead()), /*.mem_buffer =*/ NULL, /*.no_alloc =*/ true, }; diff --git a/tools/mtmd/clip.cpp b/tools/mtmd/clip.cpp index a990520ed3fbb..7d5c6257de003 100644 --- a/tools/mtmd/clip.cpp +++ b/tools/mtmd/clip.cpp @@ -2307,7 +2307,7 @@ struct clip_model_loader { // create data context struct ggml_init_params params = { - /*.mem_size =*/ (gguf_get_n_tensors(ctx_gguf.get()) + 1) * ggml_tensor_overhead(), + /*.mem_size =*/ static_cast(gguf_get_n_tensors(ctx_gguf.get()) + 1) * ggml_tensor_overhead(), /*.mem_buffer =*/ NULL, /*.no_alloc =*/ true, }; From c96da89112274b8b6c1f437e8b585ae0bdbc51e4 Mon Sep 17 00:00:00 2001 From: kiwi <122582483+kiwi142857@users.noreply.github.com> Date: Wed, 2 Jul 2025 21:20:42 +0800 Subject: [PATCH 2/5] Update export-lora.cpp --- tools/export-lora/export-lora.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/export-lora/export-lora.cpp b/tools/export-lora/export-lora.cpp index 36e8f3148d2e8..d4fa8c2d01615 100644 --- a/tools/export-lora/export-lora.cpp +++ b/tools/export-lora/export-lora.cpp @@ -148,7 +148,7 @@ struct lora_merge_ctx { ctx_out = gguf_init_empty(); struct ggml_init_params params = { - /*.mem_size =*/ static_cast(gguf_get_n_tensors(base_model.ctx_gguf)*ggml_tensor_overhead()), + /*.mem_size =*/ static_cast(gguf_get_n_tensors(base_model.ctx_gguf)*ggml_tensor_overhead()), /*.mem_buffer =*/ NULL, /*.no_alloc =*/ true, }; From 3fcc8c32ed41278e54362d53951589423ca03a0a Mon Sep 17 00:00:00 2001 From: kiwi <122582483+kiwi142857@users.noreply.github.com> Date: Wed, 2 Jul 2025 21:22:00 +0800 Subject: [PATCH 3/5] Update clip.cpp --- tools/mtmd/clip.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/mtmd/clip.cpp b/tools/mtmd/clip.cpp index 7d5c6257de003..c822f12092717 100644 --- a/tools/mtmd/clip.cpp +++ b/tools/mtmd/clip.cpp @@ -2307,7 +2307,7 @@ struct clip_model_loader { // create data context struct ggml_init_params params = { - /*.mem_size =*/ static_cast(gguf_get_n_tensors(ctx_gguf.get()) + 1) * ggml_tensor_overhead(), + /*.mem_size =*/ static_cast(gguf_get_n_tensors(ctx_gguf.get()) + 1) * ggml_tensor_overhead(), /*.mem_buffer =*/ NULL, /*.no_alloc =*/ true, }; From 1bba5c682798503397d583fbb13c30bb5f67802e Mon Sep 17 00:00:00 2001 From: kiwi <122582483+kiwi142857@users.noreply.github.com> Date: Thu, 3 Jul 2025 01:29:01 +0800 Subject: [PATCH 4/5] Update export-lora.cpp --- tools/export-lora/export-lora.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/export-lora/export-lora.cpp b/tools/export-lora/export-lora.cpp index d4fa8c2d01615..f038019b007b4 100644 --- a/tools/export-lora/export-lora.cpp +++ b/tools/export-lora/export-lora.cpp @@ -148,7 +148,7 @@ struct lora_merge_ctx { ctx_out = gguf_init_empty(); struct ggml_init_params params = { - /*.mem_size =*/ static_cast(gguf_get_n_tensors(base_model.ctx_gguf)*ggml_tensor_overhead()), + /*.mem_size =*/ static_cast(gguf_get_n_tensors(base_model.ctx_gguf)*ggml_tensor_overhead()), /*.mem_buffer =*/ NULL, /*.no_alloc =*/ true, }; From 603f53133cc604600537a4d65a9b3694c92578be Mon Sep 17 00:00:00 2001 From: kiwi <122582483+kiwi142857@users.noreply.github.com> Date: Thu, 3 Jul 2025 01:29:51 +0800 Subject: [PATCH 5/5] format: use space to replace tab --- tools/mtmd/clip.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/mtmd/clip.cpp b/tools/mtmd/clip.cpp index c822f12092717..d0a44c0afe8cc 100644 --- a/tools/mtmd/clip.cpp +++ b/tools/mtmd/clip.cpp @@ -2307,7 +2307,7 @@ struct clip_model_loader { // create data context struct ggml_init_params params = { - /*.mem_size =*/ static_cast(gguf_get_n_tensors(ctx_gguf.get()) + 1) * ggml_tensor_overhead(), + /*.mem_size =*/ static_cast(gguf_get_n_tensors(ctx_gguf.get()) + 1) * ggml_tensor_overhead(), /*.mem_buffer =*/ NULL, /*.no_alloc =*/ true, };