Skip to content

Commit 34a6d86

Browse files
ngxsonCISC
andauthored
cli: enable jinja by default (ggml-org#17911)
* cli: enable jinja by default * Update common/arg.cpp Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> --------- Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com>
1 parent f32ca51 commit 34a6d86

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

common/arg.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -762,12 +762,6 @@ bool common_arg_utils::is_autoy(const std::string & value) {
762762
}
763763

764764
common_params_context common_params_parser_init(common_params & params, llama_example ex, void(*print_usage)(int, char **)) {
765-
// default values specific to example
766-
// note: we place it here instead of inside server.cpp to allow llama-gen-docs to pick it up
767-
if (ex == LLAMA_EXAMPLE_SERVER) {
768-
params.use_jinja = true;
769-
}
770-
771765
params.use_color = tty_can_use_colors();
772766

773767
// load dynamic backends
@@ -2623,14 +2617,14 @@ common_params_context common_params_parser_init(common_params & params, llama_ex
26232617
).set_examples({LLAMA_EXAMPLE_SERVER}).set_env("LLAMA_ARG_NO_MODELS_AUTOLOAD"));
26242618
add_opt(common_arg(
26252619
{"--jinja"},
2626-
string_format("use jinja template for chat (default: %s)\n", params.use_jinja ? "enabled" : "disabled"),
2620+
string_format("use jinja template for chat (default: %s)", params.use_jinja ? "enabled" : "disabled"),
26272621
[](common_params & params) {
26282622
params.use_jinja = true;
26292623
}
26302624
).set_examples({LLAMA_EXAMPLE_SERVER, LLAMA_EXAMPLE_COMPLETION, LLAMA_EXAMPLE_CLI, LLAMA_EXAMPLE_MTMD}).set_env("LLAMA_ARG_JINJA"));
26312625
add_opt(common_arg(
26322626
{"--no-jinja"},
2633-
string_format("disable jinja template for chat (default: %s)\n", params.use_jinja ? "enabled" : "disabled"),
2627+
string_format("disable jinja template for chat (default: %s)", params.use_jinja ? "disabled" : "enabled"),
26342628
[](common_params & params) {
26352629
params.use_jinja = false;
26362630
}

common/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ struct common_params {
464464
std::string public_path = ""; // NOLINT
465465
std::string api_prefix = ""; // NOLINT
466466
std::string chat_template = ""; // NOLINT
467-
bool use_jinja = false; // NOLINT
467+
bool use_jinja = true; // NOLINT
468468
bool enable_chat_template = true;
469469
common_reasoning_format reasoning_format = COMMON_REASONING_FORMAT_DEEPSEEK;
470470
int reasoning_budget = -1;

tools/completion/completion.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ static void sigint_handler(int signo) {
8686
int main(int argc, char ** argv) {
8787
common_params params;
8888
g_params = &params;
89+
90+
// disable jinja by default
91+
params.use_jinja = false;
92+
8993
if (!common_params_parse(argc, argv, params, LLAMA_EXAMPLE_COMPLETION, print_usage)) {
9094
return 1;
9195
}

tools/mtmd/mtmd-cli.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ int main(int argc, char ** argv) {
270270
ggml_time_init();
271271

272272
common_params params;
273+
params.use_jinja = false; // disable jinja by default
273274
params.sampling.temp = 0.2; // lower temp by default for better quality
274275

275276
if (!common_params_parse(argc, argv, params, LLAMA_EXAMPLE_MTMD, show_additional_info)) {

0 commit comments

Comments
 (0)