Skip to content

Commit d5e7261

Browse files
committed
chore: bump llama.cpp
Signed-off-by: thxCode <[email protected]>
1 parent ef13dbd commit d5e7261

29 files changed

+69
-69
lines changed

llama-box/patches/ggml/ggml-cpu.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/ggml/src/ggml-cpu/CMakeLists.txt b/ggml/src/ggml-cpu/CMakeLists.txt
2-
index 66a5ad8d2..6e0e55625 100644
2+
index 66a5ad8d..6e0e5562 100644
33
--- a/ggml/src/ggml-cpu/CMakeLists.txt
44
+++ b/ggml/src/ggml-cpu/CMakeLists.txt
55
@@ -158,47 +158,94 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
@@ -353,7 +353,7 @@ index 66a5ad8d2..6e0e55625 100644
353353
endif()
354354
endif()
355355
diff --git a/ggml/src/ggml-cpu/arch/arm/cpu-feats.cpp b/ggml/src/ggml-cpu/arch/arm/cpu-feats.cpp
356-
index 67369147c..c460c5491 100644
356+
index 67369147..c460c549 100644
357357
--- a/ggml/src/ggml-cpu/arch/arm/cpu-feats.cpp
358358
+++ b/ggml/src/ggml-cpu/arch/arm/cpu-feats.cpp
359359
@@ -8,6 +8,10 @@

