Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	requirements/requirements-convert_hf_to_gguf.txt
#	tools/imatrix/CMakeLists.txt
#	tools/run/CMakeLists.txt
This commit is contained in:
Concedo 2025-10-24 18:12:16 +08:00
commit 3712c6e6cd
6 changed files with 253 additions and 100 deletions

View file

@ -3458,7 +3458,7 @@ common_params_context common_params_parser_init(common_params & params, llama_ex
[](common_params & params) {
params.use_jinja = true;
}
).set_examples({LLAMA_EXAMPLE_SERVER, LLAMA_EXAMPLE_MAIN}).set_env("LLAMA_ARG_JINJA"));
).set_examples({LLAMA_EXAMPLE_SERVER, LLAMA_EXAMPLE_MAIN, LLAMA_EXAMPLE_MTMD}).set_env("LLAMA_ARG_JINJA"));
add_opt(common_arg(
{"--reasoning-format"}, "FORMAT",
"controls whether thought tags are allowed and/or extracted from the response, and in which format they're returned; one of:\n"