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

clip: don't throw exceptions from llava functions compiled as extern "C"

Browse source
This commit is contained in:
Aleksandr Erofeev 2024-06-29 15:50:33 +01:00
parent 72272b83a3
commit e18d43c668
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
examples/llava/clip.cpp
View file

@ -1274,7 +1274,10 @@ struct clip_ctx * clip_model_load(const char * fname, const int verbosity = 1) {
} }
else { else {
std::string proj_type = PROJECTOR_TYPE_NAMES[new_clip->proj_type]; std::string proj_type = PROJECTOR_TYPE_NAMES[new_clip->proj_type];
throw std::runtime_error(format("%s: don't support projector with: %s currently\n", __func__, proj_type.c_str())); LOG_TEE("%s: don't support projector with: %s currently\n", __func__, proj_type.c_str());
clip_free(new_clip);
gguf_free(ctx);
return nullptr;
} }
vision_model.layers.resize(hparams.n_layer); vision_model.layers.resize(hparams.n_layer);
@ -1933,6 +1936,10 @@ bool clip_model_quantize(const char * fname_inp, const char * fname_out, const i
type = static_cast<ggml_type>(itype); type = static_cast<ggml_type>(itype);
auto * ctx_clip = clip_model_load(fname_inp, 2); auto * ctx_clip = clip_model_load(fname_inp, 2);
if (!ctx_clip) {
LOG_TEE("Failed to load model from file %s", fname_inp);
return false;
}
const auto & ctx_src = ctx_clip->ctx_gguf; const auto & ctx_src = ctx_clip->ctx_gguf;
const auto & ctx_data = ctx_clip->ctx_data; const auto & ctx_data = ctx_clip->ctx_data;
@ -2074,5 +2081,6 @@ int clip_n_mmproj_embd(const struct clip_ctx * ctx) {
} }
std::string proj_type = PROJECTOR_TYPE_NAMES[ctx->proj_type]; std::string proj_type = PROJECTOR_TYPE_NAMES[ctx->proj_type];
throw std::runtime_error(format("%s: don't support projector with: %s currently\n", __func__, proj_type.c_str())); LOG_TEE("%s: don't support projector with: %s currently\n", __func__, proj_type.c_str());
return 0;
} }