From 4a09f3805bf9323ec3c06f50b396e1f42b08d332 Mon Sep 17 00:00:00 2001 From: Concedo <39025047+LostRuins@users.noreply.github.com> Date: Sun, 29 Mar 2026 14:09:29 +0800 Subject: [PATCH] prepare for breaking merge --- tools/mtmd/clip.cpp | 9 +-------- tools/mtmd/clip.h | 2 -- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/tools/mtmd/clip.cpp b/tools/mtmd/clip.cpp index a8726b018..5f4dd0926 100644 --- a/tools/mtmd/clip.cpp +++ b/tools/mtmd/clip.cpp @@ -5008,6 +5008,7 @@ bool clip_is_mrope(const struct clip_ctx * ctx) { //kcpp: this was removed in ht case PROJECTOR_TYPE_QWEN25VL: case PROJECTOR_TYPE_QWEN3VL: case PROJECTOR_TYPE_GLM4V: + case PROJECTOR_TYPE_PADDLEOCR: return true; default: return false; @@ -5018,14 +5019,6 @@ bool clip_is_llava(const struct clip_ctx * ctx) { return ctx->model.hparams.has_llava_projector; } -bool clip_is_gemma3(const struct clip_ctx * ctx) { - return ctx->proj_type() == PROJECTOR_TYPE_GEMMA3; -} - -bool clip_is_pixtral(const struct clip_ctx * ctx) { - return ctx->proj_type() == PROJECTOR_TYPE_PIXTRAL; -} - bool clip_has_vision_encoder(const struct clip_ctx * ctx) { return ctx->model.modality == CLIP_MODALITY_VISION; } diff --git a/tools/mtmd/clip.h b/tools/mtmd/clip.h index 466a0cbb5..84cdbebc0 100644 --- a/tools/mtmd/clip.h +++ b/tools/mtmd/clip.h @@ -114,8 +114,6 @@ int clip_is_minicpmv(const struct clip_ctx * ctx); bool clip_is_glm(const struct clip_ctx * ctx); bool clip_is_mrope(const struct clip_ctx * ctx); bool clip_is_llava(const struct clip_ctx * ctx); -bool clip_is_gemma3(const struct clip_ctx * ctx); -bool clip_is_pixtral(const struct clip_ctx * ctx); void set_clip_uses_gpu(bool usegpu); int clip_get_projector_type_ext(clip_ctx * ctx);