Merge branch 'main' into patches

This commit is contained in:
2026-10-05 08:21:46 +00:00
23 changed files with 1102 additions and 247 deletions
@@ -455,6 +455,31 @@ def test_per_head_quant_scales_backend_selection(
assert backend_name in str(exc_info.value)
@pytest.mark.skipif(
CudaPlatform is None, reason="CUDA platform is required for this test"
)
@pytest.mark.parametrize("head_size", [64, 80, 96, 128, 192, 256])
def test_int4_per_token_head_head_size_selection(head_size: int):
"""INT4 per-token-head KV cache is selectable at any even head size.
The Hadamard rotation the INT4 write path applies is now defined for
non-power-of-two rows as well (it runs block-diagonally, see
``fast_hadamard_transform``), so a model such as Phi-3 (head_size=96) must
keep selecting TRITON_ATTN instead of being rejected.
"""
vllm_config = VllmConfig(cache_config=CacheConfig(block_size=64))
with (
set_current_vllm_config(vllm_config),
patch("vllm.platforms.current_platform", CudaPlatform()),
):
backend = get_attn_backend(
head_size=head_size,
dtype=torch.float16,
kv_cache_dtype="int4_per_token_head",
)
assert backend.get_name() == "TRITON_ATTN"
@pytest.mark.parametrize(
"backend_name,use_non_causal,should_succeed",
[
+12 -6
View File
@@ -713,8 +713,8 @@ def test_low_latency_table_capability_routing(
def test_qwen4_exp_hopper_plans_are_valid() -> None:
plans = qwen4_exp_gemm.QWEN4_EXP_SM90_GEMM_PLANS
assert len(plans) == 9
assert sum(map(len, plans.values())) == 31
assert len(plans) == 7
assert sum(map(len, plans.values())) == 24
assert (320, 10240) in plans
assert (10240, 320) not in plans
for (n, k), shape_plans in plans.items():
@@ -728,10 +728,11 @@ def test_qwen4_exp_hopper_plans_are_valid() -> None:
@pytest.mark.parametrize(
"capability,expected_plans",
[
((10, 3), qwen4_exp_gemm.QWEN4_EXP_GEMM_PLANS),
((10, 3), qwen4_exp_gemm.QWEN4_EXP_SM103_GEMM_PLANS),
((10, 0), qwen4_exp_gemm.QWEN4_EXP_SM100_GEMM_PLANS),
((9, 0), qwen4_exp_gemm.QWEN4_EXP_SM90_GEMM_PLANS),
((12, 1), qwen4_exp_gemm.QWEN4_EXP_SM121_GEMM_PLANS),
((12, 0), {}),
((8, 0), {}),
],
)
@@ -742,11 +743,16 @@ def test_qwen4_exp_gemm_capability_routing(
) -> None:
monkeypatch.setattr(
qwen4_exp_gemm.current_platform,
"is_device_capability",
lambda target: capability == target,
"get_device_capability",
lambda: capability,
)
assert qwen4_exp_gemm._gemm_plans() == expected_plans
assert (
qwen4_exp_gemm.QWEN4_EXP_GEMM_PLANS_BY_CAPABILITY.get(
qwen4_exp_gemm.current_platform.get_device_capability(), {}
)
== expected_plans
)
def test_installation_is_shape_specific_and_unquantized(