[Core] Skip broadcasting mm tensor data to workers for prefix-cache-covered items (#52041)
Signed-off-by: Xiaoan (Sean) Liu <shawnliu0327@gmail.com> Signed-off-by: Nick Hill <nickhill123@gmail.com> Co-authored-by: Nick Hill <nickhill123@gmail.com>
This commit is contained in:
co-authored by
Nick Hill
parent
2b7fcbf527
commit
db92053e97
@@ -2,6 +2,14 @@
|
||||
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
|
||||
import torch
|
||||
|
||||
from vllm.multimodal.inputs import (
|
||||
MultiModalBatchedField,
|
||||
MultiModalFeatureSpec,
|
||||
MultiModalFieldElem,
|
||||
MultiModalKwargsItem,
|
||||
PlaceholderRange,
|
||||
)
|
||||
from vllm.multimodal.utils import strip_covered_mm_data
|
||||
from vllm.v1.core.sched.output import NewRequestData
|
||||
|
||||
|
||||
@@ -34,3 +42,82 @@ def test_repr_with_multi_element_tensor() -> None:
|
||||
|
||||
assert "prompt_embeds_shape=torch.Size([10, 768])" in repr(new_requests_data)
|
||||
assert "prompt_embeds_shape=torch.Size([10, 768])" in new_requests_data.anon_repr()
|
||||
|
||||
|
||||
def _mm_feature(offset: int, length: int) -> MultiModalFeatureSpec:
|
||||
return MultiModalFeatureSpec(
|
||||
data=MultiModalKwargsItem.dummy(),
|
||||
mm_position=PlaceholderRange(offset=offset, length=length),
|
||||
identifier=f"hash_{offset}",
|
||||
modality="image",
|
||||
)
|
||||
|
||||
|
||||
def test_strip_covered_mm_data() -> None:
|
||||
"""Items fully inside the computed prefix lose their data; items touching
|
||||
the uncomputed region keep it; already-None data stays None."""
|
||||
from dataclasses import replace
|
||||
|
||||
covered = _mm_feature(offset=0, length=100)
|
||||
boundary = _mm_feature(offset=150, length=100) # ends exactly at 250
|
||||
uncovered = _mm_feature(offset=300, length=100)
|
||||
already_none = replace(_mm_feature(offset=100, length=50), data=None)
|
||||
|
||||
stripped = strip_covered_mm_data(
|
||||
[covered, boundary, uncovered, already_none], num_computed_tokens=250
|
||||
)
|
||||
|
||||
assert stripped[0].data is None # fully covered -> stripped
|
||||
assert stripped[1].data is None # span end == computed -> covered -> stripped
|
||||
assert stripped[2].data is not None # extends past prefix -> kept
|
||||
assert stripped[3].data is None # was already None
|
||||
# non-data fields are preserved
|
||||
assert stripped[0].identifier == covered.identifier
|
||||
assert stripped[0].mm_position == covered.mm_position
|
||||
# original list is not mutated
|
||||
assert covered.data is not None
|
||||
|
||||
|
||||
def test_strip_covered_mm_data_zero_computed() -> None:
|
||||
"""With no prefix hit nothing is stripped."""
|
||||
features = [_mm_feature(offset=0, length=100)]
|
||||
stripped = strip_covered_mm_data(features, num_computed_tokens=0)
|
||||
assert stripped[0].data is not None
|
||||
|
||||
|
||||
def _mm_feature_mixed(offset: int, length: int) -> MultiModalFeatureSpec:
|
||||
data = MultiModalKwargsItem(
|
||||
{
|
||||
"pixel_values": MultiModalFieldElem(
|
||||
data=torch.empty(4), field=MultiModalBatchedField()
|
||||
),
|
||||
"image_grid_thw": MultiModalFieldElem(
|
||||
data=torch.ones(1, 3, dtype=torch.long),
|
||||
field=MultiModalBatchedField(keep_on_cpu=True),
|
||||
),
|
||||
}
|
||||
)
|
||||
return MultiModalFeatureSpec(
|
||||
data=data,
|
||||
mm_position=PlaceholderRange(offset=offset, length=length),
|
||||
identifier=f"hash_{offset}",
|
||||
modality="image",
|
||||
)
|
||||
|
||||
|
||||
def test_strip_covered_mm_data_mrope() -> None:
|
||||
"""For M-RoPE models, covered items keep their keep_on_cpu metadata fields
|
||||
(the worker needs them to compute positions); payload fields are dropped."""
|
||||
covered = _mm_feature_mixed(offset=0, length=100)
|
||||
uncovered = _mm_feature_mixed(offset=300, length=100)
|
||||
|
||||
stripped = strip_covered_mm_data(
|
||||
[covered, uncovered], num_computed_tokens=250, uses_mrope=True
|
||||
)
|
||||
|
||||
assert stripped[0].data is not None
|
||||
assert list(stripped[0].data.keys()) == ["image_grid_thw"]
|
||||
assert stripped[1].data is not None
|
||||
assert set(stripped[1].data.keys()) == {"pixel_values", "image_grid_thw"}
|
||||
# original list is not mutated
|
||||
assert set(covered.data.keys()) == {"pixel_values", "image_grid_thw"}
|
||||
|
||||
Reference in New Issue
Block a user