[WASI-NN] Fix llama log print

Signed-off-by: dm4 <dm4@secondstate.io>
apepkuss · Oct 30, 2023 · 5409095 · 5409095
1 parent 806cf17
commit 5409095
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/plugins/wasi_nn/ggml.cpp b/plugins/wasi_nn/ggml.cpp
@@ -311,6 +311,7 @@ Expect<ErrNo> compute(WasiNNEnvironment &Env, uint32_t ContextId) noexcept {
   }
 
   if (CxtRef.EnableLog) {
+    llama_log_set(nullptr, &CxtRef.EnableLog);
     llama_print_timings(GraphRef.LlamaContext);
   }
 

diff --git a/plugins/wasi_nn/thirdparty/ggml/llama.cpp b/plugins/wasi_nn/thirdparty/ggml/llama.cpp
@@ -7693,9 +7693,9 @@ static void llama_log_internal(ggml_log_level level, const char * format, ...) {
 
 static void llama_log_callback_default(ggml_log_level level, const char * text, void * user_data) {
     (void) level;
-    (void) user_data;
-    if (std::getenv("LLAMA_LOG") != nullptr) {
+    bool enable_log = static_cast<bool>(user_data);
+    if (enable_log) {
         fputs(text, stderr);
+        fflush(stderr);
     }
-    fflush(stderr);
 }
-Original file line number
+Diff line change
@@ Expand Up @@
       }
       if (CxtRef.EnableLog) {
+        llama_log_set(nullptr, &CxtRef.EnableLog);
         llama_print_timings(GraphRef.LlamaContext);
       }
@@ Expand Down @@