mirror of
https://git.datalinker.icu/vllm-project/vllm.git
synced 2026-05-14 22:44:32 +08:00
[ROCm] Fix for import when building with upstream triton for gfx1100 for gpt-oss serving (#29127)
Signed-off-by: Hongxia Yang <hongxia.yang@amd.com>
This commit is contained in:
parent
e1eefa4c40
commit
3f5f36da3f
@ -39,15 +39,15 @@ def _swizzle_mxfp4(quant_tensor, scale, num_warps):
|
|||||||
value_layout = StridedLayout
|
value_layout = StridedLayout
|
||||||
scale_layout = StridedLayout
|
scale_layout = StridedLayout
|
||||||
elif current_platform.is_rocm():
|
elif current_platform.is_rocm():
|
||||||
from triton_kernels.tensor_details.layout import (
|
|
||||||
GFX950MXScaleLayout,
|
|
||||||
StridedLayout,
|
|
||||||
)
|
|
||||||
|
|
||||||
from vllm.platforms.rocm import on_gfx950
|
from vllm.platforms.rocm import on_gfx950
|
||||||
|
|
||||||
value_layout = StridedLayout
|
value_layout = StridedLayout
|
||||||
scale_layout = GFX950MXScaleLayout if on_gfx950() else StridedLayout
|
if on_gfx950():
|
||||||
|
from triton_kernels.tensor_details.layout import GFX950MXScaleLayout
|
||||||
|
|
||||||
|
scale_layout = GFX950MXScaleLayout
|
||||||
|
else:
|
||||||
|
scale_layout = StridedLayout
|
||||||
else:
|
else:
|
||||||
value_layout, value_layout_opts = layout.make_default_matmul_mxfp4_w_layout(
|
value_layout, value_layout_opts = layout.make_default_matmul_mxfp4_w_layout(
|
||||||
mx_axis=1
|
mx_axis=1
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user