### What this PR does / why we need it? This is the step 1 of refactoring code to adapt with vllm main, and this pr aligned with17c540a9931. refactor deepseek to the latest code arch as of17c540a9932. bunches of fixes due to vllm changes - Fix `AscendScheduler` `__post_init__`, caused by https://github.com/vllm-project/vllm/pull/25075 - Fix `AscendScheduler` init got an unexpected arg `block_size`, caused by https://github.com/vllm-project/vllm/pull/26296 - Fix `KVCacheManager` `get_num_common_prefix_blocks` arg, caused by https://github.com/vllm-project/vllm/pull/23485 - Fix `MLAAttention` import,caused by https://github.com/vllm-project/vllm/pull/25103 - Fix `SharedFusedMoE` import, caused by https://github.com/vllm-project/vllm/pull/26145 - Fix `LazyLoader` improt, caused by https://github.com/vllm-project/vllm/pull/27022 - Fix `vllm.utils.swap_dict_values` improt, caused by https://github.com/vllm-project/vllm/pull/26990 - Fix `Backend` enum import, caused by https://github.com/vllm-project/vllm/pull/25893 - Fix `CompilationLevel` renaming to `CompilationMode` issue introduced by https://github.com/vllm-project/vllm/pull/26355 - Fix fused_moe ops, caused by https://github.com/vllm-project/vllm/pull/24097 - Fix bert model because of `inputs_embeds`, caused by https://github.com/vllm-project/vllm/pull/25922 - Fix MRope because of `get_input_positions_tensor` to `get_mrope_input_positions`, caused by https://github.com/vllm-project/vllm/pull/24172 - Fix `splitting_ops` changes introduced by https://github.com/vllm-project/vllm/pull/25845 - Fix multi-modality changes introduced by https://github.com/vllm-project/vllm/issues/16229 - Fix lora bias dropping issue introduced by https://github.com/vllm-project/vllm/pull/25807 - Fix structured ouput break introduced by https://github.com/vllm-project/vllm/issues/26737 ### Does this PR introduce _any_ user-facing change? ### How was this patch tested? CI passed with existing test. - vLLM version: v0.11.0rc3 - vLLM main: https://github.com/vllm-project/vllm/commit/v0.11.0 --------- Signed-off-by: MengqingCao <cmq0113@163.com> Signed-off-by: Icey <1790571317@qq.com> Co-authored-by: Icey <1790571317@qq.com>
275 lines
11 KiB
Python
275 lines
11 KiB
Python
# SPDX-License-Identifier: Apache-2.0
|
|
# Copyright (c) 2025 Huawei Technologies Co., Ltd. All Rights Reserved.
|
|
# Copyright 2023 The vLLM team.
|
|
# Copyright 2023 DeepSeek-AI and the HuggingFace Inc. team. All rights reserved.
|
|
#
|
|
# This code is based on EleutherAI's GPT-NeoX library and the GPT-NeoX
|
|
# and OPT implementations in this library. It has been modified from its
|
|
# original forms to accommodate minor architectural differences compared
|
|
# to GPT-NeoX and OPT used by the Meta AI team that trained the model.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
from dataclasses import dataclass
|
|
from typing import Optional
|
|
|
|
import torch
|
|
from torch import nn
|
|
from vllm.attention import AttentionMetadata
|
|
from vllm.config import CacheConfig, get_current_vllm_config
|
|
from vllm.distributed import get_tensor_model_parallel_world_size
|
|
from vllm.forward_context import ForwardContext, get_forward_context
|
|
from vllm.model_executor.layers.linear import ReplicatedLinear
|
|
from vllm.model_executor.layers.mla import MLAModules
|
|
from vllm.model_executor.layers.quantization import QuantizationConfig
|
|
from vllm.utils import direct_register_custom_op
|
|
|
|
from vllm_ascend.ascend_config import get_ascend_config
|
|
from vllm_ascend.utils import vllm_version_is
|
|
|
|
if vllm_version_is("0.11.0"):
|
|
from vllm.attention import Attention
|
|
from vllm.model_executor.layers.mla import \
|
|
MultiHeadLatentAttention as MultiHeadLatentAttentionWrapper
|
|
else:
|
|
from vllm.attention.layer import MLAAttention
|
|
from vllm.model_executor.layers.mla import MultiHeadLatentAttentionWrapper
|
|
|
|
|
|
@dataclass
|
|
class AscendSFAModules:
|
|
q_a_layernorm: Optional[torch.nn.Module]
|
|
q_proj: Optional[torch.nn.Module]
|
|
kv_a_proj_with_mqa: torch.nn.Module
|
|
kv_a_layernorm: torch.nn.Module
|
|
kv_b_proj: torch.nn.Module
|
|
o_proj: torch.nn.Module
|
|
rotary_emb: torch.nn.Module
|
|
indexer: torch.nn.Module
|
|
is_sparse: bool
|
|
fused_qkv_a_proj: Optional[torch.nn.Module]
|
|
q_b_proj: Optional[torch.nn.Module]
|
|
topk_indices_buffer: Optional[torch.Tensor]
|
|
|
|
|
|
class AscendSparseFlashAttention(MultiHeadLatentAttentionWrapper):
|
|
|
|
def __init__(
|
|
self,
|
|
hidden_size: int,
|
|
num_heads: int,
|
|
scale: float,
|
|
qk_nope_head_dim: int,
|
|
qk_rope_head_dim: int,
|
|
v_head_dim: int,
|
|
q_lora_rank: Optional[int],
|
|
kv_lora_rank: int,
|
|
mla_modules: MLAModules,
|
|
cache_config: Optional[CacheConfig] = None,
|
|
quant_config: Optional[QuantizationConfig] = None,
|
|
prefix: str = "",
|
|
) -> None:
|
|
nn.Module.__init__(self)
|
|
self.hidden_size = hidden_size
|
|
self.kv_lora_rank = kv_lora_rank
|
|
self.qk_rope_head_dim = qk_rope_head_dim
|
|
self.q_lora_rank = q_lora_rank
|
|
self.qk_nope_head_dim = qk_nope_head_dim
|
|
self.qk_head_dim = qk_rope_head_dim + qk_nope_head_dim
|
|
self.v_head_dim = v_head_dim
|
|
self.prefix = prefix
|
|
self.scaling = scale
|
|
self.indexer = mla_modules.indexer
|
|
self.is_sparse = mla_modules.is_sparse
|
|
hf_config = get_current_vllm_config().model_config.hf_config
|
|
self.enable_shared_expert_dp = get_ascend_config(
|
|
).enable_shared_expert_dp
|
|
self.debug_layer_idx = int(self.prefix.split(".")[-2])
|
|
self.first_k_dense_replace = hf_config.first_k_dense_replace
|
|
self.tp_size = get_tensor_model_parallel_world_size()
|
|
self.layers = hf_config.num_hidden_layers
|
|
|
|
if vllm_version_is("0.11.0"):
|
|
self.sfa_attn = Attention(
|
|
num_heads=num_heads,
|
|
head_size=self.kv_lora_rank + self.qk_rope_head_dim,
|
|
scale=scale,
|
|
num_kv_heads=1,
|
|
cache_config=cache_config,
|
|
quant_config=quant_config,
|
|
prefix=f"{prefix}.attn",
|
|
use_mla=True,
|
|
use_sparse=True,
|
|
indexer=self.indexer,
|
|
# SFA Args
|
|
q_lora_rank=self.q_lora_rank,
|
|
kv_lora_rank=self.kv_lora_rank,
|
|
qk_nope_head_dim=self.qk_nope_head_dim,
|
|
qk_rope_head_dim=self.qk_rope_head_dim,
|
|
v_head_dim=self.v_head_dim,
|
|
qk_head_dim=self.qk_head_dim,
|
|
rotary_emb=mla_modules.rotary_emb,
|
|
fused_qkv_a_proj=mla_modules.fused_qkv_a_proj,
|
|
q_b_proj=mla_modules.q_b_proj,
|
|
q_a_layernorm=mla_modules.q_a_layernorm,
|
|
q_proj=mla_modules.q_proj,
|
|
kv_a_proj_with_mqa=mla_modules.kv_a_proj_with_mqa,
|
|
kv_a_layernorm=mla_modules.kv_a_layernorm,
|
|
kv_b_proj=mla_modules.kv_b_proj,
|
|
o_proj=mla_modules.o_proj,
|
|
)
|
|
else:
|
|
self.sfa_attn = MLAAttention(
|
|
num_heads=num_heads,
|
|
scale=scale,
|
|
qk_nope_head_dim=self.qk_nope_head_dim,
|
|
qk_rope_head_dim=self.qk_rope_head_dim,
|
|
v_head_dim=self.v_head_dim,
|
|
q_lora_rank=self.q_lora_rank,
|
|
kv_lora_rank=self.kv_lora_rank,
|
|
kv_b_proj=mla_modules.kv_b_proj,
|
|
cache_config=cache_config,
|
|
quant_config=quant_config,
|
|
prefix=f"{prefix}.attn",
|
|
use_sparse=mla_modules.is_sparse,
|
|
indexer=mla_modules.indexer,
|
|
# extra args
|
|
rotary_emb=mla_modules.rotary_emb,
|
|
fused_qkv_a_proj=mla_modules.fused_qkv_a_proj,
|
|
q_b_proj=mla_modules.q_b_proj,
|
|
q_a_layernorm=mla_modules.q_a_layernorm,
|
|
q_proj=mla_modules.q_proj,
|
|
kv_a_proj_with_mqa=mla_modules.kv_a_proj_with_mqa,
|
|
kv_a_layernorm=mla_modules.kv_a_layernorm,
|
|
o_proj=mla_modules.o_proj,
|
|
)
|
|
|
|
compilation_config = get_current_vllm_config().compilation_config
|
|
if prefix in compilation_config.static_forward_context:
|
|
raise ValueError(f"Duplicate layer name: {prefix}")
|
|
compilation_config.static_forward_context[prefix] = self
|
|
|
|
def forward(
|
|
self,
|
|
positions: torch.Tensor,
|
|
hidden_states: torch.Tensor,
|
|
kv_cache: Optional[torch.Tensor] = None,
|
|
attn_metadata: Optional[AttentionMetadata] = None) -> torch.Tensor:
|
|
num_tokens = hidden_states.shape[0]
|
|
need_gather_q_kv = False
|
|
if self.enable_shared_expert_dp and self.debug_layer_idx > self.first_k_dense_replace and self.debug_layer_idx < self.layers:
|
|
# Simulate all gather to calculate output shape
|
|
num_tokens = num_tokens * self.tp_size
|
|
need_gather_q_kv = True
|
|
if not self.enable_shared_expert_dp or self.debug_layer_idx < self.first_k_dense_replace:
|
|
output_shape = hidden_states.shape
|
|
else:
|
|
rows = num_tokens // self.tp_size
|
|
if num_tokens % self.tp_size:
|
|
rows += 1
|
|
output_shape = (rows, hidden_states.shape[1])
|
|
# FIXME: This does not seem right, should make sure the buffer is fixed
|
|
output = torch.empty(output_shape,
|
|
dtype=hidden_states.dtype,
|
|
device=hidden_states.device)
|
|
torch.ops.vllm.sfa_forward(hidden_states, need_gather_q_kv, output,
|
|
self.prefix)
|
|
output = output.view(-1, output_shape[-1])
|
|
return output
|
|
|
|
|
|
def sfa_forward(
|
|
hidden_states: torch.Tensor,
|
|
need_gather_q_kv: bool,
|
|
output: torch.Tensor,
|
|
layer_name: str,
|
|
) -> None:
|
|
forward_context: ForwardContext = get_forward_context()
|
|
self = forward_context.no_compile_layers[layer_name]
|
|
if forward_context.attn_metadata:
|
|
attn_metadata = forward_context.attn_metadata[self.sfa_attn.layer_name]
|
|
else:
|
|
attn_metadata = forward_context.attn_metadata
|
|
kv_cache = self.sfa_attn.kv_cache[forward_context.virtual_engine]
|
|
self.sfa_attn.impl.forward(hidden_states, kv_cache, attn_metadata,
|
|
need_gather_q_kv, output)
|
|
return
|
|
|
|
|
|
class Indexer(nn.Module):
|
|
|
|
def __init__(self,
|
|
config,
|
|
dim: int = 7168,
|
|
n_heads: int = 64,
|
|
head_dim: int = 128,
|
|
index_topk: int = 2048,
|
|
q_lora_rank: int = 1536,
|
|
rope_head_dim: int = 64,
|
|
quant_config: Optional[QuantizationConfig] = None,
|
|
prefix: Optional[str] = ""):
|
|
super().__init__()
|
|
|
|
self.dim: int = dim # 7168
|
|
self.n_heads: int = n_heads # 64
|
|
self.head_dim: int = head_dim # 128
|
|
self.rope_head_dim: int = rope_head_dim # 64
|
|
self.index_topk: int = index_topk # 2048
|
|
self.q_lora_rank: int = q_lora_rank # 1536
|
|
self.wq_b = ReplicatedLinear(
|
|
self.q_lora_rank,
|
|
self.n_heads * self.head_dim,
|
|
bias=False,
|
|
quant_config=quant_config,
|
|
prefix=f"{prefix}.wq_b",
|
|
return_bias=False,
|
|
)
|
|
self.wk = ReplicatedLinear(
|
|
self.dim,
|
|
self.head_dim,
|
|
bias=False,
|
|
quant_config=quant_config,
|
|
prefix=f"{prefix}.wk",
|
|
return_bias=False,
|
|
)
|
|
self.weights_proj = ReplicatedLinear(
|
|
self.dim,
|
|
self.n_heads,
|
|
bias=False,
|
|
quant_config=quant_config,
|
|
prefix=f"{prefix}.weights_proj",
|
|
return_bias=False,
|
|
)
|
|
self.k_norm = nn.LayerNorm(self.head_dim)
|
|
self.softmax_scale = self.head_dim**-0.5
|
|
|
|
def forward(self):
|
|
return
|
|
|
|
|
|
def sfa_forward_fake(
|
|
hidden_states: torch.Tensor,
|
|
need_gather_q_kv: bool,
|
|
output: torch.Tensor,
|
|
layer_name: str,
|
|
) -> None:
|
|
return
|
|
|
|
|
|
direct_register_custom_op(
|
|
op_name="sfa_forward",
|
|
op_func=sfa_forward,
|
|
mutates_args=["output"],
|
|
fake_impl=sfa_forward_fake,
|
|
dispatch_key="PrivateUse1",
|
|
)
|