mirror of
https://git.datalinker.icu/vllm-project/vllm.git
synced 2025-12-10 12:25:32 +08:00
Remove index_put from MM embeddings merging (#22105)
Co-authored-by: Chenxi Yang <cxyang@meta.com>
This commit is contained in:
parent
49bcd893e7
commit
e5949e5ae0
@ -418,17 +418,23 @@ def _merge_multimodal_embeddings(
|
|||||||
Note:
|
Note:
|
||||||
This updates ``inputs_embeds`` in place.
|
This updates ``inputs_embeds`` in place.
|
||||||
"""
|
"""
|
||||||
num_expected_tokens = is_multimodal.sum().item()
|
|
||||||
assert isinstance(num_expected_tokens, int)
|
|
||||||
|
|
||||||
flattened = _flatten_embeddings(multimodal_embeddings)
|
flattened = _flatten_embeddings(multimodal_embeddings)
|
||||||
if flattened.shape[0] != num_expected_tokens:
|
try:
|
||||||
expr = _embedding_count_expression(multimodal_embeddings)
|
# This is equivalent to: inputs_embeds[is_multimodal] = flattened.
|
||||||
raise ValueError(
|
inputs_embeds.masked_scatter_(is_multimodal.unsqueeze(-1), flattened)
|
||||||
f"Attempted to assign {expr} = {flattened.shape[0]} "
|
except RuntimeError as e:
|
||||||
f"multimodal tokens to {num_expected_tokens} placeholders")
|
num_expected_tokens = is_multimodal.sum().item()
|
||||||
|
assert isinstance(num_expected_tokens, int)
|
||||||
|
|
||||||
|
if flattened.shape[0] != num_expected_tokens:
|
||||||
|
expr = _embedding_count_expression(multimodal_embeddings)
|
||||||
|
raise ValueError(
|
||||||
|
f"Attempted to assign {expr} = {flattened.shape[0]} "
|
||||||
|
f"multimodal tokens to {num_expected_tokens} placeholders"
|
||||||
|
) from e
|
||||||
|
else:
|
||||||
|
raise ValueError("Error during masked scatter operation") from e
|
||||||
|
|
||||||
inputs_embeds[is_multimodal] = flattened
|
|
||||||
return inputs_embeds
|
return inputs_embeds
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user