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

This commit is contained in:
crasm 2023-12-17 14:31:49 -05:00
commit cb8a4be5d0

View File

@ -9039,7 +9039,7 @@ struct llama_model * llama_load_model_from_file(
if (status == -1) { if (status == -1) {
LLAMA_LOG_ERROR("%s: failed to load model\n", __func__); LLAMA_LOG_ERROR("%s: failed to load model\n", __func__);
} else if (status == -2) { } else if (status == -2) {
LLAMA_LOG_INFO("%s, cancelled model load\n", __func__); LLAMA_LOG_INFO("%s: cancelled model load\n", __func__);
} }
delete model; delete model;
return nullptr; return nullptr;