vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change for ollama

Browse source
This commit is contained in:
caitianchi 2024-05-27 03:42:56 +08:00
parent 18fe620976
commit 2997a680d2
1 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

33
llama.cpp
View file

@ -15379,16 +15379,33 @@ struct llama_model * llama_load_model_from_file(
} }
model->rpc_servers.push_back(servers); model->rpc_servers.push_back(servers);
} }
int status = llama_model_load(path_model, *model, params); // int status = llama_model_load(path_model, *model, params);
GGML_ASSERT(status <= 0); // GGML_ASSERT(status <= 0);
if (status < 0) { // if (status < 0) {
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;
// return nullptr;
// }
try {
int status = llama_model_load(path_model, *model, params);
GGML_ASSERT(status <= 0);
if (status < 0) {
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__);
}
delete model;
return nullptr;
} }
} catch (...) {
LLAMA_LOG_ERROR("%s: exception loading model\n", __func__);
delete model; delete model;
return nullptr; throw;
} }
return model; return model;