[WASI-NN] llama.cpp: Fix segfault of the wrong usage of the user_data…

… field. Signed-off-by: hydai <hydai@secondstate.io>
WasmEdge · Nov 3, 2023 · f7931f2 · f7931f2
1 parent 9377320
commit f7931f2
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
@@ -117,6 +117,7 @@ Expect<ErrNo> setInput(WasiNNEnvironment &Env, uint32_t ContextId,
             "[WASI-NN] GGML backend: Unable to retrieve the enable-log option."sv);
         return ErrNo::InvalidArgument;
       }
+      llama_log_set(nullptr, &CxtRef.EnableLog);
     }
     if (Doc.at_key("stream-stdout").error() == simdjson::SUCCESS) {
       auto Err = Doc["stream-stdout"].get<bool>().get(CxtRef.StreamStdout);
@@ -187,7 +188,7 @@ Expect<ErrNo> setInput(WasiNNEnvironment &Env, uint32_t ContextId,
     // If the `n_gpu_layers` in `setInput` is different from the
     // `n_gpu_layers` in `llama_model_params`, we will reload
     // the model with the new configuration.
-    if (ModelParams.n_gpu_layers != CxtRef.NGPULayers) {
+    if (ModelParams.n_gpu_layers != static_cast<int32_t>(CxtRef.NGPULayers)) {
       ModelParams.n_gpu_layers = CxtRef.NGPULayers;
       GraphRef.LlamaModel = llama_load_model_from_file(
           GraphRef.ModelFilePath.c_str(), ModelParams);

diff --git a/plugins/wasi_nn/thirdparty/ggml/llama.cpp b/plugins/wasi_nn/thirdparty/ggml/llama.cpp
@@ -9625,8 +9625,8 @@ 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;
-    bool enable_log = static_cast<bool>(user_data);
-    if (enable_log) {
+    bool * enable_log = static_cast<bool *>(user_data);
+    if (enable_log && *enable_log) {
         fputs(text, stderr);
         fflush(stderr);
     }