[Bugfix][R3] Unwrap UniformTypeKVCacheSpecs when selecting the routed-experts KV group (#53240)
Signed-off-by: Hollow Man <hollowman@opensuse.org>
This commit is contained in:
@@ -25,6 +25,9 @@ from vllm.v1.kv_cache_interface import (
|
||||
FullAttentionSpec,
|
||||
KVCacheConfig,
|
||||
KVCacheGroupSpec,
|
||||
MLAAttentionSpec,
|
||||
SlidingWindowMLASpec,
|
||||
UniformTypeKVCacheSpecs,
|
||||
)
|
||||
|
||||
pytestmark = pytest.mark.cpu_test
|
||||
@@ -321,15 +324,17 @@ def test_routed_experts_capturer_dp_unexpected_batch_raises():
|
||||
assert capturer.device_buffer[0, 0, 0].item() == -1
|
||||
|
||||
|
||||
def test_routed_experts_attention_group_is_shared_and_fail_closed(monkeypatch):
|
||||
class FullAttentionSpec:
|
||||
pass
|
||||
|
||||
monkeypatch.setattr(f"{_REC_MODULE}.FullAttentionSpec", FullAttentionSpec)
|
||||
def test_routed_experts_attention_group_is_shared_and_fail_closed():
|
||||
"""Both sides key routing data by this gid, so it must skip non-full-attention
|
||||
groups rather than defaulting to 0, and fail closed when none exists."""
|
||||
common = dict(num_kv_heads=1, head_size=1, dtype=torch.float32)
|
||||
config = SimpleNamespace(
|
||||
kv_cache_groups=[
|
||||
SimpleNamespace(kv_cache_spec=object()),
|
||||
SimpleNamespace(kv_cache_spec=FullAttentionSpec()),
|
||||
KVCacheGroupSpec(
|
||||
["swa_layer"],
|
||||
SlidingWindowMLASpec(block_size=4, sliding_window=8, **common),
|
||||
),
|
||||
KVCacheGroupSpec(["full_layer"], FullAttentionSpec(block_size=4, **common)),
|
||||
]
|
||||
)
|
||||
assert get_routed_experts_attn_gid(config) == 1
|
||||
@@ -338,6 +343,40 @@ def test_routed_experts_attention_group_is_shared_and_fail_closed(monkeypatch):
|
||||
get_routed_experts_attn_gid(SimpleNamespace(kv_cache_groups=[]))
|
||||
|
||||
|
||||
def test_routed_experts_attention_group_unwraps_uniform_type_specs():
|
||||
"""DeepSeek-V4-shaped groups wrap their specs in ``UniformTypeKVCacheSpecs``.
|
||||
|
||||
The wrapper is not a ``FullAttentionSpec``, so a bare isinstance check finds
|
||||
no group and fails closed on every worker. Unwrap semantics themselves are
|
||||
covered by ``test_is_full_attention_spec_*`` in tests/v1/core.
|
||||
"""
|
||||
common = dict(num_kv_heads=1, head_size=1, dtype=torch.float32)
|
||||
swa_spec = SlidingWindowMLASpec(block_size=4, sliding_window=8, **common)
|
||||
mla_spec = MLAAttentionSpec(block_size=4, **common)
|
||||
config = SimpleNamespace(
|
||||
kv_cache_groups=[
|
||||
KVCacheGroupSpec(
|
||||
["swa_layer"],
|
||||
UniformTypeKVCacheSpecs(
|
||||
block_size=4, kv_cache_specs={"swa_layer": swa_spec}
|
||||
),
|
||||
),
|
||||
KVCacheGroupSpec(
|
||||
["mla_layer"],
|
||||
UniformTypeKVCacheSpecs(
|
||||
block_size=4, kv_cache_specs={"mla_layer": mla_spec}
|
||||
),
|
||||
),
|
||||
]
|
||||
)
|
||||
|
||||
assert get_routed_experts_attn_gid(config) == 1
|
||||
|
||||
swa_only = SimpleNamespace(kv_cache_groups=[config.kv_cache_groups[0]])
|
||||
with pytest.raises(ValueError, match="requires a full-attention KV cache group"):
|
||||
get_routed_experts_attn_gid(swa_only)
|
||||
|
||||
|
||||
@pytest.mark.skipif(not torch.cuda.is_available(), reason="CUDA required")
|
||||
def test_mrv2_async_output_returns_existing_routed_experts_field():
|
||||
from vllm.v1.outputs import ModelRunnerOutput, RoutedExpertsTensors
|
||||
|
||||
Reference in New Issue
Block a user