Mirrors/llama.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/llama.cpp.git synced 2025-02-05 16:10:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix chatml fallback for unsupported builtin templates (when --jinja not enabled) (#11533)

Browse Source
This commit is contained in:
Olivier Chafik 2025-01-31 08:24:29 +00:00 committed by GitHub
parent 4a2b196d03
commit 5783575c9d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
examples/server/server.cpp
View File

@ -1858,7 +1858,12 @@ struct server_context {
llama_init_dft.context.reset(); llama_init_dft.context.reset();
} }
chat_templates = common_chat_templates_from_model(model, params_base.chat_template); if (params_base.chat_template.empty() && !validate_builtin_chat_template(params.use_jinja)) {
LOG_WRN("%s: The chat template that comes with this model is not yet supported, falling back to chatml. This may cause the model to output suboptimal responses\n", __func__);
chat_templates = common_chat_templates_from_model(model, "chatml");
} else {
chat_templates = common_chat_templates_from_model(model, params_base.chat_template);
}
GGML_ASSERT(chat_templates.template_default.get() != nullptr); GGML_ASSERT(chat_templates.template_default.get() != nullptr);
return true; return true;
@ -4435,14 +4440,6 @@ int main(int argc, char ** argv) {
LOG_INF("%s: model loaded\n", __func__); LOG_INF("%s: model loaded\n", __func__);
// if a custom chat template is not supplied, we will use the one that comes with the model (if any)
if (params.chat_template.empty()) {
if (!ctx_server.validate_builtin_chat_template(params.use_jinja)) {
LOG_WRN("%s: The chat template that comes with this model is not yet supported, falling back to chatml. This may cause the model to output suboptimal responses\n", __func__);
params.chat_template = "chatml";
}
}
// print sample chat example to make it clear which template is used // print sample chat example to make it clear which template is used
LOG_INF("%s: chat template, chat_template: %s, example_format: '%s'\n", __func__, LOG_INF("%s: chat template, chat_template: %s, example_format: '%s'\n", __func__,
ctx_server.chat_templates.template_default->source().c_str(), ctx_server.chat_templates.template_default->source().c_str(),