Merge commit 'e4a71599e5846110159955dec0008eb4aa24222b' into concedo_experimental

# Conflicts:
#	CODEOWNERS
#	tools/mtmd/clip.cpp
This commit is contained in:
LostRuins Concedo
2025-11-08 10:28:49 +08:00
18 changed files with 1488 additions and 592 deletions
+1 -1
View File
@@ -2053,7 +2053,7 @@ common_params_context common_params_parser_init(common_params & params, llama_ex
params.system_prompt.pop_back();
}
}
).set_examples({LLAMA_EXAMPLE_MAIN}));
).set_examples({LLAMA_EXAMPLE_MAIN, LLAMA_EXAMPLE_DIFFUSION}));
add_opt(common_arg(
{"--in-file"}, "FNAME",
"an input file (repeat to specify multiple files)",