prepare for breaking merge

This commit is contained in:
Concedo 2026-03-29 14:09:29 +08:00
parent df6b7b5fdb
commit 4a09f3805b
2 changed files with 1 additions and 10 deletions

View file

@ -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;
}

View file

@ -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);