From b8665383dfda143f02378833326689cd79a1f1b3 Mon Sep 17 00:00:00 2001 From: Gregory Shtrasberg <156009573+gshtras@users.noreply.github.com> Date: Fri, 27 Mar 2026 13:00:57 -0500 Subject: [PATCH] [ROCm] Fix GPT-OSS import for triton 3.6 (#37453) Signed-off-by: Gregory Shtrasberg --- .../layers/quantization/utils/mxfp4_utils.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/vllm/model_executor/layers/quantization/utils/mxfp4_utils.py b/vllm/model_executor/layers/quantization/utils/mxfp4_utils.py index 40b26528bc..21c8aba1d5 100644 --- a/vllm/model_executor/layers/quantization/utils/mxfp4_utils.py +++ b/vllm/model_executor/layers/quantization/utils/mxfp4_utils.py @@ -48,9 +48,16 @@ def _swizzle_mxfp4(quant_tensor, scale, num_warps=8): value_layout = StridedLayout if on_gfx950(): - from triton_kernels.tensor_details.layout import GFX950MXScaleLayout + try: + # triton < 3.6 + from triton_kernels.tensor_details.layout import GFX950MXScaleLayout - scale_layout = GFX950MXScaleLayout + scale_layout = GFX950MXScaleLayout + except ImportError: + # triton >= 3.6 + from triton_kernels.tensor_details.layout import CDNA4MXScaleLayout + + scale_layout = CDNA4MXScaleLayout else: scale_layout = StridedLayout else: