vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add --jinja to llama-run

Browse source
This commit is contained in:
ochafik 2025-01-13 22:07:49 +00:00
parent 18f257bf1a
commit 8dd4f334a4
2 changed files with 35 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/common.cpp
View file

@ -1830,8 +1830,10 @@ llama_chat_templates llama_chat_templates_from_model(const struct llama_model *
std::string default_template_src = chat_template_override;
std::string tool_use_template_src = chat_template_override;
if (chat_template_override.empty()) {
default_template_src = llama_model_chat_template(model, /* name */ nullptr);
tool_use_template_src = llama_model_chat_template(model, /* name */ "tool_use");
auto str = llama_model_chat_template(model, /* name */ nullptr);
if (str) default_template_src = str;
str = llama_model_chat_template(model, /* name */ "tool_use");
if (str) tool_use_template_src = str;
}
if (default_template_src.empty() || default_template_src == "chatml") {
if (!tool_use_template_src.empty()) {