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

common : fix verbosity setup (#20989) 

The verbosity threshold was set at the end of common_params_parse_ex(),
after doing many things (like downloading files..)

Signed-off-by: Adrien Gallouët <angt@huggingface.co>
This commit is contained in:
Adrien Gallouët 2026-03-25 19:41:01 +01:00 committed by GitHub
parent f2c72b8f1f
commit 056b50c319
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/arg.cpp
View File

@ -423,6 +423,9 @@ static bool parse_bool_value(const std::string & value) {
static bool common_params_parse_ex(int argc, char ** argv, common_params_context & ctx_arg) { static bool common_params_parse_ex(int argc, char ** argv, common_params_context & ctx_arg) {
common_params & params = ctx_arg.params; common_params & params = ctx_arg.params;
// setup log directly from params.verbosity: see tools/cli/cli.cpp
common_log_set_verbosity_thold(params.verbosity);
std::unordered_map<std::string, std::pair<common_arg *, bool>> arg_to_options; std::unordered_map<std::string, std::pair<common_arg *, bool>> arg_to_options;
for (auto & opt : ctx_arg.options) { for (auto & opt : ctx_arg.options) {
for (const auto & arg : opt.args) { for (const auto & arg : opt.args) {
@ -631,8 +634,6 @@ static bool common_params_parse_ex(int argc, char ** argv, common_params_context
)); ));
} }
common_log_set_verbosity_thold(params.verbosity);
return true; return true;
} }
@ -3244,6 +3245,7 @@ common_params_context common_params_parser_init(common_params & params, llama_ex
"Set verbosity level to infinity (i.e. log all messages, useful for debugging)", "Set verbosity level to infinity (i.e. log all messages, useful for debugging)",
[](common_params & params) { [](common_params & params) {
params.verbosity = INT_MAX; params.verbosity = INT_MAX;
common_log_set_verbosity_thold(INT_MAX);
} }
)); ));
add_opt(common_arg( add_opt(common_arg(
@ -3264,6 +3266,7 @@ common_params_context common_params_parser_init(common_params & params, llama_ex
"(default: %d)\n", params.verbosity), "(default: %d)\n", params.verbosity),
[](common_params & params, int value) { [](common_params & params, int value) {
params.verbosity = value; params.verbosity = value;
common_log_set_verbosity_thold(value);
} }
).set_env("LLAMA_LOG_VERBOSITY")); ).set_env("LLAMA_LOG_VERBOSITY"));
add_opt(common_arg( add_opt(common_arg(