Skip to content

Commit d1e6d95

Browse files
committed
v0 backward compatibility
Signed-off-by: Isotr0py <2037008807@qq.com>
1 parent 6ef7b35 commit d1e6d95

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

vllm/model_executor/models/transformers.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,17 @@ def forward(
821821
positions: torch.Tensor,
822822
intermediate_tensors: Optional[IntermediateTensors] = None,
823823
inputs_embeds: Optional[torch.Tensor] = None,
824+
**kwargs: object,
824825
) -> Union[torch.Tensor, IntermediateTensors]:
826+
# NOTE: In v1, inputs_embeds is always generated at model runner from
827+
# `get_multimodal_embeddings` and `get_input_embeddings`, this
828+
# condition is only for v0 compatibility.
829+
if inputs_embeds is None:
830+
multimodal_embeds = self.get_multimodal_embeddings(**kwargs)
831+
if multimodal_embeds is not None:
832+
inputs_embeds = self.get_input_embeddings(input_ids, multimodal_embeds)
833+
input_ids = None
834+
825835
model_output = self.model(input_ids, positions, intermediate_tensors,
826836
inputs_embeds)
827837
return model_output
@@ -850,11 +860,11 @@ def get_multimodal_embeddings(self, **kwargs):
850860
pixel_values = pixel_values if pixel_values is not None else kwargs.pop(
851861
"image_patches", None)
852862
image_embeds = kwargs.pop("image_embeds", None)
853-
num_image_patches = kwargs.pop("num_image_patches")
854863

855864
if pixel_values is None and image_embeds is None:
856865
return None
857866

867+
num_image_patches = kwargs.pop("num_image_patches")
858868
if pixel_values is not None:
859869
if isinstance(pixel_values, torch.Tensor):
860870
pixel_values = pixel_values.flatten(0, 1).to(self.dtype)

0 commit comments

Comments
 (0)