Code update for pr/14750

Author: lzhang

tools/mtmd/clip-impl.h

@@ -45,7 +45,7 @@
 #define KEY_ATTN_WINDOW_SIZE      "clip.vision.window_size"
 #define KEY_MINICPMV_VERSION      "clip.minicpmv_version"
 #define KEY_MINICPMV_QUERY_NUM    "clip.minicpmv_query_num"
-#define KEY_MINICPMV_PROJECTION_DIM "clip.minicpmv_projection_dim"
+#define KEY_MINICPMV_PROJ_DIM     "clip.minicpmv_projection_dim"
 
 // audio-specific
 #define KEY_A_NUM_MEL_BINS      "clip.audio.num_mel_bins"

tools/mtmd/clip.cpp

@@ -850,20 +850,7 @@ struct clip_graph {
             const int d_head = 128;
             int n_head = n_embd/d_head;
             // Use actual config value if available, otherwise fall back to hardcoded values
-            int num_query = 96;
-            if (ctx->model.hparams.minicpmv_query_num > 0) {
-                num_query = ctx->model.hparams.minicpmv_query_num;
-            } else {
-                // Fallback to hardcoded values for legacy models
-                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;
-                }
-            }
-
+            int num_query = ctx->model.hparams.minicpmv_query_num;
             ggml_tensor * Q = ggml_add(ctx0,
                 ggml_mul_mat(ctx0, model.mm_model_attn_q_w, q),
                 model.mm_model_attn_q_b);
@@ -2119,8 +2106,17 @@ struct clip_model_loader {
                 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);
-
+                get_u32(KEY_MINICPMV_PROJ_DIM, hparams.minicpmv_projection_dim, false);
+                if (hparams.minicpmv_query_num == 0) {
+                    // Fallback to hardcoded values for legacy models
+                    if (hparams.minicpmv_version == 3) {
+                        hparams.minicpmv_query_num = 64;
+                    } else if (hparams.minicpmv_version == 4) {
+                        hparams.minicpmv_query_num = 64;
+                    } else {
+                        hparams.minicpmv_query_num = 96;
+                    }
+                }
             } else if (is_audio) {
                 get_u32(KEY_A_NUM_MEL_BINS, hparams.n_mel_bins);
 
@@ -4063,7 +4059,6 @@ bool clip_image_batch_encode(clip_ctx * ctx, const int n_threads, const clip_ima
 }
 
 int clip_n_mmproj_embd(const struct clip_ctx * ctx) {
-    const auto & hparams = ctx->model.hparams;
     switch (ctx->model.proj_type) {
         case PROJECTOR_TYPE_LDP:
             return ctx->model.mm_model_block_1_block_2_1_b->ne[0];
@@ -4075,20 +4070,7 @@ int clip_n_mmproj_embd(const struct clip_ctx * ctx) {
         case PROJECTOR_TYPE_MLP_NORM:
             return ctx->model.mm_3_b->ne[0];
         case PROJECTOR_TYPE_MINICPMV:
-            // Use actual config value if available, otherwise fall back to hardcoded values
-            if (hparams.minicpmv_projection_dim > 0) {
-                return hparams.minicpmv_projection_dim;
-            } else {
-                // Fallback to hardcoded values for legacy models
-                if (hparams.minicpmv_version == 2) {
-                    return 4096;
-                } else if (hparams.minicpmv_version == 3) {
-                    return 3584;
-                } else if (hparams.minicpmv_version == 4) {
-                    return 3584;
-                }
-                GGML_ABORT("Unknown minicpmv version");
-            }
+            return ctx->model.mm_model_proj->ne[0];
         case PROJECTOR_TYPE_GLM_EDGE:
             return ctx->model.mm_model_mlp_3_w->ne[1];
         case PROJECTOR_TYPE_QWEN2VL: