[ROCm][DSv4.1] Disambiguate ROCm attention class names (#58689)
Signed-off-by: Tuukka Sarvi <tuukka.sarvi@amd.com> Co-authored-by: Shanshan Shen <467638484@qq.com> Co-authored-by: Kevin H. Luu <khluu000@gmail.com>
This commit is contained in:
co-authored by
Shanshan Shen
Kevin H. Luu
parent
1463501553
commit
0951fc183c
@@ -141,12 +141,20 @@ class DeepseekV4MoE(DeepseekV4MoEBase):
|
||||
def _select_dsv4_attn_cls(vllm_config: VllmConfig) -> type[DeepseekV4Attention]:
|
||||
"""Pick the ROCm sparse-MLA implementation for DeepSeek V4.1."""
|
||||
backend = vllm_config.attention_config.backend
|
||||
if backend is not None and (
|
||||
backend is not AttentionBackendEnum.ROCM_FLASHMLA_SPARSE_DSV4
|
||||
if backend is not None and backend not in (
|
||||
AttentionBackendEnum.ROCM_FLASHMLA_SPARSE_DSV4,
|
||||
AttentionBackendEnum.ROCM_FLASHMLA_SPARSE_DSV41,
|
||||
):
|
||||
raise ValueError(
|
||||
f"{backend.name} is not supported for DeepSeek V4.1 on ROCm; "
|
||||
"use ROCM_FLASHMLA_SPARSE_DSV4."
|
||||
"use ROCM_FLASHMLA_SPARSE_DSV41."
|
||||
)
|
||||
if backend is AttentionBackendEnum.ROCM_FLASHMLA_SPARSE_DSV4:
|
||||
# TODO: Remove DSV4 compatibility after a deprecation period.
|
||||
logger.warning_once(
|
||||
"ROCM_FLASHMLA_SPARSE_DSV4 is deprecated for DeepSeek V4.1 "
|
||||
"and will be removed in a future release. "
|
||||
"Use ROCM_FLASHMLA_SPARSE_DSV41 instead."
|
||||
)
|
||||
return DeepseekV41ROCMAiterMLAAttention
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ from vllm.platforms import current_platform
|
||||
if TYPE_CHECKING:
|
||||
from vllm.models.deepseek_v41.amd.model import DeepseekV4DecoderLayer
|
||||
from vllm.models.deepseek_v41.amd.mono.runner import MonoLayerWeights
|
||||
from vllm.models.deepseek_v41.amd.rocm import DeepseekV4ROCMAiterSparseSWAMetadata
|
||||
from vllm.models.deepseek_v41.amd.rocm import DeepseekV41ROCMAiterSparseSWAMetadata
|
||||
from vllm.models.deepseek_v41.sparse_mla import DeepseekV4FlashMLAMetadata
|
||||
|
||||
logger = init_logger(__name__)
|
||||
@@ -301,7 +301,7 @@ class MonoDecodeLayer:
|
||||
swa, comp = None, None
|
||||
if isinstance(md, dict):
|
||||
swa = cast(
|
||||
"DeepseekV4ROCMAiterSparseSWAMetadata | None",
|
||||
"DeepseekV41ROCMAiterSparseSWAMetadata | None",
|
||||
md.get(attn.swa_cache_layer.prefix),
|
||||
)
|
||||
if attn.compressed_cache_prefix is not None:
|
||||
|
||||
@@ -280,7 +280,7 @@ _TopkRagged = tuple[torch.Tensor, torch.Tensor, torch.Tensor]
|
||||
|
||||
|
||||
@dataclass
|
||||
class DeepseekV4ROCMAiterSparseSWAMetadata(DeepseekSparseSWAMetadata):
|
||||
class DeepseekV41ROCMAiterSparseSWAMetadata(DeepseekSparseSWAMetadata):
|
||||
decode_swa_ragged_indices: torch.Tensor | None = None
|
||||
decode_swa_ragged_indptr: torch.Tensor | None = None
|
||||
# Built only for the aiter prefill, which reads the SWA cache in place.
|
||||
@@ -303,7 +303,7 @@ class DeepseekV41ROCMAiterMLASparseMetadataBuilder(DeepseekV4SparseMLAMetadataBu
|
||||
return super().get_cudagraph_support(vllm_config, kv_cache_spec)
|
||||
|
||||
|
||||
class DeepseekV4ROCMAiterSparseSWAMetadataBuilder(DeepseekV41SparseSWAMetadataBuilder):
|
||||
class DeepseekV41ROCMAiterSparseSWAMetadataBuilder(DeepseekV41SparseSWAMetadataBuilder):
|
||||
@classmethod
|
||||
def get_cudagraph_support(
|
||||
cls,
|
||||
@@ -348,7 +348,7 @@ class DeepseekV4ROCMAiterSparseSWAMetadataBuilder(DeepseekV41SparseSWAMetadataBu
|
||||
common_attn_metadata: CommonAttentionMetadata,
|
||||
fast_build: bool = False,
|
||||
replay_start: torch.Tensor | None = None,
|
||||
) -> DeepseekV4ROCMAiterSparseSWAMetadata:
|
||||
) -> DeepseekV41ROCMAiterSparseSWAMetadata:
|
||||
base = super().build(
|
||||
common_prefix_len=common_prefix_len,
|
||||
common_attn_metadata=common_attn_metadata,
|
||||
@@ -394,7 +394,7 @@ class DeepseekV4ROCMAiterSparseSWAMetadataBuilder(DeepseekV41SparseSWAMetadataBu
|
||||
base.decode_swa_width,
|
||||
)
|
||||
|
||||
return DeepseekV4ROCMAiterSparseSWAMetadata(
|
||||
return DeepseekV41ROCMAiterSparseSWAMetadata(
|
||||
**vars(base),
|
||||
decode_swa_ragged_indices=ragged_indices,
|
||||
decode_swa_ragged_indptr=ragged_indptr,
|
||||
@@ -529,10 +529,10 @@ class DeepseekV41RocmMxfp4Indexer(DeepseekV4Indexer):
|
||||
return q, q_scale, weights
|
||||
|
||||
|
||||
class DeepseekV4ROCMAiterMLASparseBackend(DeepseekV4SparseMLABackend):
|
||||
class DeepseekV41ROCMAiterMLASparseBackend(DeepseekV4SparseMLABackend):
|
||||
@staticmethod
|
||||
def get_name() -> str:
|
||||
return "ROCM_FLASHMLA_SPARSE_DSV4"
|
||||
return "ROCM_FLASHMLA_SPARSE_DSV41"
|
||||
|
||||
@staticmethod
|
||||
def get_supported_kernel_block_sizes(kv_cache_spec=None) -> list[int | MultipleOf]:
|
||||
@@ -545,14 +545,14 @@ class DeepseekV4ROCMAiterMLASparseBackend(DeepseekV4SparseMLABackend):
|
||||
|
||||
class DeepseekV41ROCMAiterSparseSWABackend(DeepseekSparseSWABackend):
|
||||
@staticmethod
|
||||
def get_builder_cls() -> type["DeepseekV4ROCMAiterSparseSWAMetadataBuilder"]:
|
||||
return DeepseekV4ROCMAiterSparseSWAMetadataBuilder
|
||||
def get_builder_cls() -> type["DeepseekV41ROCMAiterSparseSWAMetadataBuilder"]:
|
||||
return DeepseekV41ROCMAiterSparseSWAMetadataBuilder
|
||||
|
||||
|
||||
class DeepseekV41ROCMAiterMLAAttention(DeepseekV4Attention):
|
||||
"""ROCm sparse MLA attention layer for DeepSeek V4.1."""
|
||||
|
||||
backend_cls = DeepseekV4ROCMAiterMLASparseBackend
|
||||
backend_cls = DeepseekV41ROCMAiterMLASparseBackend
|
||||
swa_backend_cls = DeepseekV41ROCMAiterSparseSWABackend
|
||||
_use_aiter_sparse_mla = False
|
||||
|
||||
@@ -1021,7 +1021,7 @@ class DeepseekV41ROCMAiterMLAAttention(DeepseekV4Attention):
|
||||
else None,
|
||||
)
|
||||
swa_metadata = cast(
|
||||
DeepseekV4ROCMAiterSparseSWAMetadata | None,
|
||||
DeepseekV41ROCMAiterSparseSWAMetadata | None,
|
||||
attn_metadata.get(self.swa_cache_layer.prefix),
|
||||
)
|
||||
assert swa_metadata is not None
|
||||
@@ -1100,7 +1100,7 @@ class DeepseekV41ROCMAiterMLAAttention(DeepseekV4Attention):
|
||||
|
||||
def _decode_topk_ragged(
|
||||
self,
|
||||
swa_metadata: DeepseekV4ROCMAiterSparseSWAMetadata,
|
||||
swa_metadata: DeepseekV41ROCMAiterSparseSWAMetadata,
|
||||
attn_metadata: DeepseekV4FlashMLAMetadata | None,
|
||||
num_decodes: int,
|
||||
num_decode_tokens: int,
|
||||
@@ -1139,7 +1139,7 @@ class DeepseekV41ROCMAiterMLAAttention(DeepseekV4Attention):
|
||||
q: torch.Tensor,
|
||||
positions: torch.Tensor,
|
||||
kv_cache: torch.Tensor | None,
|
||||
swa_metadata: DeepseekV4ROCMAiterSparseSWAMetadata,
|
||||
swa_metadata: DeepseekV41ROCMAiterSparseSWAMetadata,
|
||||
attn_metadata: DeepseekV4FlashMLAMetadata | None,
|
||||
swa_only: bool,
|
||||
output: torch.Tensor | None,
|
||||
@@ -1233,7 +1233,7 @@ class DeepseekV41ROCMAiterMLAAttention(DeepseekV4Attention):
|
||||
swa_k_cache: torch.Tensor,
|
||||
output: torch.Tensor | None,
|
||||
attn_metadata: DeepseekV4FlashMLAMetadata | None,
|
||||
swa_metadata: DeepseekV4ROCMAiterSparseSWAMetadata,
|
||||
swa_metadata: DeepseekV41ROCMAiterSparseSWAMetadata,
|
||||
mxfp8_out: tuple[torch.Tensor, torch.Tensor] | None = None,
|
||||
) -> None:
|
||||
"""Sparse prefill into bf16 ``output``, or into ``mxfp8_out``.
|
||||
@@ -1399,7 +1399,7 @@ class DeepseekV41ROCMAiterMLAAttention(DeepseekV4Attention):
|
||||
|
||||
def _prefill_topk_ragged(
|
||||
self,
|
||||
swa_metadata: DeepseekV4ROCMAiterSparseSWAMetadata,
|
||||
swa_metadata: DeepseekV41ROCMAiterSparseSWAMetadata,
|
||||
attn_metadata: DeepseekV4FlashMLAMetadata,
|
||||
compressed_k_cache: torch.Tensor,
|
||||
) -> tuple[torch.Tensor, torch.Tensor]:
|
||||
@@ -1449,7 +1449,7 @@ class DeepseekV41ROCMAiterMLAAttention(DeepseekV4Attention):
|
||||
swa_k_cache: torch.Tensor,
|
||||
output: torch.Tensor | None,
|
||||
attn_metadata: DeepseekV4FlashMLAMetadata | None,
|
||||
swa_metadata: DeepseekV4ROCMAiterSparseSWAMetadata,
|
||||
swa_metadata: DeepseekV41ROCMAiterSparseSWAMetadata,
|
||||
mxfp8_out: tuple[torch.Tensor, torch.Tensor] | None = None,
|
||||
) -> None:
|
||||
"""Prefill straight off the paged caches, with no bf16 gather.
|
||||
|
||||
@@ -646,7 +646,7 @@ class DeepseekV4Attention(nn.Module, AttentionLayerBase, ABC):
|
||||
if self.backend_cls.get_name() in (
|
||||
"FLASHMLA_SPARSE_DSV41",
|
||||
"FLASHMLA_MEGA_ATTN_DSV41",
|
||||
"ROCM_FLASHMLA_SPARSE_DSV4",
|
||||
"ROCM_FLASHMLA_SPARSE_DSV41",
|
||||
):
|
||||
from vllm.models.deepseek_v41.common.ops.cache_utils import (
|
||||
_COMBINE_TOPK_SWA_INDICES_KERNEL,
|
||||
|
||||
Reference in New Issue
Block a user