Include GGML backend in text log

kherud · kherud · commit c8ee55f5b0c0 · 2024-05-27T19:47:19.000+02:00
diff --git a/src/main/cpp/jllama.cpp b/src/main/cpp/jllama.cpp
@@ -137,6 +137,17 @@ JNIEnv *get_jni_env()
     }
     return env;
 }
+
+/**
+ * Invoke the log callback if there is any.
+ */
+void log_callback_trampoline(ggml_log_level level, const char *text, void *user_data)
+{
+    if (log_callback != nullptr)
+    {
+        log_callback(level, text, user_data);
+    }
+}
 } // namespace
 
 bool log_json;
@@ -632,6 +643,7 @@ JNIEXPORT void JNICALL Java_de_kherud_llama_LlamaModel_setLogger(JNIEnv *env, jc
     if (jcallback == nullptr)
     {
         log_callback = nullptr;
+        llama_log_set(nullptr, nullptr);
     }
     else
     {
@@ -643,5 +655,9 @@ JNIEXPORT void JNICALL Java_de_kherud_llama_LlamaModel_setLogger(JNIEnv *env, jc
             env->CallVoidMethod(o_log_callback, m_biconsumer_accept, log_level, message);
             env->DeleteLocalRef(message);
         };
+        if (!log_json)
+        {
+            llama_log_set(log_callback_trampoline, nullptr);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,17 @@ JNIEnv *get_jni_env()`
`137`	`137`	`}`
`138`	`138`	`return env;`
`139`	`139`	`}`
	`140`	`+`
	`141`	`+/**`
	`142`	`+ * Invoke the log callback if there is any.`
	`143`	`+ */`
	`144`	`+void log_callback_trampoline(ggml_log_level level, const char text, void user_data)`
	`145`	`+{`
	`146`	`+ if (log_callback != nullptr)`
	`147`	`+ {`
	`148`	`+ log_callback(level, text, user_data);`
	`149`	`+ }`
	`150`	`+}`
`140`	`151`	`} // namespace`
`141`	`152`
`142`	`153`	`bool log_json;`
`@@ -632,6 +643,7 @@ JNIEXPORT void JNICALL Java_de_kherud_llama_LlamaModel_setLogger(JNIEnv *env, jc`
`632`	`643`	`if (jcallback == nullptr)`
`633`	`644`	`{`
`634`	`645`	`log_callback = nullptr;`
	`646`	`+ llama_log_set(nullptr, nullptr);`
`635`	`647`	`}`
`636`	`648`	`else`
`637`	`649`	`{`
`@@ -643,5 +655,9 @@ JNIEXPORT void JNICALL Java_de_kherud_llama_LlamaModel_setLogger(JNIEnv *env, jc`
`643`	`655`	`env->CallVoidMethod(o_log_callback, m_biconsumer_accept, log_level, message);`
`644`	`656`	`env->DeleteLocalRef(message);`
`645`	`657`	`};`
	`658`	`+ if (!log_json)`
	`659`	`+ {`
	`660`	`+ llama_log_set(log_callback_trampoline, nullptr);`
	`661`	`+ }`
`646`	`662`	`}`
`647`	`663`	`}`