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

Merge e0e9c747a7 into b91d7dfe5b

This commit is contained in:
TrevorS 2026-03-16 02:08:06 +08:00 committed by GitHub
parent b91d7dfe5b e0e9c747a7
commit 8986f7cfbe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/cli/cli.cpp
View File

@ -215,7 +215,20 @@ struct cli_context {
inputs.parallel_tool_calls = false; inputs.parallel_tool_calls = false;
inputs.add_generation_prompt = true; inputs.add_generation_prompt = true;
inputs.reasoning_format = COMMON_REASONING_FORMAT_DEEPSEEK; inputs.reasoning_format = COMMON_REASONING_FORMAT_DEEPSEEK;
inputs.enable_thinking = common_chat_templates_support_enable_thinking(chat_params.tmpls.get()); inputs.enable_thinking = chat_params.enable_thinking;
inputs.chat_template_kwargs = chat_params.chat_template_kwargs;
// sync enable_thinking with kwargs (mirrors server-common.cpp)
{
auto it = inputs.chat_template_kwargs.find("enable_thinking");
if (it != inputs.chat_template_kwargs.end()) {
if (it->second == "true") {
inputs.enable_thinking = true;
} else if (it->second == "false") {
inputs.enable_thinking = false;
}
}
}
// Apply chat template to the list of messages // Apply chat template to the list of messages
return common_chat_templates_apply(chat_params.tmpls.get(), inputs); return common_chat_templates_apply(chat_params.tmpls.get(), inputs);