ggml logs

thxCode · thxCode · commit 62a5d08ab51e · 2025-01-08T09:08:05.000+08:00
Author: clibdev &lt;clibdev@gmail.com&gt;
diff --git a/ggml_extend.hpp b/ggml_extend.hpp
@@ -60,11 +60,23 @@
 #define __STATIC_INLINE__ static inline
 #endif
 
-__STATIC_INLINE__ void ggml_log_callback_default(ggml_log_level level, const char* text, void* user_data) {
-    (void)level;
-    (void)user_data;
-    fputs(text, stderr);
-    fflush(stderr);
+__STATIC_INLINE__ void ggml_log_callback_default(ggml_log_level level, const char* text, void*) {
+    switch (level) {
+        case GGML_LOG_LEVEL_DEBUG:
+            LOG_DEBUG(text);
+        break;
+        case GGML_LOG_LEVEL_INFO:
+            LOG_INFO(text);
+        break;
+        case GGML_LOG_LEVEL_WARN:
+            LOG_WARN(text);
+        break;
+        case GGML_LOG_LEVEL_ERROR:
+            LOG_ERROR(text);
+        break;
+        default:
+            LOG_DEBUG(text);
+    }
 }
 
 __STATIC_INLINE__ void ggml_tensor_set_f32_randn(struct ggml_tensor* tensor, std::shared_ptr<RNG> rng) {
diff --git a/stable-diffusion.cpp b/stable-diffusion.cpp
@@ -232,6 +232,8 @@ class StableDiffusionGGML {
                         bool tae_preview_only,
                         int main_gpu) {
         use_tiny_autoencoder = taesd_path.size() > 0;
+
+        ggml_log_set(ggml_log_callback_default, nullptr);
 #ifdef SD_USE_CUDA
 #ifdef SD_USE_HIP
         LOG_DEBUG("Using HIP backend");
@@ -247,7 +249,6 @@ class StableDiffusionGGML {
 #endif
 #ifdef SD_USE_METAL
         LOG_DEBUG("Using Metal backend");
-        ggml_log_set(ggml_log_callback_default, nullptr);
         backend = ggml_backend_metal_init();
         if (!backend) {
             LOG_ERROR("Metal backend init failed");
diff --git a/upscaler.cpp b/upscaler.cpp
@@ -15,6 +15,7 @@ struct UpscalerGGML {
     }
 
     bool load_from_file(const std::string& esrgan_path, int main_gpu) {
+        ggml_log_set(ggml_log_callback_default, nullptr);
 #ifdef SD_USE_CUDA
 #ifdef SD_USE_HIP
         LOG_DEBUG("Using HIP backend");
@@ -30,7 +31,6 @@ struct UpscalerGGML {
 #endif
 #ifdef SD_USE_METAL
         LOG_DEBUG("Using Metal backend");
-        ggml_log_set(ggml_log_callback_default, nullptr);
         backend = ggml_backend_metal_init();
         if (!backend) {
             LOG_ERROR("Metal backend init failed");
diff --git a/util.cpp b/util.cpp
@@ -390,7 +390,10 @@ void log_printf(sd_log_level_t level, const char* file, int line, const char* fo
     if (written >= 0 && written < LOG_BUFFER_SIZE) {
         vsnprintf(log_buffer + written, LOG_BUFFER_SIZE - written, format, args);
     }
-    strncat(log_buffer, "\n", LOG_BUFFER_SIZE - strlen(log_buffer));
+    size_t len = strlen(log_buffer);
+    if (log_buffer[len - 1] != '\n') {
+        strncat(log_buffer, "\n", LOG_BUFFER_SIZE - len);
+    }
 
     if (sd_log_cb) {
         sd_log_cb(level, log_buffer, sd_log_cb_data);
