Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions vllm/model_executor/models/ernie45_vl.py
Original file line number Diff line number Diff line change
Expand Up @@ -1645,12 +1645,12 @@ def get_multimodal_embeddings(
for modality in modalities:
if modality == "images":
image_input = modalities["images"]
vision_embeddings = self._process_image_input(image_input)
multimodal_embeddings += vision_embeddings
image_embeddings = self._process_image_input(image_input)
multimodal_embeddings += tuple(image_embeddings)
if modality == "videos":
video_input = modalities["videos"]
video_embeddings = self._process_video_input(video_input)
multimodal_embeddings += video_embeddings
multimodal_embeddings += tuple(video_embeddings)

return multimodal_embeddings

Expand Down
6 changes: 3 additions & 3 deletions vllm/model_executor/models/glm4_1v.py
Original file line number Diff line number Diff line change
Expand Up @@ -1608,11 +1608,11 @@ def get_multimodal_embeddings(
for modality in mm_input_by_modality:
multimodal_input = mm_input_by_modality[modality]
if modality == "image":
vision_embeddings = self._process_image_input(multimodal_input)
multimodal_embeddings += vision_embeddings
image_embeddings = self._process_image_input(multimodal_input)
multimodal_embeddings += tuple(image_embeddings)
if modality == "video":
video_embeddings = self._process_video_input(multimodal_input)
multimodal_embeddings += video_embeddings
multimodal_embeddings += tuple(video_embeddings)
return multimodal_embeddings

def forward(
Expand Down
6 changes: 3 additions & 3 deletions vllm/model_executor/models/hyperclovax_vision.py
Original file line number Diff line number Diff line change
Expand Up @@ -749,12 +749,12 @@ def get_multimodal_embeddings(
for modality in modalities:
if modality == "images":
image_input = modalities["images"]
vision_embeddings = self._process_image_input(image_input)
multimodal_embeddings += vision_embeddings
image_embeddings = self._process_image_input(image_input)
multimodal_embeddings += tuple(image_embeddings)
if modality == "videos":
video_input = modalities["videos"]
video_embeddings = self._process_video_input(video_input)
multimodal_embeddings += video_embeddings
multimodal_embeddings += tuple(video_embeddings)

return multimodal_embeddings

Expand Down
6 changes: 3 additions & 3 deletions vllm/model_executor/models/interns1.py
Original file line number Diff line number Diff line change
Expand Up @@ -753,12 +753,12 @@ def get_multimodal_embeddings(self, **kwargs: object) -> MultiModalEmbeddings:
for modality in modalities:
if modality == "images":
image_input = modalities["images"]
vision_embeddings = self._process_vision_input(image_input)
multimodal_embeddings += vision_embeddings
image_embeddings = self._process_vision_input(image_input)
multimodal_embeddings += tuple(image_embeddings)
if modality == "videos":
video_input = modalities["videos"]
video_embeddings = self._process_vision_input(video_input)
multimodal_embeddings += video_embeddings
multimodal_embeddings += tuple(video_embeddings)

return multimodal_embeddings

Expand Down
6 changes: 3 additions & 3 deletions vllm/model_executor/models/internvl.py
Original file line number Diff line number Diff line change
Expand Up @@ -1358,12 +1358,12 @@ def get_multimodal_embeddings(self, **kwargs: object) -> MultiModalEmbeddings:
for modality in modalities:
if modality == "images":
image_input = modalities["images"]
vision_embeddings = self._process_vision_input(image_input)
multimodal_embeddings += vision_embeddings
image_embeddings = self._process_vision_input(image_input)
multimodal_embeddings += tuple(image_embeddings)
if modality == "videos":
video_input = modalities["videos"]
video_embeddings = self._process_vision_input(video_input)
multimodal_embeddings += video_embeddings
multimodal_embeddings += tuple(video_embeddings)

return multimodal_embeddings

Expand Down
6 changes: 3 additions & 3 deletions vllm/model_executor/models/keye.py
Original file line number Diff line number Diff line change
Expand Up @@ -1459,12 +1459,12 @@ def get_multimodal_embeddings(
for modality in modalities:
if modality == "images":
image_input = modalities["images"]
vision_embeddings = self._process_image_input(image_input)
multimodal_embeddings += vision_embeddings
image_embeddings = self._process_image_input(image_input)
multimodal_embeddings += tuple(image_embeddings)
if modality == "videos":
video_input = modalities["videos"]
video_embeddings = self._process_video_input(video_input)
multimodal_embeddings += video_embeddings
multimodal_embeddings += tuple(video_embeddings)
return multimodal_embeddings

def forward(
Expand Down
4 changes: 2 additions & 2 deletions vllm/model_executor/models/llava_onevision.py
Original file line number Diff line number Diff line change
Expand Up @@ -881,8 +881,8 @@ def get_multimodal_embeddings(self, **kwargs: object) -> MultiModalEmbeddings:
for modality in mm_input_by_modality:
multimodal_input = mm_input_by_modality[modality]
if modality == "image":
vision_embeddings = self._process_image_input(multimodal_input)
multimodal_embeddings += tuple(vision_embeddings)
image_embeddings = self._process_image_input(multimodal_input)
multimodal_embeddings += tuple(image_embeddings)
if modality == "video":
video_embeddings = self._process_video_pixels(multimodal_input)
multimodal_embeddings += tuple(video_embeddings)
Expand Down
4 changes: 2 additions & 2 deletions vllm/model_executor/models/minicpmo.py
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ def _process_multimodal_inputs(self, modalities: dict):
for modality in modalities:
if modality == "audios":
audio_input = modalities["audios"]
audio_features = self._process_audio_input(audio_input)
multimodal_embeddings += tuple(audio_features)
audio_embeddings = self._process_audio_input(audio_input)
multimodal_embeddings += tuple(audio_embeddings)

return multimodal_embeddings
8 changes: 4 additions & 4 deletions vllm/model_executor/models/minicpmv.py
Original file line number Diff line number Diff line change
Expand Up @@ -1129,12 +1129,12 @@ def _process_multimodal_inputs(self, modalities: dict):
for modality in modalities:
if modality == "images":
image_input = modalities["images"]
image_features = self._process_vision_input(image_input)
multimodal_embeddings += tuple(image_features)
image_embeddings = self._process_vision_input(image_input)
multimodal_embeddings += tuple(image_embeddings)
if modality == "videos":
video_input = modalities["videos"]
video_features = self._process_vision_input(video_input)
multimodal_embeddings += tuple(video_features)
video_embeddings = self._process_vision_input(video_input)
multimodal_embeddings += tuple(video_embeddings)

return multimodal_embeddings

Expand Down
6 changes: 3 additions & 3 deletions vllm/model_executor/models/nano_nemotron_vl.py
Original file line number Diff line number Diff line change
Expand Up @@ -1263,12 +1263,12 @@ def get_multimodal_embeddings(self, **kwargs: object) -> MultiModalEmbeddings:
for modality in modalities:
if modality == "images":
image_input = modalities["images"]
vision_embeddings = self._process_image_input(image_input)
multimodal_embeddings += vision_embeddings
image_embeddings = self._process_image_input(image_input)
multimodal_embeddings += tuple(image_embeddings)
if modality == "videos":
video_input = modalities["videos"]
video_embeddings = self._process_video_input(video_input)
multimodal_embeddings += video_embeddings
multimodal_embeddings += tuple(video_embeddings)

return multimodal_embeddings

Expand Down
4 changes: 2 additions & 2 deletions vllm/model_executor/models/nemotron_vl.py
Original file line number Diff line number Diff line change
Expand Up @@ -575,8 +575,8 @@ def get_multimodal_embeddings(self, **kwargs: object) -> MultiModalEmbeddings:
for modality in modalities:
if modality == "images":
image_input = modalities["images"]
vision_embeddings = self._process_image_input(image_input)
multimodal_embeddings += vision_embeddings
image_embeddings = self._process_image_input(image_input)
multimodal_embeddings += tuple(image_embeddings)

return multimodal_embeddings

Expand Down
6 changes: 3 additions & 3 deletions vllm/model_executor/models/ovis2_5.py
Original file line number Diff line number Diff line change
Expand Up @@ -616,12 +616,12 @@ def get_multimodal_embeddings(self, **kwargs: object) -> MultiModalEmbeddings:
for modality in modalities:
if modality == "images":
image_input = modalities["images"]
vision_embeddings = self._process_visual_input(image_input)
multimodal_embeddings += vision_embeddings
image_embeddings = self._process_visual_input(image_input)
multimodal_embeddings += tuple(image_embeddings)
if modality == "videos":
video_input = modalities["videos"]
video_embeddings = self._process_visual_input(video_input)
multimodal_embeddings += video_embeddings
multimodal_embeddings += tuple(video_embeddings)

return multimodal_embeddings

Expand Down
4 changes: 2 additions & 2 deletions vllm/model_executor/models/phi4_multimodal.py
Original file line number Diff line number Diff line change
Expand Up @@ -1430,8 +1430,8 @@ def get_multimodal_embeddings(self, **kwargs: object) -> MultiModalEmbeddings:
if modality == "images":
audio_projection_mode = "vision"
image_input = modalities["images"]
vision_embeddings = self._process_image_input(image_input)
multimodal_embeddings += tuple(vision_embeddings)
image_embeddings = self._process_image_input(image_input)
multimodal_embeddings += tuple(image_embeddings)
if modality == "audios":
audio_input = modalities["audios"]
audio_embeddings = self._process_audio_input(
Expand Down
4 changes: 2 additions & 2 deletions vllm/model_executor/models/phi4mm.py
Original file line number Diff line number Diff line change
Expand Up @@ -1248,8 +1248,8 @@ def get_multimodal_embeddings(self, **kwargs: object) -> MultiModalEmbeddings:
if modality == "images":
audio_projection_mode = "vision"
image_input = modalities["images"]
vision_embeddings = self._process_image_input(image_input)
multimodal_embeddings += tuple(vision_embeddings)
image_embeddings = self._process_image_input(image_input)
multimodal_embeddings += tuple(image_embeddings)
if modality == "audios":
audio_input = modalities["audios"]
audio_embeddings = self._process_audio_input(
Expand Down
8 changes: 4 additions & 4 deletions vllm/model_executor/models/qwen2_5_omni_thinker.py
Original file line number Diff line number Diff line change
Expand Up @@ -1210,14 +1210,14 @@ def get_multimodal_embeddings(self, **kwargs: object) -> MultiModalEmbeddings:
for modality in mm_input_by_modality:
multimodal_input = mm_input_by_modality[modality]
if modality == "image":
vision_embeddings = self._process_image_input(multimodal_input)
multimodal_embeddings += vision_embeddings
image_embeddings = self._process_image_input(multimodal_input)
multimodal_embeddings += tuple(image_embeddings)
if modality == "video":
video_embeddings = self._process_video_input(multimodal_input)
multimodal_embeddings += video_embeddings
multimodal_embeddings += tuple(video_embeddings)
if modality == "audio":
audio_embeddings = self._process_audio_input(multimodal_input)
multimodal_embeddings += audio_embeddings
multimodal_embeddings += tuple(audio_embeddings)
return multimodal_embeddings

# TODO (ywang96): support overlapping modality embeddings so that
Expand Down
10 changes: 5 additions & 5 deletions vllm/model_executor/models/qwen2_5_vl.py
Original file line number Diff line number Diff line change
Expand Up @@ -1586,19 +1586,19 @@ def get_multimodal_embeddings(self, **kwargs: object) -> MultiModalEmbeddings:
for modality in mm_input_by_modality:
multimodal_input = mm_input_by_modality[modality]
if modality == "image":
vision_embeddings = self._process_image_input(multimodal_input)
image_embeddings = self._process_image_input(multimodal_input)
if self.is_multimodal_pruning_enabled:
vision_embeddings = self._postprocess_image_embeds_evs(
vision_embeddings, multimodal_input
image_embeddings = self._postprocess_image_embeds_evs(
image_embeddings, multimodal_input
)
multimodal_embeddings += vision_embeddings
multimodal_embeddings += tuple(image_embeddings)
if modality == "video":
video_embeddings = self._process_video_input(multimodal_input)
if self.is_multimodal_pruning_enabled:
video_embeddings = self._postprocess_video_embeds_evs(
video_embeddings, multimodal_input
)
multimodal_embeddings += video_embeddings
multimodal_embeddings += tuple(video_embeddings)
return multimodal_embeddings

def forward(
Expand Down
6 changes: 3 additions & 3 deletions vllm/model_executor/models/qwen2_vl.py
Original file line number Diff line number Diff line change
Expand Up @@ -1561,12 +1561,12 @@ def get_multimodal_embeddings(self, **kwargs: object) -> MultiModalEmbeddings:
for modality in modalities:
if modality == "images":
image_input = modalities["images"]
vision_embeddings = self._process_image_input(image_input)
multimodal_embeddings += vision_embeddings
image_embeddings = self._process_image_input(image_input)
multimodal_embeddings += tuple(image_embeddings)
if modality == "videos":
video_input = modalities["videos"]
video_embeddings = self._process_video_input(video_input)
multimodal_embeddings += video_embeddings
multimodal_embeddings += tuple(video_embeddings)

return multimodal_embeddings

Expand Down
8 changes: 4 additions & 4 deletions vllm/model_executor/models/qwen3_omni_moe_thinker.py
Original file line number Diff line number Diff line change
Expand Up @@ -1260,14 +1260,14 @@ def get_multimodal_embeddings(
for modality in mm_input_by_modality:
multimodal_input = mm_input_by_modality[modality]
if modality == "image":
vision_embeddings = self._process_image_input(multimodal_input)
multimodal_embeddings += vision_embeddings
image_embeddings = self._process_image_input(multimodal_input)
multimodal_embeddings += tuple(image_embeddings)
if modality == "video":
video_embeddings = self._process_video_input(multimodal_input)
multimodal_embeddings += video_embeddings
multimodal_embeddings += tuple(video_embeddings)
if modality == "audio":
audio_embeddings = self._process_audio_input(multimodal_input)
multimodal_embeddings += audio_embeddings
multimodal_embeddings += tuple(audio_embeddings)
return multimodal_embeddings

def get_input_embeddings(
Expand Down
6 changes: 3 additions & 3 deletions vllm/model_executor/models/qwen3_vl.py
Original file line number Diff line number Diff line change
Expand Up @@ -1601,11 +1601,11 @@ def get_multimodal_embeddings(
for modality in mm_input_by_modality:
multimodal_input = mm_input_by_modality[modality]
if modality == "image":
vision_embeddings = self._process_image_input(multimodal_input)
multimodal_embeddings += vision_embeddings
image_embeddings = self._process_image_input(multimodal_input)
multimodal_embeddings += tuple(image_embeddings)
if modality == "video":
video_embeddings = self._process_video_input(multimodal_input)
multimodal_embeddings += video_embeddings
multimodal_embeddings += tuple(video_embeddings)
return multimodal_embeddings

def _compute_deepstack_embeds(
Expand Down
Loading