From becf70d49b5f754e9b09b6d49ac371b36be84468 Mon Sep 17 00:00:00 2001 From: Concedo <39025047+LostRuins@users.noreply.github.com> Date: Thu, 23 Apr 2026 00:43:09 +0800 Subject: [PATCH] fixed logspam for fit --- gpttype_adapter.cpp | 5 ++++- tools/mtmd/clip-impl.h | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gpttype_adapter.cpp b/gpttype_adapter.cpp index 463aaaa53..2d3c9d024 100644 --- a/gpttype_adapter.cpp +++ b/gpttype_adapter.cpp @@ -2623,15 +2623,17 @@ ModelLoadResult gpttype_load_model(const load_model_inputs inputs, FileFormat in bool dospam = (debugmode==1 && !is_quiet); ggml_log_callback currlogger; void * curruserdat; + auto oldverbosity = common_log_get_verbosity_thold(); if(!dospam) { llama_log_get(&currlogger, &curruserdat); llama_log_set(log_callback_off, nullptr); + common_log_set_verbosity_thold(GGML_LOG_LEVEL_NONE); } fit_params_target[0] = taxmb*1024*1024; bool success = (common_fit_params(kcpp_data->model_filename.c_str(), &model_params, &llama_ctx_params, tensor_split_temp, tenos.data(), fit_params_target.data(), kcpp_data->n_ctx, - GGML_LOG_LEVEL_NONE)==0); + dospam?GGML_LOG_LEVEL_DEBUG:GGML_LOG_LEVEL_NONE)==0); if(!dospam) { llama_log_set(currlogger, curruserdat); @@ -2642,6 +2644,7 @@ ModelLoadResult gpttype_load_model(const load_model_inputs inputs, FileFormat in { //revert to previous model_params.n_gpu_layers = inputs.gpulayers; + common_log_set_verbosity_thold(oldverbosity); } } diff --git a/tools/mtmd/clip-impl.h b/tools/mtmd/clip-impl.h index fd739ef07..2a8370dcb 100644 --- a/tools/mtmd/clip-impl.h +++ b/tools/mtmd/clip-impl.h @@ -413,11 +413,13 @@ static void clip_log_internal(enum ggml_log_level level, const char * format, .. va_end(args); } +#ifndef LOG_INF #define LOG_INF(...) clip_log_internal(GGML_LOG_LEVEL_INFO, __VA_ARGS__) #define LOG_WRN(...) clip_log_internal(GGML_LOG_LEVEL_WARN, __VA_ARGS__) #define LOG_ERR(...) clip_log_internal(GGML_LOG_LEVEL_ERROR, __VA_ARGS__) #define LOG_DBG(...) clip_log_internal(GGML_LOG_LEVEL_DEBUG, __VA_ARGS__) #define LOG_CNT(...) clip_log_internal(GGML_LOG_LEVEL_CONT, __VA_ARGS__) +#endif // // cpp wrappers