[ROCm][Kimi-K3] Make VLLM_ROCM_USE_AITER_MOE_SITUV2 select a4w4/a8w4/a16w4 (#58201)
Signed-off-by: Hongxia Yang <hongxia.yang@amd.com>
This commit is contained in:
@@ -566,72 +566,64 @@ def test_aiter_moe_shared_experts_enablement_follows_env(
|
||||
assert rocm_aiter_ops.is_fusion_moe_shared_experts_enabled() is expected
|
||||
|
||||
|
||||
def test_aiter_moe_situv2_syncs_aiter_a4w4_env(
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
):
|
||||
"""SiTUv2 MoE should route to AITER a4w4 and clear legacy a8w4 overrides."""
|
||||
from vllm._aiter_ops import rocm_aiter_ops
|
||||
|
||||
_assert_aiter_supported()
|
||||
|
||||
with monkeypatch.context() as mp:
|
||||
mp.delenv("AITER_SITUV2_A8W4", raising=False)
|
||||
mp.delenv("AITER_SITUV2_A4W4", raising=False)
|
||||
mp.setenv("VLLM_ROCM_USE_AITER", "1")
|
||||
mp.setenv("VLLM_ROCM_USE_AITER_MOE", "1")
|
||||
mp.setenv("VLLM_ROCM_USE_AITER_MOE_SITUV2", "1")
|
||||
_reload_envs()
|
||||
rocm_aiter_ops.refresh_env_variables()
|
||||
|
||||
import os
|
||||
|
||||
assert os.environ.get("AITER_SITUV2_A4W4") == "1"
|
||||
assert "AITER_SITUV2_A8W4" not in os.environ
|
||||
|
||||
|
||||
def test_aiter_moe_situv2_legacy_a8w4_alias_enables_a4w4(
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
):
|
||||
"""Deprecated VLLM_ROCM_USE_AITER_MOE_SITUV2_A8W4 still enables SiTUv2 a4w4."""
|
||||
from vllm._aiter_ops import rocm_aiter_ops
|
||||
|
||||
_assert_aiter_supported()
|
||||
|
||||
with monkeypatch.context() as mp:
|
||||
mp.delenv("AITER_SITUV2_A8W4", raising=False)
|
||||
mp.delenv("AITER_SITUV2_A4W4", raising=False)
|
||||
mp.delenv("VLLM_ROCM_USE_AITER_MOE_SITUV2", raising=False)
|
||||
mp.setenv("VLLM_ROCM_USE_AITER", "1")
|
||||
mp.setenv("VLLM_ROCM_USE_AITER_MOE", "1")
|
||||
mp.setenv("VLLM_ROCM_USE_AITER_MOE_SITUV2_A8W4", "1")
|
||||
_reload_envs()
|
||||
rocm_aiter_ops.refresh_env_variables()
|
||||
|
||||
import os
|
||||
|
||||
assert os.environ.get("AITER_SITUV2_A4W4") == "1"
|
||||
assert "AITER_SITUV2_A8W4" not in os.environ
|
||||
|
||||
|
||||
def test_aiter_moe_situv2_clears_aiter_env_when_disabled(
|
||||
@pytest.mark.parametrize(
|
||||
"value,expected_act,expected_env",
|
||||
[
|
||||
# Unset / auto / legacy "1" all mean the a4w4 default.
|
||||
(None, "a4w4", {"AITER_SITUV2_A4W4": "1"}),
|
||||
("auto", "a4w4", {"AITER_SITUV2_A4W4": "1"}),
|
||||
("1", "a4w4", {"AITER_SITUV2_A4W4": "1"}),
|
||||
("a4w4", "a4w4", {"AITER_SITUV2_A4W4": "1"}),
|
||||
("0", "a16w4", {}),
|
||||
("a16w4", "a16w4", {}),
|
||||
("A8W4", "a8w4", {"AITER_SITUV2_A8W4": "1"}),
|
||||
],
|
||||
)
|
||||
def test_aiter_moe_situv2_activation_syncs_aiter_env(
|
||||
value: str | None,
|
||||
expected_act: str,
|
||||
expected_env: dict[str, str],
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
):
|
||||
"""Each SiTUv2 activation choice sets exactly its AITER dispatch env."""
|
||||
import os
|
||||
|
||||
from vllm._aiter_ops import rocm_aiter_ops
|
||||
|
||||
_assert_aiter_supported()
|
||||
|
||||
with monkeypatch.context() as mp:
|
||||
# Stale AITER overrides must be replaced by the vLLM selection.
|
||||
mp.setenv("AITER_SITUV2_A8W4", "1")
|
||||
mp.setenv("AITER_SITUV2_A4W4", "1")
|
||||
mp.setenv("VLLM_ROCM_USE_AITER", "1")
|
||||
mp.setenv("VLLM_ROCM_USE_AITER_MOE", "1")
|
||||
mp.delenv("VLLM_ROCM_USE_AITER_MOE_SITUV2_A8W4", raising=False)
|
||||
mp.setenv("VLLM_ROCM_USE_AITER_MOE_SITUV2", "0")
|
||||
if value is None:
|
||||
mp.delenv("VLLM_ROCM_USE_AITER_MOE_SITUV2", raising=False)
|
||||
else:
|
||||
mp.setenv("VLLM_ROCM_USE_AITER_MOE_SITUV2", value)
|
||||
_reload_envs()
|
||||
rocm_aiter_ops.refresh_env_variables()
|
||||
|
||||
import os
|
||||
assert rocm_aiter_ops.get_fused_moe_situv2_activation() == expected_act
|
||||
assert rocm_aiter_ops.is_fused_moe_situv2_gate_up_interleaved() is (
|
||||
expected_act == "a8w4"
|
||||
)
|
||||
assert rocm_aiter_ops.is_fused_moe_situv2_enabled() is (expected_act != "a16w4")
|
||||
for name in ("AITER_SITUV2_A8W4", "AITER_SITUV2_A4W4"):
|
||||
assert os.environ.get(name) == expected_env.get(name)
|
||||
|
||||
assert "AITER_SITUV2_A4W4" not in os.environ
|
||||
|
||||
def test_aiter_moe_situv2_rejects_unknown_activation(
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
):
|
||||
with monkeypatch.context() as mp:
|
||||
mp.setenv("VLLM_ROCM_USE_AITER_MOE_SITUV2", "a8w8")
|
||||
_reload_envs()
|
||||
import vllm.envs as envs
|
||||
|
||||
with pytest.raises(ValueError, match="VLLM_ROCM_USE_AITER_MOE_SITUV2"):
|
||||
_ = envs.VLLM_ROCM_USE_AITER_MOE_SITUV2
|
||||
|
||||
|
||||
@pytest.mark.parametrize("moe_padding", [True, False])
|
||||
|
||||
Reference in New Issue
Block a user