mirror of
https://github.com/LostRuins/koboldcpp.git
synced 2026-09-19 01:05:09 +02:00
Merge commit '935a3402923e79679e056f1d8fdc6bc48ec6dbbc' into concedo_experimental
# Conflicts: # examples/diffusion/CMakeLists.txt # scripts/server-test-function-call.py # src/llama-model.cpp # src/models/gemma4.cpp # tests/test-chat.cpp # tests/test-reasoning-budget.cpp # tools/server/README.md
This commit is contained in:
+2
-2
@@ -2235,8 +2235,8 @@ static common_chat_params common_chat_templates_apply_jinja(const struct common_
|
||||
auto auto_params = autoparser::peg_generator::generate_parser(tmpl, params, autoparser);
|
||||
auto_params.supports_thinking = autoparser.reasoning.mode != autoparser::reasoning_mode::NONE;
|
||||
if (auto_params.supports_thinking) {
|
||||
auto_params.thinking_start_tag = autoparser.reasoning.start;
|
||||
auto_params.thinking_end_tag = autoparser.reasoning.end;
|
||||
auto_params.thinking_start_tag = trim_whitespace(autoparser.reasoning.start);
|
||||
auto_params.thinking_end_tag = trim_whitespace(autoparser.reasoning.end);
|
||||
}
|
||||
auto_params.generation_prompt = params.generation_prompt;
|
||||
common_peg_arena arena;
|
||||
|
||||
Reference in New Issue
Block a user