Merge branch 'cancel-model-load' of github.com:crasm/llama.cpp into cancel-model-load

crasm · crasm · commit cb8a4be5d04d · 2023-12-17T14:31:49.000-05:00
diff --git a/llama.cpp b/llama.cpp
@@ -9039,7 +9039,7 @@ struct llama_model * llama_load_model_from_file(
         if (status == -1) {
             LLAMA_LOG_ERROR("%s: failed to load model\n", __func__);
         } else if (status == -2) {
-            LLAMA_LOG_INFO("%s, cancelled model load\n", __func__);
+            LLAMA_LOG_INFO("%s: cancelled model load\n", __func__);
         }
         delete model;
         return nullptr;

Original file line number	Diff line number	Diff line change
`@@ -9039,7 +9039,7 @@ struct llama_model * llama_load_model_from_file(`
`9039`	`9039`	`if (status == -1) {`
`9040`	`9040`	`LLAMA_LOG_ERROR("%s: failed to load model\n", __func__);`
`9041`	`9041`	`} else if (status == -2) {`
`9042`		`- LLAMA_LOG_INFO("%s, cancelled model load\n", __func__);`
	`9042`	`+ LLAMA_LOG_INFO("%s: cancelled model load\n", __func__);`
`9043`	`9043`	`}`
`9044`	`9044`	`delete model;`
`9045`	`9045`	`return nullptr;`