From 4a6bf3c77f05b398b46fe4207ea1ee715d56c64f Mon Sep 17 00:00:00 2001 From: Carl Persson Date: Sat, 4 Jul 2026 22:59:51 +0200 Subject: [PATCH] [ROCm][CI] Fix Kernels and Kernels attention test failures (#47519) Signed-off-by: Carl Persson --- .../attention/test_rocm_aiter_mla_decode_metadata.py | 2 +- tests/kernels/moe/test_ocp_mx_moe.py | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tests/kernels/attention/test_rocm_aiter_mla_decode_metadata.py b/tests/kernels/attention/test_rocm_aiter_mla_decode_metadata.py index 99b4a0e19e..2b9a4e823c 100644 --- a/tests/kernels/attention/test_rocm_aiter_mla_decode_metadata.py +++ b/tests/kernels/attention/test_rocm_aiter_mla_decode_metadata.py @@ -113,7 +113,7 @@ def _build_decode_metadata(): # stub with the attribute is enough for metadata construction. layer_name = "placeholder" vllm_config.compilation_config.static_forward_context[layer_name] = ( - types.SimpleNamespace(prefill_backend=None) + types.SimpleNamespace(prefill_backend=torch.empty((1,))) ) init_workspace_manager(device) diff --git a/tests/kernels/moe/test_ocp_mx_moe.py b/tests/kernels/moe/test_ocp_mx_moe.py index 8c620afbc8..d6eb488a64 100644 --- a/tests/kernels/moe/test_ocp_mx_moe.py +++ b/tests/kernels/moe/test_ocp_mx_moe.py @@ -2,6 +2,7 @@ # SPDX-FileCopyrightText: Copyright contributors to the vLLM project import importlib.metadata +import types from dataclasses import dataclass from importlib.util import find_spec @@ -10,7 +11,7 @@ import torch from packaging import version from tests.kernels.moe.utils import check_accuracy -from vllm._aiter_ops import is_aiter_found +from vllm._aiter_ops import is_aiter_found, rocm_aiter_ops from vllm.platforms import current_platform from vllm.utils.flashinfer import has_flashinfer @@ -1247,6 +1248,7 @@ def test_rocm_mxfp4_moe_oracle( num_tokens: int, hidden_size: int, intermediate_size: int, + monkeypatch: pytest.MonkeyPatch, ): """ Test ROCm MXFP4 MoE using oracle functions. @@ -1268,6 +1270,7 @@ def test_rocm_mxfp4_moe_oracle( if config["requires_gfx950"] and not ROCM_GFX950: pytest.skip(f"Backend {backend_name} requires GFX950") + import vllm.distributed.parallel_state as ps from vllm.config import VllmConfig, set_current_vllm_config from vllm.model_executor.layers.fused_moe.activation import MoEActivation from vllm.model_executor.layers.fused_moe.oracle.mxfp4 import ( @@ -1282,6 +1285,12 @@ def test_rocm_mxfp4_moe_oracle( # Initialize workspace manager (needed for modular kernels) init_workspace_manager(torch.accelerator.current_device_index()) + # Set up the TP Group to prevent failure on should_use_cdna4_mx_scale_swizzle check + monkeypatch.setattr(ps, "_TP", types.SimpleNamespace(world_size=1)) + + # AITER must be enabled or aiter_mxfp4_w4a8_moe asserts before dispatch. + monkeypatch.setattr(rocm_aiter_ops, "_AITER_ENABLED", True) + # Map string to enum backend = Mxfp4MoeBackend[backend_name]