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

Refactored error handling for hyperparameter validation in clip.cpp

Browse source 
Removed the try-catch block and throw statements
Added validation checks for all hyperparameters, ensuring they are not set to invalid or zero values.
Used fprintf to log error messages when invalid hyperparameters are encountered.
This commit is contained in:
Tejaakshaykumar 2024-09-17 15:46:59 +05:30 • committed by GitHub
parent 28d1c4566a
commit cba0340871
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
examples/llava/clip.cpp
View file

@ -1270,7 +1270,6 @@ struct clip_ctx * clip_model_load(const char * fname, const int verbosity = 1) {
// load vision model
auto & vision_model = new_clip->vision_model;
auto & hparams = vision_model.hparams;
try{
hparams.hidden_size = get_u32(ctx, format(KEY_N_EMBD, "vision"));
hparams.n_head = get_u32(ctx, format(KEY_N_HEAD, "vision"));
hparams.n_intermediate = get_u32(ctx, format(KEY_N_FF, "vision"));
@ -1279,12 +1278,10 @@ struct clip_ctx * clip_model_load(const char * fname, const int verbosity = 1) {
hparams.patch_size = get_u32(ctx, KEY_PATCH_SIZE);
hparams.projection_dim = get_u32(ctx, format(KEY_PROJ_DIM, "vision"));
hparams.eps = get_f32(ctx, format(KEY_LAYER_NORM_EPS, "vision"));
if (hparams.hidden_size == 0 || hparams.n_head == 0 || hparams.n_layer == 0 || hparams.n_intermediate || hparams.image_size == 0 || hparams.patch_size || hparams.projection_dim || hparams.eps) {
throw std::invalid_argument("Invalid hyperparameter values");
if (hparams.hidden_size == 0 || hparams.n_head == 0 || hparams.n_layer == 0 || hparams.n_intermediate == 0 || hparams.image_size == 0 || hparams.patch_size == 0 || hparams.projection_dim == 0 || hparams.eps == 0) {
fprintf(stderr, "Error: Invalid hyperparameter values\n");
return false;
}
} catch (const std::exception& e) {
fprintf(stderr, "Error while loading hyperparameters: %s\n", e.what());
return false;
}
try {
int idx = get_key_idx(ctx, KEY_IMAGE_GRID_PINPOINTS);