Skip to content

Commit c46b932

Browse files
[Chore] Deprecate SupportsMultiModal.merge_by_field_config (#30170)
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
1 parent 6476382 commit c46b932

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+23
-110
lines changed

vllm/model_executor/models/aria.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,8 +499,6 @@ class AriaForConditionalGeneration(nn.Module, SupportsMultiModal):
499499
model to perform tasks that involve both image and text inputs.
500500
"""
501501

502-
merge_by_field_config = True
503-
504502
hf_to_vllm_mapper = WeightsMapper(
505503
orig_to_new_prefix={
506504
# mapping for new names in checkpoint saved after transformers v4.52

vllm/model_executor/models/aya_vision.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,6 @@ def _get_layer_index(feature_layer_index: int, num_hidden_layers: int) -> int:
318318
dummy_inputs=AyaVisionDummyInputsBuilder,
319319
)
320320
class AyaVisionForConditionalGeneration(nn.Module, SupportsMultiModal, SupportsPP):
321-
merge_by_field_config = True
322-
323321
hf_to_vllm_mapper = WeightsMapper(
324322
orig_to_new_prefix={
325323
# mapping for new names in checkpoint saved after transformers v4.52

vllm/model_executor/models/blip2.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -523,8 +523,6 @@ def _get_prompt_updates(
523523
class Blip2ForConditionalGeneration(
524524
nn.Module, SupportsMultiModal, SupportsPP, SupportsQuant
525525
):
526-
merge_by_field_config = True
527-
528526
@classmethod
529527
def get_placeholder_str(cls, modality: str, i: int) -> str | None:
530528
if modality.startswith("image"):

vllm/model_executor/models/chameleon.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -918,8 +918,6 @@ def forward(
918918
class ChameleonForConditionalGeneration(
919919
nn.Module, SupportsMultiModal, SupportsPP, SupportsQuant
920920
):
921-
merge_by_field_config = True
922-
923921
packed_modules_mapping = {
924922
"qkv_proj": ["q_proj", "k_proj", "v_proj"],
925923
"gate_up_proj": ["gate_proj", "up_proj"],

vllm/model_executor/models/clip.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,6 @@ class CLIPEmbeddingModel(nn.Module, SupportsMultiModal, SupportsQuant):
784784
is_pooling_model = True
785785

786786
packed_modules_mapping = {"qkv_proj": ["q_proj", "k_proj", "v_proj"]}
787-
merge_by_field_config = True
788787

789788
@classmethod
790789
def get_placeholder_str(cls, modality: str, i: int) -> str | None:

vllm/model_executor/models/cohere2_vision.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,6 @@ def get_replacement(item_idx: int):
331331
dummy_inputs=Cohere2VisionDummyInputsBuilder,
332332
)
333333
class Cohere2VisionForConditionalGeneration(nn.Module, SupportsMultiModal, SupportsPP):
334-
merge_by_field_config = True
335-
336334
hf_to_vllm_mapper = WeightsMapper(
337335
orig_to_new_prefix={
338336
"model.vision_tower.": "vision_tower.",

vllm/model_executor/models/deepseek_ocr.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,6 @@ def get_replacement_deepseek_vl2(item_idx: int):
344344
dummy_inputs=DeepseekOCRDummyInputsBuilder,
345345
)
346346
class DeepseekOCRForCausalLM(nn.Module, SupportsMultiModal, SupportsPP):
347-
merge_by_field_config = True
348-
349347
hf_to_vllm_mapper = WeightsMapper(
350348
orig_to_new_prefix={
351349
# map prefix for language backbone

vllm/model_executor/models/deepseek_vl2.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,6 @@ def _cached_apply_hf_processor(
344344
dummy_inputs=DeepseekVL2DummyInputsBuilder,
345345
)
346346
class DeepseekVLV2ForCausalLM(nn.Module, SupportsMultiModal, SupportsPP):
347-
merge_by_field_config = True
348-
349347
hf_to_vllm_mapper = WeightsMapper(
350348
orig_to_new_prefix={
351349
"language.": "language_model.",

vllm/model_executor/models/dots_ocr.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -690,8 +690,6 @@ def forward(
690690
dummy_inputs=DotsOCRDummyInputsBuilder,
691691
)
692692
class DotsOCRForCausalLM(nn.Module, SupportsMultiModal, SupportsPP, SupportsLoRA):
693-
merge_by_field_config = True
694-
695693
hf_to_vllm_mapper = WeightsMapper(
696694
orig_to_new_substr={
697695
".attn.qkv_proj.": ".attn.qkv.",

vllm/model_executor/models/ernie45_vl.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1254,8 +1254,6 @@ def get_dummy_mm_data(
12541254
class Ernie4_5_VLMoeForConditionalGeneration(
12551255
nn.Module, SupportsMultiModal, SupportsLoRA, SupportsPP, SupportsMRoPE
12561256
):
1257-
merge_by_field_config = True
1258-
12591257
packed_modules_mapping = {
12601258
"qkv_proj": [
12611259
"q_proj",

0 commit comments

Comments
 (0)