Skip to content
Merged
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
14 changes: 12 additions & 2 deletions vllm/model_executor/models/transformers/multimodal.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ def apply(
if "mm_token_type_ids" in processed_data
else "token_type_ids"
)
mm_token_type_ids = processed_data.pop(token_type_key)
mm_token_type_ids = processed_data.get(token_type_key)

# We can infer vLLM style placeholder from token type ids, if we split
# it for each input `mm_data`.
Expand Down Expand Up @@ -353,6 +353,7 @@ def embed_multimodal(self, **kwargs):

num_image_patches = kwargs.pop("num_image_patches")
kwargs.pop("token_type_ids", None) # used only in `forward`
kwargs.pop("mm_token_type_ids", None) # used only in `model.get_rope_index`

if pixel_values is not None:
# ROCm: Force math SDP backend for vision encoder to avoid accuracy issues
Expand Down Expand Up @@ -443,6 +444,7 @@ def get_mrope_input_positions(
{
"image_grid_thw",
"video_grid_thw",
"mm_token_type_ids",
"second_per_grid_ts",
"audio_feature_lengths",
"use_audio_in_video",
Expand All @@ -451,14 +453,15 @@ def get_mrope_input_positions(
if any(
v
for k, v in kwargs.items()
if k not in {"image_grid_thw", "video_grid_thw"}
if k not in {"image_grid_thw", "mm_token_type_ids"}
):
raise NotImplementedError(
"Transformers modeling backend only supports images."
)

image_grid_thw = kwargs.get("image_grid_thw", [])
video_grid_thw = kwargs.get("video_grid_thw", [])
mm_token_type_ids = kwargs.get("mm_token_type_ids")

image_grid_thw = (torch.stack if image_grid_thw else torch.tensor)(
image_grid_thw
Expand All @@ -467,10 +470,17 @@ def get_mrope_input_positions(
video_grid_thw
)

# In v4 `get_rope_index` doesn't have wildcard `kwargs`, and
# can't accept arbitrary args, even if its value is `None`
kwargs = {}
if mm_token_type_ids:
kwargs["mm_token_type_ids"] = torch.cat(mm_token_type_ids)

mrope_positions, mrope_position_delta = self.model.get_rope_index(
input_ids=torch.tensor(input_tokens).unsqueeze(0),
image_grid_thw=image_grid_thw,
video_grid_thw=video_grid_thw,
**kwargs,
)

mrope_positions = mrope_positions[:, 0]
Expand Down