happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6 from bluebread/sf/deepseek-ocr 

mtmd: quick fix token order
This commit is contained in:
Saba Fallah 2025-11-24 10:20:37 +01:00 committed by GitHub
parent 206f8abc3c 81533e494e
commit 8810940408
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/mtmd/mtmd-cli.cpp
View File

@ -228,10 +228,12 @@ static int eval_message(mtmd_cli_context & ctx, common_chat_msg & msg) {
text.add_special = add_bos;
text.parse_special = true;
std::string formatted_chat;
if (!mtmd_is_deepseekocr(ctx.ctx_vision.get())) {
auto formatted_chat = chat_add_and_format(ctx, msg);
formatted_chat = chat_add_and_format(ctx, msg);
LOG_DBG("formatted_chat.prompt: %s\n", formatted_chat.c_str());
text.text = formatted_chat.c_str();
text.text = formatted_chat.c_str();
}
if (g_is_interrupted) return 0;
@ -316,8 +318,18 @@ int main(int argc, char ** argv) {
if (is_single_turn) {
g_is_generating = true;
if (params.prompt.find(mtmd_default_marker()) == std::string::npos) {
for (size_t i = 0; i < params.image.size(); i++) {
params.prompt += mtmd_default_marker();
if (mtmd_is_deepseekocr(ctx.ctx_vision.get())) {
std::string image_tokens = "";
for (size_t i = 0; i < params.image.size(); i++) {
image_tokens += mtmd_default_marker();
image_tokens += '\n';
}
params.prompt = image_tokens + params.prompt;
}
else {
for (size_t i = 0; i < params.image.size(); i++) {
params.prompt += mtmd_default_marker();
}
}
}
common_chat_msg msg;