Skip to content

[ROCm] Use supports_fp8() for FP8 feature gates instead of arch checks #34740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
laudney wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −35
Open

[ROCm] Use supports_fp8() for FP8 feature gates instead of arch checks #34740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions vllm/model_executor/kernels/linear/scaled_mm/pytorch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,8 @@ def is_supported(
if not current_platform.is_rocm():
return False, "requires ROCm."

from vllm.platforms.rocm import on_mi3xx

if not on_mi3xx():
return False, "requires MI3xx."

if compute_capability is not None and compute_capability < 94:
return False, "requires compute capability 94 and above."
if not current_platform.supports_fp8():
return False, "requires FP8-capable GPU."

return True, None

Expand Down
6 changes: 2 additions & 4 deletions vllm/model_executor/kernels/linear/scaled_mm/rocm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,8 @@ def is_supported(
if not current_platform.is_rocm():
return False, "requires ROCm."

from vllm.platforms.rocm import on_mi3xx

if not on_mi3xx():
return False, "requires MI3xx."
if not current_platform.supports_fp8():
return False, "requires FP8-capable GPU."

if not envs.VLLM_ROCM_USE_SKINNY_GEMM:
return False, "requires VLLM_ROCM_USE_SKINNY_GEMM to be enabled."
Expand Down
12 changes: 1 addition & 11 deletions vllm/model_executor/layers/fused_moe/fused_batched_moe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,17 +916,7 @@ def _supports_quant_scheme(
weight_key: QuantKey | None,
activation_key: QuantKey | None,
) -> bool:
p = current_platform
if p.is_rocm():
from vllm.platforms.rocm import on_gfx9

is_rocm_on_gfx9 = on_gfx9()
else:
is_rocm_on_gfx9 = False

device_supports_fp8 = is_rocm_on_gfx9 or (
p.is_cuda() and p.has_device_capability((8, 9))
)
device_supports_fp8 = current_platform.supports_fp8()

SUPPORTED_W_A_FP8 = [
(kFp8Static128BlockSym, kFp8Dynamic128Sym),
Expand Down
14 changes: 1 addition & 13 deletions vllm/model_executor/layers/fused_moe/fused_moe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1921,19 +1921,7 @@ def _supports_quant_scheme(
weight_key: QuantKey | None,
activation_key: QuantKey | None,
) -> bool:
p = current_platform
if p.is_rocm():
from vllm.platforms.rocm import on_gfx9

is_rocm_on_gfx9 = on_gfx9()
else:
is_rocm_on_gfx9 = False

device_supports_fp8 = (
is_rocm_on_gfx9
or (p.is_cuda() and p.has_device_capability((8, 9)))
or p.is_xpu()
)
device_supports_fp8 = current_platform.supports_fp8()

if not device_supports_fp8:
return (weight_key, activation_key) == (None, None)
Expand Down
Loading