llama-box/patches/llama.cpp/batch.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/src/llama-batch.cpp b/src/llama-batch.cpp
2-
index 3bc8554e5..be189b6ef 100644
2+
index 3bc8554e..be189b6e 100644
33
--- a/src/llama-batch.cpp
44
+++ b/src/llama-batch.cpp
55
@@ -237,114 +237,114 @@ bool llama_batch_allocr::init(

llama-box/patches/llama.cpp/clip.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/tools/mtmd/clip-impl.h b/tools/mtmd/clip-impl.h
2-
index 62c936ed0..e393462fe 100644
2+
index 62c936ed..e393462f 100644
33
--- a/tools/mtmd/clip-impl.h
44
+++ b/tools/mtmd/clip-impl.h
55
@@ -226,6 +226,7 @@ static void clip_log_internal(enum ggml_log_level level, const char * format, ..
@@ -35,7 +35,7 @@ index 62c936ed0..e393462fe 100644
3535
// split string by a `std::string delim` instead of `char delim`
3636
static std::vector<std::string> string_split_str(std::string s, const std::string & delimiter) {
3737
diff --git a/tools/mtmd/clip.cpp b/tools/mtmd/clip.cpp
38-
index 9146c9e9c..29df92558 100644
38+
index 9146c9e9..29df9255 100644
3939
--- a/tools/mtmd/clip.cpp
4040
+++ b/tools/mtmd/clip.cpp
4141
@@ -30,6 +30,11 @@
@@ -207,7 +207,7 @@ index 9146c9e9c..29df92558 100644
207207
return ctx->model.modality == CLIP_MODALITY_VISION;
208208
}
209209
diff --git a/tools/mtmd/clip.h b/tools/mtmd/clip.h
210-
index 08f3efb7b..d90921f64 100644
210+
index 08f3efb7..d90921f6 100644
211211
--- a/tools/mtmd/clip.h
212212
+++ b/tools/mtmd/clip.h
213213
@@ -6,6 +6,20 @@
@@ -372,7 +372,7 @@ index 08f3efb7b..d90921f64 100644
372372
+CLIP_API bool clip_has_audio_encoder(const struct clip_ctx * ctx);
373373
+CLIP_API bool clip_has_whisper_encoder(const struct clip_ctx * ctx);
374374
diff --git a/tools/mtmd/mtmd-audio.h b/tools/mtmd/mtmd-audio.h
375-
index b7b940aff..91d31d161 100644
375+
index b7b940af..91d31d16 100644
376376
--- a/tools/mtmd/mtmd-audio.h
377377
+++ b/tools/mtmd/mtmd-audio.h
378378
@@ -15,6 +15,20 @@
@@ -414,7 +414,7 @@ index b7b940aff..91d31d161 100644
414414

415415
} // namespace whisper_precalc_filters
416416
diff --git a/tools/mtmd/mtmd-helper.cpp b/tools/mtmd/mtmd-helper.cpp
417-
index 686f42f39..eead1f8e6 100644
417+
index 686f42f3..eead1f8e 100644
418418
--- a/tools/mtmd/mtmd-helper.cpp
419419
+++ b/tools/mtmd/mtmd-helper.cpp
420420
@@ -458,3 +458,7 @@ mtmd_bitmap * mtmd_helper_bitmap_init_from_file(mtmd_context * ctx, const char *
@@ -427,7 +427,7 @@ index 686f42f39..eead1f8e6 100644
427427
+}
428428
\ No newline at end of file
429429
diff --git a/tools/mtmd/mtmd-helper.h b/tools/mtmd/mtmd-helper.h
430-
index 5c0edc693..f474b0c93 100644
430+
index 5c0edc69..f474b0c9 100644
431431
--- a/tools/mtmd/mtmd-helper.h
432432
+++ b/tools/mtmd/mtmd-helper.h
433433
@@ -80,6 +80,8 @@ MTMD_API int32_t mtmd_helper_decode_image_chunk(mtmd_context * ctx,

llama-box/patches/llama.cpp/common.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/common/common.cpp b/common/common.cpp
2-
index e4e71ad13..11e63a789 100644
2+
index 262b6799..21b0993a 100644
33
--- a/common/common.cpp
44
+++ b/common/common.cpp
5-
@@ -1035,7 +1035,16 @@ struct common_init_result common_init_from_params(common_params & params) {
5+
@@ -1041,7 +1041,16 @@ struct common_init_result common_init_from_params(common_params & params) {
66

77
// some models (e.g. T5) don't have a BOS token
88
if (bos != LLAMA_TOKEN_NULL) {
@@ -19,7 +19,7 @@ index e4e71ad13..11e63a789 100644
1919
}
2020
if (eos != LLAMA_TOKEN_NULL) {
2121
tmp.push_back(eos);
22-
@@ -1045,7 +1054,9 @@ struct common_init_result common_init_from_params(common_params & params) {
22+
@@ -1051,7 +1060,9 @@ struct common_init_result common_init_from_params(common_params & params) {
2323
}
2424

2525
if (llama_model_has_encoder(model)) {
@@ -30,7 +30,7 @@ index e4e71ad13..11e63a789 100644
3030
llama_token decoder_start_token_id = llama_model_decoder_start_token(model);
3131
if (decoder_start_token_id == LLAMA_TOKEN_NULL) {
3232
decoder_start_token_id = bos;
33-
@@ -1054,7 +1065,9 @@ struct common_init_result common_init_from_params(common_params & params) {
33+
@@ -1060,7 +1071,9 @@ struct common_init_result common_init_from_params(common_params & params) {
3434
tmp.push_back(decoder_start_token_id);
3535
}
3636
if (llama_model_has_decoder(model)) {
@@ -42,7 +42,7 @@ index e4e71ad13..11e63a789 100644
4242
llama_memory_clear(llama_get_memory(lctx), true);
4343
llama_synchronize(lctx);
4444
diff --git a/src/llama-context.cpp b/src/llama-context.cpp
45-
index 7c07b047b..fdc973903 100644
45+
index 7c07b047..fdc97390 100644
4646
--- a/src/llama-context.cpp
4747
+++ b/src/llama-context.cpp
4848
@@ -927,9 +927,9 @@ int llama_context::decode(const llama_batch & batch_inp) {

llama-box/patches/llama.cpp/context.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/src/llama-context.cpp b/src/llama-context.cpp
2-
index 7c07b047b..98552c59f 100644
2+
index 7c07b047..98552c59 100644
33
--- a/src/llama-context.cpp
44
+++ b/src/llama-context.cpp
55
@@ -107,7 +107,7 @@ llama_context::llama_context(

llama-box/patches/llama.cpp/dynamic_link.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/ggml/src/ggml-cpu/ggml-cpu.cpp b/ggml/src/ggml-cpu/ggml-cpu.cpp
2-
index c9daa4c39..26f219c47 100644
2+
index c9daa4c3..26f219c4 100644
33
--- a/ggml/src/ggml-cpu/ggml-cpu.cpp
44
+++ b/ggml/src/ggml-cpu/ggml-cpu.cpp
55
@@ -635,6 +635,18 @@ static void * ggml_backend_cpu_get_proc_address(ggml_backend_reg_t reg, const ch

llama-box/patches/llama.cpp/embedding.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/include/llama.h b/include/llama.h
2-
index c83b75915..7632a5ccf 100644
2+
index 28e84d4d..8f9c66d3 100644
33
--- a/include/llama.h
44
+++ b/include/llama.h
55
@@ -448,6 +448,7 @@ extern "C" {
@@ -11,7 +11,7 @@ index c83b75915..7632a5ccf 100644
1111
LLAMA_API uint32_t llama_n_batch (const struct llama_context * ctx);
1212
LLAMA_API uint32_t llama_n_ubatch (const struct llama_context * ctx);
1313
diff --git a/src/llama-context.cpp b/src/llama-context.cpp
14-
index 7c07b047b..88b6c1509 100644
14+
index 7c07b047..88b6c150 100644
1515
--- a/src/llama-context.cpp
1616
+++ b/src/llama-context.cpp
1717
@@ -103,6 +103,20 @@ llama_context::llama_context(
@@ -76,7 +76,7 @@ index 7c07b047b..88b6c1509 100644
7676
return ctx->n_ctx();
7777
}
7878
diff --git a/src/llama-context.h b/src/llama-context.h
79-
index 9ce05715a..b625d9197 100644
79+
index 9ce05715..b625d919 100644
8080
--- a/src/llama-context.h
8181
+++ b/src/llama-context.h
8282
@@ -37,6 +37,7 @@ struct llama_context {

llama-box/patches/llama.cpp/ggml-cann.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/src/llama-graph.cpp b/src/llama-graph.cpp
2-
index a248a7ec2..2c816ac22 100644
2+
index a248a7ec..2c816ac2 100644
33
--- a/src/llama-graph.cpp
44
+++ b/src/llama-graph.cpp
55
@@ -544,20 +544,28 @@ ggml_tensor * llm_graph_context::build_ffn(

llama-box/patches/llama.cpp/ggml-cpu.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/ggml/src/ggml-cpu/ops.cpp b/ggml/src/ggml-cpu/ops.cpp
2-
index fd77e9a6a..ba69608f0 100644
2+
index fd77e9a6..ba69608f 100644
33
--- a/ggml/src/ggml-cpu/ops.cpp
44
+++ b/ggml/src/ggml-cpu/ops.cpp
55
@@ -5597,7 +5597,9 @@ static void ggml_compute_forward_soft_max_f32(

llama-box/patches/llama.cpp/ggml-cuda.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/ggml/src/ggml-cuda/scale.cu b/ggml/src/ggml-cuda/scale.cu
2-
index 2ee9e5889..1b45a468b 100644
2+
index 2ee9e588..1b45a468 100644
33
--- a/ggml/src/ggml-cuda/scale.cu
44
+++ b/ggml/src/ggml-cuda/scale.cu
55
@@ -1,7 +1,7 @@

0 commit comments

Comments
 (0)