Fix MinicpmV model converter and clip to avoid using hardcode. #14750
+123
−50
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ngxson
requested changes
Jul 24, 2025
Comment on lines
+47
to
+48
| #define KEY_MINICPMV_QUERY_NUM "clip.minicpmv_query_num" | ||
| #define KEY_MINICPMV_PROJECTION_DIM "clip.minicpmv_projection_dim" |
There was a problem hiding this comment.
Suggested change
| #define KEY_MINICPMV_QUERY_NUM "clip.minicpmv_query_num" | |
| #define KEY_MINICPMV_PROJECTION_DIM "clip.minicpmv_projection_dim" | |
| #define KEY_MINICPMV_QUERY_NUM "clip.minicpmv_query_num" | |
| #define KEY_MINICPMV_PROJ_DIM "clip.minicpmv_projection_dim" |
Comment on lines
+858
to
+864
| if (ctx->model.hparams.minicpmv_version == 2) { | ||
| num_query = 96; | ||
| } else if (ctx->model.hparams.minicpmv_version == 3) { | ||
| num_query = 64; | ||
| } else if (ctx->model.hparams.minicpmv_version == 4) { | ||
| num_query = 64; | ||
| } |
There was a problem hiding this comment.
move this into clip_model_loader and populate ctx->model.hparams.minicpmv_query_num when loading the model
| @@ -2110,6 +2118,8 @@ struct clip_model_loader { | |||
| get_u32(KEY_PATCH_SIZE, hparams.patch_size); | |||
| get_u32(KEY_IMAGE_CROP_RESOLUTION, hparams.image_crop_resolution, false); | |||
| get_i32(KEY_MINICPMV_VERSION, hparams.minicpmv_version, false); // legacy | |||
| get_u32(KEY_MINICPMV_QUERY_NUM, hparams.minicpmv_query_num, false); | |||
| get_u32(KEY_MINICPMV_PROJECTION_DIM, hparams.minicpmv_projection_dim, false); | |||
There was a problem hiding this comment.
Suggested change
| get_u32(KEY_MINICPMV_PROJECTION_DIM, hparams.minicpmv_projection_dim, false); | |
| get_u32(KEY_MINICPMV_PROJ_DIM, hparams.minicpmv_projection_dim, false); |
| return 3584; | ||
| // Use actual config value if available, otherwise fall back to hardcoded values | ||
| if (hparams.minicpmv_projection_dim > 0) { | ||
| return hparams.minicpmv_projection_dim; |
There was a problem hiding this comment.
maybe this doesn't need to be a metadata, you can read it from tensor shape, just like other models
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Make sure to read the contributing guidelines before submitting a PR
Tested by llama-mtmd-cli with multiple minicpmv models.