[Model] Merge SupportsMultiModalWithRawInput with SupportsMultiModal (#23749)

Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
This commit is contained in:
Cyrus Leung
2025-08-28 01:01:50 +08:00
committed by GitHub
parent 4f35be10a9
commit 52883ed084
5 changed files with 30 additions and 50 deletions

View File

@@ -29,7 +29,7 @@ from .interfaces import (has_inner_state, has_noops, is_attention_free,
is_hybrid, supports_cross_encoding,
supports_multimodal,
supports_multimodal_encoder_tp_data,
supports_multimodal_raw_input, supports_pp,
supports_multimodal_raw_input_only, supports_pp,
supports_transcription, supports_v0_only)
from .interfaces_base import (get_default_pooling_type, is_pooling_model,
is_text_generation_model)
@@ -326,7 +326,7 @@ class _ModelInfo:
default_pooling_type: str
supports_cross_encoding: bool
supports_multimodal: bool
supports_multimodal_raw_input: bool
supports_multimodal_raw_input_only: bool
supports_multimodal_encoder_tp_data: bool
supports_pp: bool
has_inner_state: bool
@@ -346,7 +346,8 @@ class _ModelInfo:
default_pooling_type=get_default_pooling_type(model),
supports_cross_encoding=supports_cross_encoding(model),
supports_multimodal=supports_multimodal(model),
supports_multimodal_raw_input=supports_multimodal_raw_input(model),
supports_multimodal_raw_input_only=
supports_multimodal_raw_input_only(model),
supports_multimodal_encoder_tp_data=
supports_multimodal_encoder_tp_data(model),
supports_pp=supports_pp(model),
@@ -743,13 +744,13 @@ class _ModelRegistry:
model_cls, _ = self.inspect_model_cls(architectures, model_config)
return model_cls.supports_multimodal
def supports_multimodal_raw_input(
def is_multimodal_raw_input_only_model(
self,
architectures: Union[str, list[str]],
model_config: ModelConfig,
) -> bool:
model_cls, _ = self.inspect_model_cls(architectures, model_config)
return model_cls.supports_multimodal_raw_input
return model_cls.supports_multimodal_raw_input_only
def is_pp_supported_model(
self,