mirror of
https://github.com/ollama/ollama.git
synced 2025-11-10 21:47:42 +01:00
4987f13d34
* feat: Bump llama.cpp to df1b612 Branch: LlamaCPPBump-GraniteDocling Signed-off-by: Gabe Goodhart <ghart@us.ibm.com> * fix(mtmd): Correctly encode text chunks during mtmd tokenization There can be text chunks that appear interspersed with the image embeddings that contain template delimiter tokens for some models. These need to be correctly translated to text tokens. Branch: LlamaCPPBump-GraniteDocling Signed-off-by: Gabe Goodhart <ghart@us.ibm.com> * tests: Use MtmdChunk in image_test Branch: LlamaCPPBump-GraniteDocling Signed-off-by: Gabe Goodhart <ghart@us.ibm.com> * style: Fix unnecessary conversion linting Branch: LlamaCPPBump-GraniteDocling Signed-off-by: Gabe Goodhart <ghart@us.ibm.com> * fix(ggml): Revert changes to ggml_hip.cpp These changes were done largely by our code assistant and are likely wrong Branch: LlamaCPPBump-GraniteDocling Signed-off-by: Gabe Goodhart <ghart@us.ibm.com> * fix: Revert changes in mem_nvml.cpp Branch: LlamaCPPBump-GraniteDocling Signed-off-by: Gabe Goodhart <ghart@us.ibm.com> * feat: Update sync point to 1deee0 This brings in several more optimization commits and model support for EmbeddingGemma Branch: LlamaCPPBump-GraniteDocling Signed-off-by: Gabe Goodhart <ghart@us.ibm.com> * feat: Update patches for 1deee0 Branch: LlamaCPPBump-GraniteDocling Signed-off-by: Gabe Goodhart <ghart@us.ibm.com> * feat: sync for bump to 1deee0 Branch: LlamaCPPBump-GraniteDocling Signed-off-by: Gabe Goodhart <ghart@us.ibm.com> * fix: Bad patch updates with errant `+` Branch: LlamaCPPBump-GraniteDocling Signed-off-by: Gabe Goodhart <ghart@us.ibm.com> * feat: Bump llama.cpp/ggml to 7049736 Branch: LlamaCPPBump-GraniteDocling Signed-off-by: Gabe Goodhart <ghart@us.ibm.com> * fix: format-patches after latest bump Branch: LlamaCPPBump-GraniteDocling Signed-off-by: Gabe Goodhart <ghart@us.ibm.com> --------- Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Gabe Goodhart <ghart@us.ibm.com>
|
|
Date: Tue, 24 Jun 2025 16:55:31 -0600
|
|
Subject: [PATCH] add C API for mtmd_input_text
|
|
|
|
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
|
|
---
|
|
tools/mtmd/mtmd.cpp | 10 ++++++++++
|
|
tools/mtmd/mtmd.h | 3 +++
|
|
2 files changed, 13 insertions(+)
|
|
|
|
diff --git a/tools/mtmd/mtmd.cpp b/tools/mtmd/mtmd.cpp
|
|
index 4d487581..35a0d25e 100644
|
|
--- a/tools/mtmd/mtmd.cpp
|
|
+++ b/tools/mtmd/mtmd.cpp
|
|
@@ -79,6 +79,16 @@ enum mtmd_slice_tmpl {
|
|
MTMD_SLICE_TMPL_IDEFICS3,
|
|
};
|
|
|
|
+mtmd_input_text* mtmd_input_text_init(const char * text, bool add_special, bool parse_special) {
|
|
+ return new mtmd_input_text{text, add_special, parse_special};
|
|
+}
|
|
+
|
|
+void mtmd_input_text_free(mtmd_input_text* input_text) {
|
|
+ if (input_text) {
|
|
+ delete input_text;
|
|
+ }
|
|
+}
|
|
+
|
|
const char * mtmd_default_marker() {
|
|
return "<__media__>";
|
|
}
|
|
diff --git a/tools/mtmd/mtmd.h b/tools/mtmd/mtmd.h
|
|
index f4ea07d3..cf287224 100644
|
|
--- a/tools/mtmd/mtmd.h
|
|
+++ b/tools/mtmd/mtmd.h
|
|
@@ -75,6 +75,9 @@ typedef struct mtmd_input_chunk mtmd_input_chunk;
|
|
typedef struct mtmd_input_chunks mtmd_input_chunks;
|
|
typedef struct mtmd_input_text mtmd_input_text;
|
|
|
|
+MTMD_API mtmd_input_text* mtmd_input_text_init(const char * text, bool add_special, bool parse_special);
|
|
+MTMD_API void mtmd_input_text_free(mtmd_input_text* input_text);
|
|
+
|
|
struct mtmd_context_params {
|
|
bool use_gpu;
|
|
bool print_timings;
|