[ROCm] [DSv4] [Perf] Support DeepSeek v4 MTP (#43385)
Signed-off-by: tjtanaa <tunjian.tan@embeddedllm.com>
This commit is contained in:
@@ -81,17 +81,28 @@ def _patch_make_bitmatrix_metadata() -> None:
|
|||||||
import triton.language as tl
|
import triton.language as tl
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from vllm.third_party.triton_kernels.tensor_details import (
|
if current_platform.is_rocm():
|
||||||
bitmatrix as _bm,
|
from triton_kernels.tensor_details import bitmatrix as _bm
|
||||||
)
|
from triton_kernels.tensor_details.bitmatrix import (
|
||||||
from vllm.third_party.triton_kernels.tensor_details.bitmatrix import (
|
BitmatrixMetadata,
|
||||||
BitmatrixMetadata,
|
_keyed_add,
|
||||||
_keyed_add,
|
cdiv,
|
||||||
cdiv,
|
)
|
||||||
)
|
from triton_kernels.tensor_details.bitmatrix_details.sum_bitmatrix_rows import ( # noqa: E501
|
||||||
from vllm.third_party.triton_kernels.tensor_details.bitmatrix_details.sum_bitmatrix_rows import ( # noqa: E501
|
sum_bitmatrix_rows,
|
||||||
sum_bitmatrix_rows,
|
)
|
||||||
)
|
else:
|
||||||
|
from vllm.third_party.triton_kernels.tensor_details import (
|
||||||
|
bitmatrix as _bm,
|
||||||
|
)
|
||||||
|
from vllm.third_party.triton_kernels.tensor_details.bitmatrix import (
|
||||||
|
BitmatrixMetadata,
|
||||||
|
_keyed_add,
|
||||||
|
cdiv,
|
||||||
|
)
|
||||||
|
from vllm.third_party.triton_kernels.tensor_details.bitmatrix_details.sum_bitmatrix_rows import ( # noqa: E501
|
||||||
|
sum_bitmatrix_rows,
|
||||||
|
)
|
||||||
except ImportError:
|
except ImportError:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
../nvidia/model.py
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1 +0,0 @@
|
|||||||
../nvidia/mtp.py
|
|
||||||
@@ -0,0 +1,520 @@
|
|||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
|
||||||
|
"""MTP draft model for DeepSeek V4 (internal codename: DeepseekV4).
|
||||||
|
|
||||||
|
Split from ``deepseek_mtp.py`` because the V4 architecture introduces several
|
||||||
|
pieces that have no analogue in V3/V32:
|
||||||
|
* separate ``e_proj`` / ``h_proj`` with fp8 linear quantization (instead of
|
||||||
|
the fused ``eh_proj``);
|
||||||
|
* ``hc_head`` hypercompressed vocab projection applied in ``compute_logits``;
|
||||||
|
* ``DeepseekV4DecoderLayer`` with its own aux-stream management;
|
||||||
|
* V4-specific checkpoint weight-name remapping in ``load_weights``.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import typing
|
||||||
|
from collections.abc import Callable, Iterable
|
||||||
|
|
||||||
|
import regex as re
|
||||||
|
import torch
|
||||||
|
import torch.nn as nn
|
||||||
|
|
||||||
|
from vllm.compilation.decorators import support_torch_compile
|
||||||
|
from vllm.config import VllmConfig
|
||||||
|
from vllm.distributed import (
|
||||||
|
get_tensor_model_parallel_rank,
|
||||||
|
get_tensor_model_parallel_world_size,
|
||||||
|
)
|
||||||
|
from vllm.logger import init_logger
|
||||||
|
from vllm.model_executor.layers.fused_moe import FusedMoE
|
||||||
|
from vllm.model_executor.layers.layernorm import RMSNorm
|
||||||
|
from vllm.model_executor.layers.linear import ReplicatedLinear
|
||||||
|
from vllm.model_executor.layers.logits_processor import LogitsProcessor
|
||||||
|
from vllm.model_executor.layers.mhc import HCHeadOp
|
||||||
|
from vllm.model_executor.layers.vocab_parallel_embedding import (
|
||||||
|
VocabParallelEmbedding,
|
||||||
|
)
|
||||||
|
from vllm.model_executor.model_loader.weight_utils import default_weight_loader
|
||||||
|
from vllm.model_executor.models.deepseek_mtp import SharedHead
|
||||||
|
from vllm.model_executor.models.deepseek_v2 import get_spec_layer_idx_from_weight_name
|
||||||
|
from vllm.model_executor.models.utils import maybe_prefix
|
||||||
|
from vllm.platforms import current_platform
|
||||||
|
from vllm.sequence import IntermediateTensors
|
||||||
|
|
||||||
|
from .model import (
|
||||||
|
DeepseekV4DecoderLayer,
|
||||||
|
make_deepseek_v4_expert_params_mapping,
|
||||||
|
)
|
||||||
|
|
||||||
|
logger = init_logger(__name__)
|
||||||
|
|
||||||
|
# MoE expert scales are fused into per-layer w13/w2 tensors. The exact
|
||||||
|
# parameter suffix depends on which FusedMoE method handles the experts:
|
||||||
|
# - fp4 experts (Mxfp4MoEMethod) register ``w{1,2,3}_weight_scale``;
|
||||||
|
# - fp8 experts (Fp8MoEMethod with block_quant=True) register
|
||||||
|
# ``w{1,2,3}_weight_scale_inv``.
|
||||||
|
# Other FP8 linear scales (including shared experts) always use
|
||||||
|
# ``.weight_scale_inv``. Mirrors the per-instance mapper built by
|
||||||
|
# ``_make_deepseek_v4_weights_mapper`` in deepseek_v4.py.
|
||||||
|
_EXPERT_SCALE_RE = re.compile(r"\.experts\.\d+\.w[123]\.scale$")
|
||||||
|
|
||||||
|
|
||||||
|
class DeepSeekV4MultiTokenPredictorLayer(nn.Module):
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
vllm_config: VllmConfig,
|
||||||
|
topk_indices_buffer: torch.Tensor,
|
||||||
|
prefix: str,
|
||||||
|
aux_stream_list: list[torch.cuda.Stream] | None = None,
|
||||||
|
) -> None:
|
||||||
|
super().__init__()
|
||||||
|
|
||||||
|
assert vllm_config.speculative_config is not None
|
||||||
|
config = vllm_config.speculative_config.draft_model_config.hf_config
|
||||||
|
self.config = config
|
||||||
|
quant_config = vllm_config.quant_config
|
||||||
|
self.rms_norm_eps = config.rms_norm_eps
|
||||||
|
|
||||||
|
self.enorm = RMSNorm(config.hidden_size, eps=config.rms_norm_eps)
|
||||||
|
self.hnorm = RMSNorm(config.hidden_size, eps=config.rms_norm_eps)
|
||||||
|
|
||||||
|
# V4 keeps e_ and h_ proj separate (with fp8 linear quant) rather than
|
||||||
|
# fusing them the way V3 does with eh_proj.
|
||||||
|
self.e_proj = ReplicatedLinear(
|
||||||
|
config.hidden_size,
|
||||||
|
config.hidden_size,
|
||||||
|
bias=False,
|
||||||
|
return_bias=False,
|
||||||
|
quant_config=quant_config,
|
||||||
|
)
|
||||||
|
self.h_proj = ReplicatedLinear(
|
||||||
|
config.hidden_size,
|
||||||
|
config.hidden_size,
|
||||||
|
bias=False,
|
||||||
|
return_bias=False,
|
||||||
|
quant_config=quant_config,
|
||||||
|
)
|
||||||
|
|
||||||
|
self.hc_eps = config.hc_eps
|
||||||
|
self.hc_mult = config.hc_mult
|
||||||
|
self.hc_dim = self.hc_mult * config.hidden_size
|
||||||
|
self.hc_head_fn = nn.Parameter(
|
||||||
|
torch.empty(self.hc_mult, self.hc_dim, dtype=torch.float32),
|
||||||
|
requires_grad=False,
|
||||||
|
)
|
||||||
|
self.hc_head_base = nn.Parameter(
|
||||||
|
torch.empty(self.hc_mult, dtype=torch.float32),
|
||||||
|
requires_grad=False,
|
||||||
|
)
|
||||||
|
self.hc_head_scale = nn.Parameter(
|
||||||
|
torch.empty(1, dtype=torch.float32),
|
||||||
|
requires_grad=False,
|
||||||
|
)
|
||||||
|
|
||||||
|
self.shared_head = SharedHead(
|
||||||
|
config=config, prefix=prefix, quant_config=quant_config
|
||||||
|
)
|
||||||
|
self.mtp_block = DeepseekV4DecoderLayer(
|
||||||
|
vllm_config,
|
||||||
|
prefix,
|
||||||
|
topk_indices_buffer=topk_indices_buffer,
|
||||||
|
aux_stream_list=aux_stream_list,
|
||||||
|
)
|
||||||
|
|
||||||
|
self.hc_head_op = HCHeadOp()
|
||||||
|
|
||||||
|
def forward(
|
||||||
|
self,
|
||||||
|
input_ids: torch.Tensor,
|
||||||
|
positions: torch.Tensor,
|
||||||
|
previous_hidden_states: torch.Tensor,
|
||||||
|
inputs_embeds: torch.Tensor | None = None,
|
||||||
|
spec_step_index: int = 0,
|
||||||
|
) -> torch.Tensor:
|
||||||
|
assert inputs_embeds is not None
|
||||||
|
# masking inputs at position 0, as not needed by MTP
|
||||||
|
inputs_embeds = torch.where(positions.unsqueeze(-1) == 0, 0, inputs_embeds)
|
||||||
|
inputs_embeds = self.enorm(inputs_embeds)
|
||||||
|
|
||||||
|
# Target stashes pre-hc_head residual as flat (T, hc_mult * D);
|
||||||
|
# reshape to (T, hc_mult, D) — the training-time layout.
|
||||||
|
previous_hidden_states = previous_hidden_states.view(
|
||||||
|
-1, self.hc_mult, self.config.hidden_size
|
||||||
|
)
|
||||||
|
previous_hidden_states = self.hnorm(previous_hidden_states)
|
||||||
|
hidden_states = self.h_proj(previous_hidden_states) + self.e_proj(
|
||||||
|
inputs_embeds
|
||||||
|
).unsqueeze(-2)
|
||||||
|
hidden_states, residual, post_mix, res_mix = self.mtp_block(
|
||||||
|
positions=positions, x=hidden_states, input_ids=None
|
||||||
|
)
|
||||||
|
if current_platform.is_cuda():
|
||||||
|
hidden_states = self.mtp_block.hc_post(
|
||||||
|
hidden_states, residual, post_mix, res_mix
|
||||||
|
)
|
||||||
|
# Return the flat pre-hc_head residual so it can be re-fed as the
|
||||||
|
# next spec step's `previous_hidden_states` when
|
||||||
|
# num_speculative_tokens > 1. hc_head is deferred to compute_logits.
|
||||||
|
return hidden_states.flatten(1)
|
||||||
|
|
||||||
|
|
||||||
|
class DeepSeekV4MultiTokenPredictor(nn.Module):
|
||||||
|
def __init__(self, *, vllm_config: VllmConfig, prefix: str = ""):
|
||||||
|
super().__init__()
|
||||||
|
config = vllm_config.model_config.hf_config
|
||||||
|
self.mtp_start_layer_idx = config.num_hidden_layers
|
||||||
|
self.num_mtp_layers = config.num_nextn_predict_layers
|
||||||
|
self.device = current_platform.device_type
|
||||||
|
|
||||||
|
topk_tokens = config.index_topk
|
||||||
|
self.topk_indices_buffer = torch.empty(
|
||||||
|
vllm_config.scheduler_config.max_num_batched_tokens,
|
||||||
|
topk_tokens,
|
||||||
|
dtype=torch.int32,
|
||||||
|
device=self.device,
|
||||||
|
)
|
||||||
|
|
||||||
|
# Three aux streams shared across all MTP layers, mirroring
|
||||||
|
# DeepseekV4Model. ROCm runs the same work serially for now.
|
||||||
|
aux_stream_list = (
|
||||||
|
None
|
||||||
|
if current_platform.is_rocm()
|
||||||
|
else [torch.cuda.Stream() for _ in range(3)]
|
||||||
|
)
|
||||||
|
|
||||||
|
# to map the exact layer index from weights
|
||||||
|
self.layers = torch.nn.ModuleDict(
|
||||||
|
{
|
||||||
|
str(idx): DeepSeekV4MultiTokenPredictorLayer(
|
||||||
|
vllm_config,
|
||||||
|
self.topk_indices_buffer,
|
||||||
|
f"{prefix}.layers.{idx}",
|
||||||
|
aux_stream_list=aux_stream_list,
|
||||||
|
)
|
||||||
|
for idx in range(
|
||||||
|
self.mtp_start_layer_idx,
|
||||||
|
self.mtp_start_layer_idx + self.num_mtp_layers,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
self.embed_tokens = VocabParallelEmbedding(
|
||||||
|
config.vocab_size,
|
||||||
|
config.hidden_size,
|
||||||
|
prefix=maybe_prefix(prefix, "embed_tokens"),
|
||||||
|
)
|
||||||
|
self.logits_processor = LogitsProcessor(config.vocab_size)
|
||||||
|
|
||||||
|
def embed_input_ids(self, input_ids: torch.Tensor) -> torch.Tensor:
|
||||||
|
return self.embed_tokens(input_ids)
|
||||||
|
|
||||||
|
def forward(
|
||||||
|
self,
|
||||||
|
input_ids: torch.Tensor,
|
||||||
|
positions: torch.Tensor,
|
||||||
|
previous_hidden_states: torch.Tensor,
|
||||||
|
inputs_embeds: torch.Tensor | None = None,
|
||||||
|
spec_step_idx: int = 0,
|
||||||
|
) -> torch.Tensor:
|
||||||
|
if inputs_embeds is None:
|
||||||
|
inputs_embeds = self.embed_tokens(input_ids)
|
||||||
|
current_step_idx = spec_step_idx % self.num_mtp_layers
|
||||||
|
return self.layers[str(self.mtp_start_layer_idx + current_step_idx)](
|
||||||
|
input_ids,
|
||||||
|
positions,
|
||||||
|
previous_hidden_states,
|
||||||
|
inputs_embeds,
|
||||||
|
current_step_idx,
|
||||||
|
)
|
||||||
|
|
||||||
|
def compute_logits(
|
||||||
|
self,
|
||||||
|
hidden_states: torch.Tensor,
|
||||||
|
spec_step_idx: int = 0,
|
||||||
|
) -> torch.Tensor:
|
||||||
|
current_step_idx = spec_step_idx % self.num_mtp_layers
|
||||||
|
mtp_layer = self.layers[str(self.mtp_start_layer_idx + current_step_idx)]
|
||||||
|
# MTP forward returns the pre-hc_head residual (T, hc_mult * D); apply
|
||||||
|
# hc_head here so logits are computed from the dense hidden state.
|
||||||
|
hidden_states = hidden_states.view(
|
||||||
|
-1, mtp_layer.hc_mult, mtp_layer.config.hidden_size
|
||||||
|
)
|
||||||
|
hidden_states = mtp_layer.hc_head_op(
|
||||||
|
hidden_states,
|
||||||
|
mtp_layer.hc_head_fn,
|
||||||
|
mtp_layer.hc_head_scale,
|
||||||
|
mtp_layer.hc_head_base,
|
||||||
|
mtp_layer.rms_norm_eps,
|
||||||
|
mtp_layer.hc_eps,
|
||||||
|
)
|
||||||
|
logits = self.logits_processor(
|
||||||
|
mtp_layer.shared_head.head, mtp_layer.shared_head(hidden_states)
|
||||||
|
)
|
||||||
|
return logits
|
||||||
|
|
||||||
|
|
||||||
|
@support_torch_compile
|
||||||
|
class DeepSeekV4MTP(nn.Module):
|
||||||
|
def __init__(self, *, vllm_config: VllmConfig, prefix: str = ""):
|
||||||
|
super().__init__()
|
||||||
|
self.config = vllm_config.model_config.hf_config
|
||||||
|
self.quant_config = vllm_config.quant_config
|
||||||
|
self.model = DeepSeekV4MultiTokenPredictor(
|
||||||
|
vllm_config=vllm_config, prefix=maybe_prefix(prefix, "model")
|
||||||
|
)
|
||||||
|
|
||||||
|
def embed_input_ids(self, input_ids: torch.Tensor) -> torch.Tensor:
|
||||||
|
return self.model.embed_input_ids(input_ids)
|
||||||
|
|
||||||
|
def forward(
|
||||||
|
self,
|
||||||
|
input_ids: torch.Tensor | None,
|
||||||
|
positions: torch.Tensor,
|
||||||
|
hidden_states: torch.Tensor,
|
||||||
|
intermediate_tensors: IntermediateTensors | None = None,
|
||||||
|
inputs_embeds: torch.Tensor | None = None,
|
||||||
|
spec_step_idx: int = 0,
|
||||||
|
) -> torch.Tensor:
|
||||||
|
hidden_states = self.model(
|
||||||
|
input_ids, positions, hidden_states, inputs_embeds, spec_step_idx
|
||||||
|
)
|
||||||
|
return hidden_states
|
||||||
|
|
||||||
|
def compute_logits(
|
||||||
|
self,
|
||||||
|
hidden_states: torch.Tensor,
|
||||||
|
spec_step_idx: int = 0,
|
||||||
|
) -> torch.Tensor | None:
|
||||||
|
return self.model.compute_logits(hidden_states, spec_step_idx)
|
||||||
|
|
||||||
|
def load_weights(self, weights: Iterable[tuple[str, torch.Tensor]]) -> set[str]:
|
||||||
|
# Weight name remapping for checkpoint compatibility.
|
||||||
|
# Maps checkpoint weight paths to model parameter paths.
|
||||||
|
WEIGHT_NAME_REMAPPING: dict[str, str] = {
|
||||||
|
".emb.tok_emb.weight": ".embed_tokens.weight",
|
||||||
|
".head.weight": ".shared_head.head.weight",
|
||||||
|
".norm.weight": ".shared_head.norm.weight",
|
||||||
|
# Pre-MoE norm + gate are now owned by
|
||||||
|
# ``DeepseekV4MoE.norm_gate`` (see NormGatedLinear).
|
||||||
|
".ffn_norm.weight": ".ffn.norm_gate.norm.weight",
|
||||||
|
".ffn.gate.weight": ".ffn.norm_gate.gate.weight",
|
||||||
|
".ffn.gate.tid2eid": ".ffn.norm_gate.tid2eid",
|
||||||
|
}
|
||||||
|
|
||||||
|
def _remap_weight_name(name: str) -> str:
|
||||||
|
"""Remap checkpoint weight names to model parameter names."""
|
||||||
|
for old_pattern, new_pattern in WEIGHT_NAME_REMAPPING.items():
|
||||||
|
if old_pattern in name:
|
||||||
|
name = name.replace(old_pattern, new_pattern)
|
||||||
|
return name
|
||||||
|
|
||||||
|
def _find_mtp_layer_idx(name: str) -> int:
|
||||||
|
subnames = name.split(".")
|
||||||
|
for subname in subnames:
|
||||||
|
try:
|
||||||
|
# we return the first encountered integer
|
||||||
|
return int(subname)
|
||||||
|
except ValueError:
|
||||||
|
continue
|
||||||
|
return 0
|
||||||
|
|
||||||
|
stacked_params_mapping = [
|
||||||
|
# (param_name, shard_name, shard_id)
|
||||||
|
("gate_up_proj", "w1", 0),
|
||||||
|
("gate_up_proj", "w3", 1),
|
||||||
|
("attn.fused_wqa_wkv", "attn.wq_a", 0),
|
||||||
|
("attn.fused_wqa_wkv", "attn.wkv", 1),
|
||||||
|
]
|
||||||
|
params_dict = dict(self.named_parameters())
|
||||||
|
loaded_params: set[str] = set()
|
||||||
|
|
||||||
|
# TP for attention
|
||||||
|
tp_size = get_tensor_model_parallel_world_size()
|
||||||
|
tp_rank = get_tensor_model_parallel_rank()
|
||||||
|
n_head = self.config.num_attention_heads
|
||||||
|
n_local_head = n_head // tp_size
|
||||||
|
head_rank_start = n_local_head * tp_rank
|
||||||
|
head_rank_end = n_local_head * (tp_rank + 1)
|
||||||
|
|
||||||
|
# Pre-compute expert mapping ONCE.
|
||||||
|
first_layer = next(iter(self.model.layers.values()))
|
||||||
|
if first_layer.mtp_block.ffn.use_mega_moe:
|
||||||
|
expert_mapping = make_deepseek_v4_expert_params_mapping(
|
||||||
|
self.config.n_routed_experts
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
expert_mapping = FusedMoE.make_expert_params_mapping(
|
||||||
|
self,
|
||||||
|
ckpt_gate_proj_name="w1",
|
||||||
|
ckpt_down_proj_name="w2",
|
||||||
|
ckpt_up_proj_name="w3",
|
||||||
|
num_experts=self.config.n_routed_experts,
|
||||||
|
)
|
||||||
|
|
||||||
|
# FP8 experts register ``..._weight_scale_inv`` (block_quant) while
|
||||||
|
# FP4/MXFP4 experts register ``..._weight_scale``. Choose the suffix
|
||||||
|
# for the rename below based on the model's expert dtype.
|
||||||
|
expert_scale_suffix = (
|
||||||
|
".weight_scale"
|
||||||
|
if getattr(self.config, "expert_dtype", "fp4") == "fp4"
|
||||||
|
else ".weight_scale_inv"
|
||||||
|
)
|
||||||
|
|
||||||
|
for name, loaded_weight in weights:
|
||||||
|
mtp_layer_idx = _find_mtp_layer_idx(name)
|
||||||
|
# V4 checkpoints store MTP weights as `mtp.{i}.*`; remap to
|
||||||
|
# `model.layers.{num_hidden_layers + i}.*` so that
|
||||||
|
# get_spec_layer_idx_from_weight_name can identify them.
|
||||||
|
name = name.replace(
|
||||||
|
f"mtp.{mtp_layer_idx}.",
|
||||||
|
f"model.layers.{self.config.num_hidden_layers + mtp_layer_idx}.",
|
||||||
|
)
|
||||||
|
|
||||||
|
spec_layer = get_spec_layer_idx_from_weight_name(self.config, name)
|
||||||
|
if spec_layer is None:
|
||||||
|
continue
|
||||||
|
|
||||||
|
name = _remap_weight_name(name)
|
||||||
|
name = self._rewrite_spec_layer_name(spec_layer, name)
|
||||||
|
|
||||||
|
if spec_layer != self.model.mtp_start_layer_idx and ".layers" not in name:
|
||||||
|
continue
|
||||||
|
if name.endswith(".scale"):
|
||||||
|
suffix = (
|
||||||
|
expert_scale_suffix
|
||||||
|
if _EXPERT_SCALE_RE.search(name)
|
||||||
|
else ".weight_scale_inv"
|
||||||
|
)
|
||||||
|
name = name.removesuffix(".scale") + suffix
|
||||||
|
for param_name, weight_name, shard_id in stacked_params_mapping:
|
||||||
|
# Skip non-stacked layers and experts (experts handled below).
|
||||||
|
if ".experts." in name:
|
||||||
|
continue
|
||||||
|
if weight_name not in name:
|
||||||
|
continue
|
||||||
|
name = name.replace(weight_name, param_name)
|
||||||
|
|
||||||
|
param = params_dict[name]
|
||||||
|
weight_loader = param.weight_loader
|
||||||
|
weight_loader(param, loaded_weight, shard_id)
|
||||||
|
loaded_params.add(name)
|
||||||
|
break
|
||||||
|
else:
|
||||||
|
if ".experts." in name:
|
||||||
|
# Reinterpret E8M0 scales as uint8 to preserve raw
|
||||||
|
# exponent bytes; numeric copy_() would zero them.
|
||||||
|
# Mirrors the main DeepseekV4 loader.
|
||||||
|
if (
|
||||||
|
"weight_scale" in name
|
||||||
|
and loaded_weight.dtype == torch.float8_e8m0fnu
|
||||||
|
):
|
||||||
|
loaded_weight = loaded_weight.view(torch.uint8)
|
||||||
|
for mapping in expert_mapping:
|
||||||
|
param_name, weight_name, expert_id, expert_shard_id = mapping
|
||||||
|
if weight_name not in name:
|
||||||
|
continue
|
||||||
|
name_mapped = name.replace(weight_name, param_name)
|
||||||
|
param = params_dict[name_mapped]
|
||||||
|
# We should ask the weight loader to return success or not
|
||||||
|
# here since otherwise we may skip experts with other
|
||||||
|
# available replicas.
|
||||||
|
weight_loader = typing.cast(
|
||||||
|
Callable[..., bool], param.weight_loader
|
||||||
|
)
|
||||||
|
success = weight_loader(
|
||||||
|
param,
|
||||||
|
loaded_weight,
|
||||||
|
name_mapped,
|
||||||
|
shard_id=expert_shard_id,
|
||||||
|
expert_id=expert_id,
|
||||||
|
return_success=True,
|
||||||
|
)
|
||||||
|
if success:
|
||||||
|
name = name_mapped
|
||||||
|
loaded_params.add(name_mapped)
|
||||||
|
break
|
||||||
|
continue
|
||||||
|
elif "attn_sink" in name:
|
||||||
|
narrow_weight = loaded_weight[head_rank_start:head_rank_end]
|
||||||
|
n = narrow_weight.shape[0]
|
||||||
|
params_dict[name][:n].copy_(narrow_weight)
|
||||||
|
loaded_params.add(name)
|
||||||
|
continue
|
||||||
|
else:
|
||||||
|
if ".shared_experts.w2" in name:
|
||||||
|
name = name.replace(
|
||||||
|
".shared_experts.w2", ".shared_experts.down_proj"
|
||||||
|
)
|
||||||
|
if name.endswith(".ffn.gate.bias"):
|
||||||
|
# ``e_score_correction_bias`` lives on
|
||||||
|
# ``norm_gate`` directly (not on the inner gate).
|
||||||
|
name = name.replace(
|
||||||
|
".ffn.gate.bias",
|
||||||
|
".ffn.norm_gate.e_score_correction_bias",
|
||||||
|
)
|
||||||
|
param = params_dict[name]
|
||||||
|
weight_loader = getattr(
|
||||||
|
param, "weight_loader", default_weight_loader
|
||||||
|
)
|
||||||
|
weight_loader(param, loaded_weight)
|
||||||
|
loaded_params.add(name)
|
||||||
|
continue
|
||||||
|
|
||||||
|
loaded_layers: set[int] = set()
|
||||||
|
for param_name in loaded_params:
|
||||||
|
spec_layer = get_spec_layer_idx_from_weight_name(self.config, param_name)
|
||||||
|
if spec_layer is not None:
|
||||||
|
loaded_layers.add(spec_layer)
|
||||||
|
for layer_idx in range(
|
||||||
|
self.model.mtp_start_layer_idx,
|
||||||
|
self.model.mtp_start_layer_idx + self.model.num_mtp_layers,
|
||||||
|
):
|
||||||
|
if layer_idx not in loaded_layers:
|
||||||
|
raise ValueError(
|
||||||
|
f"MTP speculative decoding layer {layer_idx} weights "
|
||||||
|
f"missing from checkpoint. The checkpoint may have "
|
||||||
|
f"been quantized without including the MTP layers. "
|
||||||
|
f"Use a checkpoint that includes MTP layer weights, "
|
||||||
|
f"or disable speculative decoding."
|
||||||
|
)
|
||||||
|
self.finalize_mega_moe_weights()
|
||||||
|
logger.info_once("MTP draft model loaded: %d params", len(loaded_params))
|
||||||
|
return loaded_params
|
||||||
|
|
||||||
|
def finalize_mega_moe_weights(self) -> None:
|
||||||
|
for layer in self.model.layers.values():
|
||||||
|
layer.mtp_block.ffn.finalize_mega_moe_weights()
|
||||||
|
|
||||||
|
def _rewrite_spec_layer_name(self, spec_layer: int, name: str) -> str:
|
||||||
|
"""
|
||||||
|
Rewrite the weight name to match the format of the original model.
|
||||||
|
Add .mtp_block for modules in transformer layer block for spec layer
|
||||||
|
and rename shared layer weights to be top level.
|
||||||
|
"""
|
||||||
|
spec_layer_weight_names = [
|
||||||
|
"embed_tokens",
|
||||||
|
"enorm",
|
||||||
|
"hnorm",
|
||||||
|
"h_proj",
|
||||||
|
"e_proj",
|
||||||
|
"shared_head",
|
||||||
|
"hc_head_fn",
|
||||||
|
"hc_head_base",
|
||||||
|
"hc_head_scale",
|
||||||
|
]
|
||||||
|
shared_weight_names = ["embed_tokens"]
|
||||||
|
spec_layer_weight = False
|
||||||
|
shared_weight = False
|
||||||
|
for weight_name in spec_layer_weight_names:
|
||||||
|
if weight_name in name:
|
||||||
|
spec_layer_weight = True
|
||||||
|
if weight_name in shared_weight_names:
|
||||||
|
shared_weight = True
|
||||||
|
break
|
||||||
|
if not spec_layer_weight:
|
||||||
|
# treat rest weights as weights for transformer layer block
|
||||||
|
name = name.replace(
|
||||||
|
f"model.layers.{spec_layer}.", f"model.layers.{spec_layer}.mtp_block."
|
||||||
|
)
|
||||||
|
elif shared_weight:
|
||||||
|
# treat shared weights as top level weights
|
||||||
|
name = name.replace(f"model.layers.{spec_layer}.", "model.")
|
||||||
|
return name
|
||||||
@@ -44,6 +44,127 @@ def _build_indptr_from_lengths(lengths: torch.Tensor) -> torch.Tensor:
|
|||||||
return indptr
|
return indptr
|
||||||
|
|
||||||
|
|
||||||
|
# ROCm sparse prefill keeps this dense combine local so AMD-specific SWA changes
|
||||||
|
# do not touch the shared DeepSeek V4 cache utilities.
|
||||||
|
_SPARSE_PREFILL_TOPK_ALIGNMENT = 128
|
||||||
|
|
||||||
|
|
||||||
|
@triton.jit
|
||||||
|
def _combine_topk_swa_indices_kernel(
|
||||||
|
combined_indices_ptr,
|
||||||
|
combined_indices_stride,
|
||||||
|
combined_lens_ptr,
|
||||||
|
topk_indices_ptr,
|
||||||
|
topk_indices_stride,
|
||||||
|
query_start_loc_ptr,
|
||||||
|
seq_lens_ptr,
|
||||||
|
gather_lens_ptr,
|
||||||
|
M,
|
||||||
|
N,
|
||||||
|
TOP_K: tl.constexpr,
|
||||||
|
COMPRESS_RATIO: tl.constexpr,
|
||||||
|
WINDOW_SIZE: tl.constexpr,
|
||||||
|
TOPK_WIDTH: tl.constexpr,
|
||||||
|
PADDED_TOP_K: tl.constexpr,
|
||||||
|
):
|
||||||
|
batch_idx = tl.program_id(0)
|
||||||
|
worker_id = tl.program_id(1)
|
||||||
|
num_workers = tl.num_programs(1)
|
||||||
|
|
||||||
|
base = tl.load(query_start_loc_ptr)
|
||||||
|
query_start = tl.load(query_start_loc_ptr + batch_idx) - base
|
||||||
|
query_end = tl.load(query_start_loc_ptr + batch_idx + 1) - base
|
||||||
|
query_len = query_end - query_start
|
||||||
|
seq_len = tl.load(seq_lens_ptr + batch_idx)
|
||||||
|
gather_len = tl.load(gather_lens_ptr + batch_idx)
|
||||||
|
start_pos = seq_len - query_len
|
||||||
|
gather_start = seq_len - gather_len
|
||||||
|
|
||||||
|
for token_idx in range(query_start + worker_id, query_end, num_workers):
|
||||||
|
token_idx_in_query = token_idx - query_start
|
||||||
|
pos = start_pos + token_idx_in_query
|
||||||
|
topk_len = tl.minimum((pos + 1) // COMPRESS_RATIO, TOP_K)
|
||||||
|
swa_len = tl.minimum(pos + 1, WINDOW_SIZE)
|
||||||
|
|
||||||
|
topk_offset = tl.arange(0, PADDED_TOP_K)
|
||||||
|
topk_mask = topk_offset < topk_len
|
||||||
|
safe_topk_offset = tl.where(topk_offset < TOPK_WIDTH, topk_offset, 0)
|
||||||
|
topk_indices = tl.load(
|
||||||
|
topk_indices_ptr + token_idx * topk_indices_stride + safe_topk_offset,
|
||||||
|
mask=topk_mask,
|
||||||
|
other=-1,
|
||||||
|
)
|
||||||
|
valid_topk = (topk_indices >= 0) & (topk_indices < N)
|
||||||
|
topk_indices = tl.where(valid_topk, topk_indices + M * batch_idx, -1)
|
||||||
|
tl.store(
|
||||||
|
combined_indices_ptr + token_idx * combined_indices_stride + topk_offset,
|
||||||
|
topk_indices,
|
||||||
|
mask=topk_mask,
|
||||||
|
)
|
||||||
|
|
||||||
|
swa_offset = tl.arange(0, WINDOW_SIZE)
|
||||||
|
tl.store(
|
||||||
|
combined_indices_ptr
|
||||||
|
+ token_idx * combined_indices_stride
|
||||||
|
+ topk_len
|
||||||
|
+ swa_offset,
|
||||||
|
M * batch_idx + N + swa_offset + pos - swa_len + 1 - gather_start,
|
||||||
|
mask=swa_offset < swa_len,
|
||||||
|
)
|
||||||
|
|
||||||
|
tl.store(combined_lens_ptr + token_idx, topk_len + swa_len)
|
||||||
|
|
||||||
|
|
||||||
|
def combine_topk_swa_indices(
|
||||||
|
topk_indices: torch.Tensor,
|
||||||
|
query_start_loc: torch.Tensor,
|
||||||
|
seq_lens: torch.Tensor,
|
||||||
|
gather_lens: torch.Tensor,
|
||||||
|
window_size: int,
|
||||||
|
compress_ratio: int,
|
||||||
|
topk: int,
|
||||||
|
M: int,
|
||||||
|
N: int,
|
||||||
|
) -> tuple[torch.Tensor, torch.Tensor]:
|
||||||
|
topk_indices = topk_indices.reshape(topk_indices.shape[0], -1).contiguous()
|
||||||
|
num_tokens = topk_indices.shape[0]
|
||||||
|
num_reqs = seq_lens.shape[0]
|
||||||
|
combined_topk = (
|
||||||
|
(topk + window_size + _SPARSE_PREFILL_TOPK_ALIGNMENT - 1)
|
||||||
|
// _SPARSE_PREFILL_TOPK_ALIGNMENT
|
||||||
|
* _SPARSE_PREFILL_TOPK_ALIGNMENT
|
||||||
|
)
|
||||||
|
combined_indices = torch.full(
|
||||||
|
(num_tokens, combined_topk),
|
||||||
|
fill_value=-1,
|
||||||
|
dtype=torch.int32,
|
||||||
|
device=topk_indices.device,
|
||||||
|
)
|
||||||
|
combined_lens = torch.empty(
|
||||||
|
num_tokens, dtype=torch.int32, device=topk_indices.device
|
||||||
|
)
|
||||||
|
|
||||||
|
num_workers = 128
|
||||||
|
_combine_topk_swa_indices_kernel[(num_reqs, num_workers)](
|
||||||
|
combined_indices,
|
||||||
|
combined_indices.stride(0),
|
||||||
|
combined_lens,
|
||||||
|
topk_indices,
|
||||||
|
topk_indices.stride(0),
|
||||||
|
query_start_loc,
|
||||||
|
seq_lens,
|
||||||
|
gather_lens,
|
||||||
|
M,
|
||||||
|
N,
|
||||||
|
TOP_K=topk,
|
||||||
|
COMPRESS_RATIO=compress_ratio,
|
||||||
|
WINDOW_SIZE=window_size,
|
||||||
|
TOPK_WIDTH=topk_indices.shape[-1],
|
||||||
|
PADDED_TOP_K=triton.next_power_of_2(topk_indices.shape[-1]),
|
||||||
|
)
|
||||||
|
return combined_indices, combined_lens
|
||||||
|
|
||||||
|
|
||||||
@triton.jit
|
@triton.jit
|
||||||
def _compute_topk_lens_kernel(
|
def _compute_topk_lens_kernel(
|
||||||
topk_lens_ptr,
|
topk_lens_ptr,
|
||||||
@@ -704,31 +825,23 @@ class DeepseekV4ROCMAiterMLASparseImpl(DeepseekV4SparseMLAAttentionImpl):
|
|||||||
query_start_loc_cpu[num_decodes + chunk_end] - prefill_token_base
|
query_start_loc_cpu[num_decodes + chunk_end] - prefill_token_base
|
||||||
)
|
)
|
||||||
|
|
||||||
combined_ragged_indices, combined_ragged_indptr, combined_lens = (
|
combined_indices, combined_lens = combine_topk_swa_indices(
|
||||||
combine_topk_swa_indices_ragged(
|
topk_indices[query_start:query_end],
|
||||||
topk_indices[query_start:query_end],
|
query_start_loc[
|
||||||
query_start_loc[
|
num_decodes + chunk_start : num_decodes + chunk_end + 1
|
||||||
num_decodes + chunk_start : num_decodes + chunk_end + 1
|
],
|
||||||
],
|
seq_lens[chunk_start:chunk_end],
|
||||||
seq_lens[chunk_start:chunk_end],
|
gather_lens[chunk_start:chunk_end],
|
||||||
gather_lens[chunk_start:chunk_end],
|
layer.window_size,
|
||||||
layer.window_size,
|
layer.compress_ratio,
|
||||||
layer.compress_ratio,
|
top_k,
|
||||||
top_k,
|
M,
|
||||||
M,
|
N,
|
||||||
N,
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
rocm_sparse_attn_prefill(
|
rocm_sparse_attn_prefill(
|
||||||
q=q[query_start:query_end],
|
q=q[query_start:query_end],
|
||||||
kv=kv.view(-1, 1, q.shape[-1]),
|
kv=kv.view(-1, 1, q.shape[-1]),
|
||||||
indices=torch.empty(
|
indices=combined_indices,
|
||||||
q[query_start:query_end].shape[0],
|
|
||||||
1,
|
|
||||||
0,
|
|
||||||
dtype=torch.int32,
|
|
||||||
device=q.device,
|
|
||||||
),
|
|
||||||
topk_length=combined_lens,
|
topk_length=combined_lens,
|
||||||
scale=layer.scale,
|
scale=layer.scale,
|
||||||
head_dim=layer.head_dim,
|
head_dim=layer.head_dim,
|
||||||
@@ -736,6 +849,4 @@ class DeepseekV4ROCMAiterMLASparseImpl(DeepseekV4SparseMLAAttentionImpl):
|
|||||||
rope_head_dim=layer.rope_head_dim,
|
rope_head_dim=layer.rope_head_dim,
|
||||||
attn_sink=layer.attn_sink,
|
attn_sink=layer.attn_sink,
|
||||||
output=output[query_start:query_end],
|
output=output[query_start:query_end],
|
||||||
ragged_indices=combined_ragged_indices,
|
|
||||||
ragged_indptr=combined_ragged_indptr,
|
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -144,35 +144,57 @@ def _cp_gather_indexer_quant_cache_kernel(
|
|||||||
HEAD_DIM: tl.constexpr,
|
HEAD_DIM: tl.constexpr,
|
||||||
BLOCK_TILE_SIZE: tl.constexpr,
|
BLOCK_TILE_SIZE: tl.constexpr,
|
||||||
HEAD_TILE_SIZE: tl.constexpr,
|
HEAD_TILE_SIZE: tl.constexpr,
|
||||||
|
NUM_TOKENS: tl.constexpr,
|
||||||
|
NUM_BATCHES: tl.constexpr,
|
||||||
|
BLOCK_TABLE_WIDTH: tl.constexpr,
|
||||||
|
NUM_BLOCKS: tl.constexpr,
|
||||||
):
|
):
|
||||||
tid = tl.program_id(0)
|
tid = tl.program_id(0)
|
||||||
offset = tl.arange(0, HEAD_DIM)
|
offset = tl.arange(0, HEAD_DIM)
|
||||||
batch_id = tl.load(token_to_seq_ptr + tid)
|
valid_tid = tid < NUM_TOKENS
|
||||||
batch_start = tl.load(cu_seqlen_ptr + batch_id)
|
batch_id = tl.load(token_to_seq_ptr + tid, mask=valid_tid, other=-1)
|
||||||
batch_end = tl.load(cu_seqlen_ptr + batch_id + 1)
|
valid_batch = (batch_id >= 0) & (batch_id < NUM_BATCHES)
|
||||||
|
safe_batch_id = tl.where(valid_batch, batch_id, 0)
|
||||||
|
batch_start = tl.load(cu_seqlen_ptr + safe_batch_id, mask=valid_batch, other=0)
|
||||||
|
batch_end = tl.load(cu_seqlen_ptr + safe_batch_id + 1, mask=valid_batch, other=0)
|
||||||
batch_offset = tid - batch_start
|
batch_offset = tid - batch_start
|
||||||
if tid >= batch_end:
|
valid_token = valid_tid & valid_batch & (tid >= batch_start) & (tid < batch_end)
|
||||||
|
if not valid_token:
|
||||||
return
|
return
|
||||||
block_table_id = batch_offset // block_size
|
block_table_id = batch_offset // block_size
|
||||||
block_offset = batch_offset % block_size
|
block_offset = batch_offset % block_size
|
||||||
block_table_offset = batch_id * block_table_stride + block_table_id
|
valid_block_table = (
|
||||||
block_id = tl.load(block_table_ptr + block_table_offset)
|
valid_token
|
||||||
tiled_block_id = block_offset // BLOCK_TILE_SIZE
|
& (block_table_id >= 0)
|
||||||
tiled_block_offset = block_offset % BLOCK_TILE_SIZE
|
& (block_table_id < BLOCK_TABLE_WIDTH)
|
||||||
|
& (block_offset >= 0)
|
||||||
|
& (block_offset < block_size)
|
||||||
|
)
|
||||||
|
safe_block_table_id = tl.where(valid_block_table, block_table_id, 0)
|
||||||
|
block_table_offset = safe_batch_id * block_table_stride + safe_block_table_id
|
||||||
|
block_id = tl.load(
|
||||||
|
block_table_ptr + block_table_offset, mask=valid_block_table, other=-1
|
||||||
|
)
|
||||||
|
valid_block = valid_block_table & (block_id >= 0) & (block_id < NUM_BLOCKS)
|
||||||
|
safe_block_id = tl.where(valid_block, block_id, 0)
|
||||||
|
safe_block_offset = tl.where(valid_block, block_offset, 0)
|
||||||
|
tiled_block_offset = safe_block_offset % BLOCK_TILE_SIZE
|
||||||
if LAYOUT == "SHUFFLE":
|
if LAYOUT == "SHUFFLE":
|
||||||
src_cache_offset = (
|
src_cache_offset = (
|
||||||
block_id * kv_cache_stride
|
safe_block_id * kv_cache_stride
|
||||||
+ tiled_block_id * HEAD_DIM * BLOCK_TILE_SIZE
|
+ (safe_block_offset // BLOCK_TILE_SIZE) * HEAD_DIM * BLOCK_TILE_SIZE
|
||||||
+ tiled_block_offset * HEAD_TILE_SIZE
|
+ tiled_block_offset * HEAD_TILE_SIZE
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
src_cache_offset = block_id * kv_cache_stride + block_offset * HEAD_DIM
|
src_cache_offset = (
|
||||||
src_scale_offset = block_id * kv_cache_scale_stride + block_offset
|
safe_block_id * kv_cache_stride + safe_block_offset * HEAD_DIM
|
||||||
|
)
|
||||||
|
src_scale_offset = safe_block_id * kv_cache_scale_stride + safe_block_offset
|
||||||
dst_offset = tid * HEAD_DIM
|
dst_offset = tid * HEAD_DIM
|
||||||
src_scale_ptr = kv_cache_scale_ptr + src_scale_offset
|
src_scale_ptr = kv_cache_scale_ptr + src_scale_offset
|
||||||
src_cache_ptr = kv_cache_ptr + src_cache_offset
|
src_cache_ptr = kv_cache_ptr + src_cache_offset
|
||||||
dst_k_ptr = k_fp8_ptr + dst_offset
|
dst_k_ptr = k_fp8_ptr + dst_offset
|
||||||
scale_val = tl.load(src_scale_ptr)
|
scale_val = tl.load(src_scale_ptr, mask=valid_block, other=0.0)
|
||||||
tl.store(k_scale_ptr + tid, scale_val)
|
tl.store(k_scale_ptr + tid, scale_val)
|
||||||
if LAYOUT == "SHUFFLE":
|
if LAYOUT == "SHUFFLE":
|
||||||
tiled_src_offset = (
|
tiled_src_offset = (
|
||||||
@@ -182,7 +204,7 @@ def _cp_gather_indexer_quant_cache_kernel(
|
|||||||
else:
|
else:
|
||||||
tiled_src_offset = offset
|
tiled_src_offset = offset
|
||||||
val = tl.load(src_cache_ptr + tiled_src_offset)
|
val = tl.load(src_cache_ptr + tiled_src_offset)
|
||||||
tl.store(dst_k_ptr + offset, val)
|
tl.store(dst_k_ptr + offset, val, mask=valid_block)
|
||||||
|
|
||||||
|
|
||||||
def cp_gather_indexer_k_quant_cache_triton(
|
def cp_gather_indexer_k_quant_cache_triton(
|
||||||
@@ -223,6 +245,10 @@ def cp_gather_indexer_k_quant_cache_triton(
|
|||||||
head_dim,
|
head_dim,
|
||||||
block_tile_size,
|
block_tile_size,
|
||||||
head_tile_size,
|
head_tile_size,
|
||||||
|
num_tokens,
|
||||||
|
cu_seqlen.shape[0] - 1,
|
||||||
|
block_table.shape[1],
|
||||||
|
num_blocks,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -943,8 +969,9 @@ def _pack_dense_prefix_to_ragged_kernel(
|
|||||||
return
|
return
|
||||||
|
|
||||||
mask = offsets < row_len
|
mask = offsets < row_len
|
||||||
|
safe_offsets = tl.where(offsets < row_width, offsets, 0)
|
||||||
vals = tl.load(
|
vals = tl.load(
|
||||||
indices_ptr + row_idx * indices_stride0 + offsets,
|
indices_ptr + row_idx * indices_stride0 + safe_offsets,
|
||||||
mask=mask & (offsets < row_width),
|
mask=mask & (offsets < row_width),
|
||||||
other=-1,
|
other=-1,
|
||||||
).to(tl.int32)
|
).to(tl.int32)
|
||||||
@@ -1060,9 +1087,12 @@ def _sparse_attn_prefill_ragged_kernel(
|
|||||||
in_range = k_pos < kv_len
|
in_range = k_pos < kv_len
|
||||||
slot = tl.load(kv_indices_ptr + kv_start + k_pos, mask=in_range, other=-1)
|
slot = tl.load(kv_indices_ptr + kv_start + k_pos, mask=in_range, other=-1)
|
||||||
valid = in_range & (slot >= 0) & (slot < num_kv)
|
valid = in_range & (slot >= 0) & (slot < num_kv)
|
||||||
|
safe_slot = tl.where(valid, slot, 0)
|
||||||
|
|
||||||
kv = tl.load(
|
kv = tl.load(
|
||||||
kv_ptr + slot[:, None] * kv_stride_n + dim_offsets[None, :] * kv_stride_d,
|
kv_ptr
|
||||||
|
+ safe_slot[:, None] * kv_stride_n
|
||||||
|
+ dim_offsets[None, :] * kv_stride_d,
|
||||||
mask=valid[:, None] & dim_mask[None, :],
|
mask=valid[:, None] & dim_mask[None, :],
|
||||||
other=0.0,
|
other=0.0,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -240,6 +240,10 @@ class SpecDecodeBaseProposer:
|
|||||||
# Determine allowed attention backends once during initialization.
|
# Determine allowed attention backends once during initialization.
|
||||||
self.allowed_attn_types: tuple | None = None
|
self.allowed_attn_types: tuple | None = None
|
||||||
if current_platform.is_rocm():
|
if current_platform.is_rocm():
|
||||||
|
from vllm.models.deepseek_v4.amd.rocm import (
|
||||||
|
DeepseekV4ROCMAiterMLASparseMetadata,
|
||||||
|
DeepseekV4ROCMAiterSparseSWAMetadata,
|
||||||
|
)
|
||||||
from vllm.v1.attention.backends.mla.indexer import (
|
from vllm.v1.attention.backends.mla.indexer import (
|
||||||
DeepseekV32IndexerMetadata,
|
DeepseekV32IndexerMetadata,
|
||||||
)
|
)
|
||||||
@@ -252,6 +256,8 @@ class SpecDecodeBaseProposer:
|
|||||||
TritonAttentionMetadata,
|
TritonAttentionMetadata,
|
||||||
RocmAttentionMetadata,
|
RocmAttentionMetadata,
|
||||||
ROCMAiterMLASparseMetadata,
|
ROCMAiterMLASparseMetadata,
|
||||||
|
DeepseekV4ROCMAiterMLASparseMetadata,
|
||||||
|
DeepseekV4ROCMAiterSparseSWAMetadata,
|
||||||
DeepseekV32IndexerMetadata,
|
DeepseekV32IndexerMetadata,
|
||||||
]
|
]
|
||||||
# ROCM_AITER_FA is an optional backend
|
# ROCM_AITER_FA is an optional backend
|
||||||
|
|||||||
Reference in New Issue
Block a user