Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions csrc/layers/mlp/moe_mlp.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ class MoeMLP : public infinicore::nn::Module {

size_t hidden_size() const { return hidden_size_; }
size_t moe_intermediate_size() const { return moe_intermediate_size_; }
infinicore::Tensor gate_weight() const { return gate_proj_->weight(); }
infinicore::Tensor up_weight() const { return up_proj_->weight(); }
infinicore::Tensor down_weight() const { return down_proj_->weight(); }
void set_alpha(float alpha) { down_proj_->set_alpha(alpha); }

protected:
Expand Down
183 changes: 183 additions & 0 deletions csrc/models/deepseek_v2/deepseek_v2_attention.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,183 @@
#include "deepseek_v2_attention.hpp"

#include "../../global_state/global_state.hpp"
#include "../../utils.hpp"
#include "infinicore/ops.hpp"
#include "infinicore/ops/broadcast_to.hpp"
#include "infinicore/ops/cat.hpp"
#include "infinicore/ops/pad.hpp"

#include <cmath>
#include <stdexcept>

namespace infinilm::models::deepseek_v2 {
namespace {

float yarn_get_mscale(float scale, float mscale) {
if (scale <= 1.0f) {
return 1.0f;
}
return 0.1f * mscale * std::log(scale) + 1.0f;
}

} // namespace

DeepseekV2Attention::DeepseekV2Attention(std::shared_ptr<infinilm::config::ModelConfig> model_config,
size_t layer_idx,
const infinicore::Device &device) {
layer_idx_ = layer_idx;
hidden_size_ = model_config->get<size_t>("hidden_size");
qk_nope_head_dim_ = model_config->get<size_t>("qk_nope_head_dim");
qk_rope_head_dim_ = model_config->get<size_t>("qk_rope_head_dim");
q_head_dim_ = qk_nope_head_dim_ + qk_rope_head_dim_;
v_head_dim_ = model_config->get<size_t>("v_head_dim");

const auto &dtype{model_config->get_dtype()};
const size_t total_num_heads = model_config->get<size_t>("num_attention_heads");
const size_t kv_lora_rank = model_config->get<size_t>("kv_lora_rank");
const bool attention_bias = model_config->get_or<bool>("attention_bias", false);
const double rms_norm_eps = model_config->get<double>("rms_norm_eps");

const auto &rank_info = infinilm::global_state::get_tensor_model_parallel_rank_info();
const int tp_rank = rank_info.tp_rank;
const int tp_size = rank_info.tp_size;
if ((total_num_heads < static_cast<size_t>(tp_size)) || (total_num_heads % static_cast<size_t>(tp_size) != 0)) {
throw std::runtime_error("DeepseekV2Attention: num_attention_heads must be divisible by tp_size");
}
num_attention_heads_ = total_num_heads / static_cast<size_t>(tp_size);
attention_backend_ = infinilm::global_state::get_infinilm_config().attention_backend;

auto quantization_method = model_config->get_quantization_method();
INFINICORE_NN_MODULE_INIT(q_proj, hidden_size_, total_num_heads * q_head_dim_, quantization_method, false, dtype, device, tp_rank, tp_size);
INFINICORE_NN_MODULE_INIT(kv_a_proj_with_mqa, hidden_size_, kv_lora_rank + qk_rope_head_dim_, attention_bias, dtype, device);
INFINICORE_NN_MODULE_INIT(kv_a_layernorm, kv_lora_rank, rms_norm_eps, dtype, device);
INFINICORE_NN_MODULE_INIT(kv_b_proj, kv_lora_rank, total_num_heads * (qk_nope_head_dim_ + v_head_dim_), quantization_method, false, dtype, device, tp_rank, tp_size);
INFINICORE_NN_MODULE_INIT(o_proj, total_num_heads * v_head_dim_, hidden_size_, quantization_method, attention_bias, dtype, device, tp_rank, tp_size, rank_info.comm);

const size_t max_position_embeddings = model_config->get<size_t>("max_position_embeddings");
const double rope_theta = model_config->get<double>("rope_theta");
rotary_emb_ = std::make_shared<infinicore::nn::RoPE>(
qk_rope_head_dim_, qk_rope_head_dim_, max_position_embeddings, rope_theta,
infinicore::nn::RoPE::Algo::GPT_J, dtype, device, nullptr);

softmax_scale_ = 1.0f / std::sqrt(static_cast<float>(q_head_dim_));
auto &config_json = model_config->get_config_json();
if (config_json.contains("rope_scaling") && config_json["rope_scaling"].is_object()) {
const auto &rope_scaling = config_json["rope_scaling"];
const float mscale_all_dim = rope_scaling.value("mscale_all_dim", 0.0f);
if (mscale_all_dim != 0.0f) {
const float scaling_factor = rope_scaling.value("factor", 1.0f);
const float mscale = yarn_get_mscale(scaling_factor, mscale_all_dim);
softmax_scale_ *= mscale * mscale;
}
}
Comment thread
wooway777 marked this conversation as resolved.

attn_ = std::make_shared<infinilm::layers::attention::AttentionLayer>(
num_attention_heads_, q_head_dim_, softmax_scale_, num_attention_heads_, layer_idx_,
kv_cache_k_scale_, kv_cache_v_scale_, attention_backend_);
infinilm::layers::attention::init_kv_cache_quant_params(
[this](const std::string &n, infinicore::nn::Parameter p) { this->register_parameter(n, std::move(p)); },
device, kv_cache_k_scale_, kv_cache_v_scale_);
}

infinicore::Tensor DeepseekV2Attention::position_ids_for_rope_(const infinicore::Tensor &position_ids) const {
auto pos_shape = position_ids->shape();
if (pos_shape.size() == 2) {
return position_ids->narrow({{0, 0, 1}})->contiguous()->view({pos_shape[1]});
}
if (pos_shape.size() == 1) {
return position_ids->contiguous();
}
throw std::runtime_error("DeepseekV2Attention: unexpected position_ids shape");
}

infinicore::Tensor DeepseekV2Attention::trim_value_padding_(const infinicore::Tensor &attn_output) const {
const auto shape = attn_output->shape();
const size_t batch_size = shape[0];
const size_t seq_len = shape[1];
return attn_output->view({batch_size, seq_len, num_attention_heads_, q_head_dim_})
->narrow({{3, 0, v_head_dim_}})
->contiguous()
->view({batch_size, seq_len, num_attention_heads_ * v_head_dim_});
}

infinicore::Tensor DeepseekV2Attention::forward(const infinicore::Tensor &positions,
const infinicore::Tensor &hidden_states) const {
if (::infinilm::backends::AttentionBackend::STATIC_ATTN == attention_backend_) {
return forward_static_(positions, hidden_states);
}
return forward_paged_(positions, hidden_states);
}

infinicore::Tensor DeepseekV2Attention::forward_static_(const infinicore::Tensor &position_ids,

@pengcheng888 pengcheng888 Jun 16, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vllm中写了三类attn

    if use_mha:
        attn_cls = DeepseekAttention
    elif model_config.use_mla:
        attn_cls = DeepseekV2MLAAttention
    else:
        attn_cls = DeepseekV2Attention

c++里得指的是 第三个DeepseekV2Attention 么, 那么是不带MLA得?

const infinicore::Tensor &hidden_states) const {
auto shape = hidden_states->shape();
const size_t batch_size = shape[0];
const size_t seq_len = shape[1];
auto hidden_states_mutable = hidden_states;

auto q = q_proj_->forward(hidden_states_mutable)->view({batch_size, seq_len, num_attention_heads_, q_head_dim_});
auto q_nope = q->narrow({{3, 0, qk_nope_head_dim_}});
auto q_pe = q->narrow({{3, qk_nope_head_dim_, qk_rope_head_dim_}})->contiguous();

auto compressed = kv_a_proj_with_mqa_->forward(hidden_states_mutable);
auto compressed_kv = compressed->narrow({{2, 0, kv_a_layernorm_->normalized_shape()}})->contiguous();
auto k_pe = compressed->narrow({{2, kv_a_layernorm_->normalized_shape(), qk_rope_head_dim_}})->contiguous();

auto kv_norm = kv_a_layernorm_->forward(compressed_kv);
auto kv = kv_b_proj_->forward(kv_norm)->view({batch_size, seq_len, num_attention_heads_, qk_nope_head_dim_ + v_head_dim_});
auto k_nope = kv->narrow({{3, 0, qk_nope_head_dim_}});
auto value_states = kv->narrow({{3, qk_nope_head_dim_, v_head_dim_}})->contiguous();

auto pos_ids = position_ids_for_rope_(position_ids);
q_pe = rotary_emb_->forward(q_pe, pos_ids, true);
auto k_pe_broadcast = infinicore::op::broadcast_to(k_pe->view({batch_size, seq_len, 1, qk_rope_head_dim_}),
{static_cast<int64_t>(batch_size), static_cast<int64_t>(seq_len), static_cast<int64_t>(num_attention_heads_), static_cast<int64_t>(qk_rope_head_dim_)});
k_pe_broadcast = rotary_emb_->forward(k_pe_broadcast, pos_ids, true);

auto query_states = infinicore::op::cat({q_nope, q_pe}, 3);
auto key_states = infinicore::op::cat({k_nope, k_pe_broadcast}, 3);
auto value_padded = infinicore::op::pad(value_states, {0, static_cast<int>(q_head_dim_ - v_head_dim_)}, "constant", 0.0);

auto attn_output = attn_->forward(query_states, key_states, value_padded);
auto trimmed_output = trim_value_padding_(attn_output);
return o_proj_->forward(trimmed_output);
}

infinicore::Tensor DeepseekV2Attention::forward_paged_(const infinicore::Tensor &position_ids,
const infinicore::Tensor &hidden_states) const {
auto shape = hidden_states->shape();
const size_t batch_size = shape[0];
const size_t seq_len = shape[1];
ASSERT_EQ(batch_size, 1);
auto hidden_states_mutable = hidden_states;

auto q = q_proj_->forward(hidden_states_mutable)->view({seq_len, num_attention_heads_, q_head_dim_});
auto q_nope = q->narrow({{2, 0, qk_nope_head_dim_}});
auto q_pe = q->narrow({{2, qk_nope_head_dim_, qk_rope_head_dim_}})->contiguous();

auto compressed = kv_a_proj_with_mqa_->forward(hidden_states_mutable)->view({seq_len, kv_a_layernorm_->normalized_shape() + qk_rope_head_dim_});
auto compressed_kv = compressed->narrow({{1, 0, kv_a_layernorm_->normalized_shape()}})->contiguous();
auto k_pe = compressed->narrow({{1, kv_a_layernorm_->normalized_shape(), qk_rope_head_dim_}})->contiguous();

auto kv_norm = kv_a_layernorm_->forward(compressed_kv);
auto kv = kv_b_proj_->forward(kv_norm)->view({seq_len, num_attention_heads_, qk_nope_head_dim_ + v_head_dim_});
auto k_nope = kv->narrow({{2, 0, qk_nope_head_dim_}});
auto value_states = kv->narrow({{2, qk_nope_head_dim_, v_head_dim_}})->contiguous();

auto pos_ids = position_ids_for_rope_(position_ids);
q_pe = rotary_emb_->forward(q_pe, pos_ids, true);
auto k_pe_broadcast = infinicore::op::broadcast_to(k_pe->view({seq_len, 1, qk_rope_head_dim_}),
Comment thread
wooway777 marked this conversation as resolved.
{static_cast<int64_t>(seq_len), static_cast<int64_t>(num_attention_heads_), static_cast<int64_t>(qk_rope_head_dim_)});
k_pe_broadcast = rotary_emb_->forward(k_pe_broadcast, pos_ids, true);

auto query_states = infinicore::op::cat({q_nope, q_pe}, 2);
Comment thread
wooway777 marked this conversation as resolved.
auto key_states = infinicore::op::cat({k_nope, k_pe_broadcast}, 2);
auto value_padded = infinicore::op::pad(value_states, {0, static_cast<int>(q_head_dim_ - v_head_dim_)}, "constant", 0.0);

auto attn_output = attn_->forward(query_states, key_states, value_padded);
auto trimmed_output = trim_value_padding_(attn_output);
return o_proj_->forward(trimmed_output);
}

} // namespace infinilm::models::deepseek_v2
54 changes: 54 additions & 0 deletions csrc/models/deepseek_v2/deepseek_v2_attention.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
#pragma once

#include "../../config/model_config.hpp"
#include "../../layers/attention/attention.hpp"
#include "../../layers/linear/linear.hpp"
#include "infinicore/nn/module.hpp"
#include "infinicore/nn/rmsnorm.hpp"
#include "infinicore/nn/rope.hpp"
#include "infinicore/tensor.hpp"

#include <memory>

namespace infinilm::models::deepseek_v2 {

class DeepseekV2Attention : public infinicore::nn::Module {
public:
DeepseekV2Attention(std::shared_ptr<infinilm::config::ModelConfig> model_config,
size_t layer_idx,
const infinicore::Device &device);

infinicore::Tensor forward(const infinicore::Tensor &positions,
const infinicore::Tensor &hidden_states) const;

private:
infinicore::Tensor forward_static_(const infinicore::Tensor &positions,
const infinicore::Tensor &hidden_states) const;
infinicore::Tensor forward_paged_(const infinicore::Tensor &positions,
const infinicore::Tensor &hidden_states) const;
infinicore::Tensor trim_value_padding_(const infinicore::Tensor &attn_output) const;
infinicore::Tensor position_ids_for_rope_(const infinicore::Tensor &position_ids) const;

size_t layer_idx_{0};
size_t hidden_size_{0};
size_t num_attention_heads_{0};
size_t qk_nope_head_dim_{0};
size_t qk_rope_head_dim_{0};
size_t q_head_dim_{0};
size_t v_head_dim_{0};
float softmax_scale_{1.0f};
infinilm::backends::AttentionBackend attention_backend_;

INFINICORE_NN_MODULE(infinilm::layers::linear::ColumnParallelLinear, q_proj);
INFINICORE_NN_MODULE(infinilm::layers::linear::ReplicatedLinear, kv_a_proj_with_mqa);
INFINICORE_NN_MODULE(infinicore::nn::RMSNorm, kv_a_layernorm);
INFINICORE_NN_MODULE(infinilm::layers::linear::ColumnParallelLinear, kv_b_proj);
INFINICORE_NN_MODULE(infinilm::layers::linear::RowParallelLinear, o_proj);

std::shared_ptr<infinicore::nn::RoPE> rotary_emb_;
std::shared_ptr<infinilm::layers::attention::AttentionLayer> attn_;
infinicore::nn::Parameter kv_cache_k_scale_;
infinicore::nn::Parameter kv_cache_v_scale_;
};

} // namespace infinilm::models::deepseek_v2
38 changes: 38 additions & 0 deletions csrc/models/deepseek_v2/deepseek_v2_decoder_layer.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#include "deepseek_v2_decoder_layer.hpp"

namespace infinilm::models::deepseek_v2 {

DeepseekV2DecoderLayer::DeepseekV2DecoderLayer(std::shared_ptr<infinilm::config::ModelConfig> model_config,
size_t layer_idx,
const infinicore::Device &device) {
const auto &dtype{model_config->get_dtype()};
const size_t hidden_size = model_config->get<size_t>("hidden_size");
const double rms_norm_eps = model_config->get<double>("rms_norm_eps");
INFINICORE_NN_MODULE_INIT(input_layernorm, hidden_size, rms_norm_eps, dtype, device);
INFINICORE_NN_MODULE_INIT(post_attention_layernorm, hidden_size, rms_norm_eps, dtype, device);
INFINICORE_NN_MODULE_INIT(self_attn, model_config, layer_idx, device);

const size_t first_k_dense_replace = model_config->get_or<size_t>("first_k_dense_replace", 0);
const size_t moe_layer_freq = model_config->get_or<size_t>("moe_layer_freq", 1);
use_moe_ = model_config->get_or<size_t>("n_routed_experts", 0) > 0
&& layer_idx >= first_k_dense_replace
&& (moe_layer_freq == 0 || layer_idx % moe_layer_freq == 0);
if (use_moe_) {
moe_mlp_ = this->register_module<DeepseekV2MoE>("mlp", model_config, device);
} else {
dense_mlp_ = this->register_module<DeepseekV2MLP>("mlp", model_config, device);
}
}

std::tuple<infinicore::Tensor, infinicore::Tensor>
DeepseekV2DecoderLayer::forward(const infinicore::Tensor &positions,
infinicore::Tensor &hidden_states,
infinicore::Tensor &residual) const {
input_layernorm_->forward_inplace(hidden_states, residual);
hidden_states = self_attn_->forward(positions, hidden_states);
post_attention_layernorm_->forward_inplace(hidden_states, residual);
hidden_states = use_moe_ ? moe_mlp_->forward(hidden_states) : dense_mlp_->forward(hidden_states);
return {hidden_states, residual};
}

} // namespace infinilm::models::deepseek_v2
35 changes: 35 additions & 0 deletions csrc/models/deepseek_v2/deepseek_v2_decoder_layer.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#pragma once

#include "../../config/model_config.hpp"
#include "deepseek_v2_attention.hpp"
#include "deepseek_v2_moe.hpp"
#include "infinicore/device.hpp"
#include "infinicore/nn/module.hpp"
#include "infinicore/nn/rmsnorm.hpp"
#include "infinicore/tensor.hpp"

#include <memory>
#include <tuple>

namespace infinilm::models::deepseek_v2 {

class DeepseekV2DecoderLayer : public infinicore::nn::Module {
public:
DeepseekV2DecoderLayer(std::shared_ptr<infinilm::config::ModelConfig> model_config,
size_t layer_idx,
const infinicore::Device &device);

std::tuple<infinicore::Tensor, infinicore::Tensor> forward(const infinicore::Tensor &positions,
infinicore::Tensor &hidden_states,
infinicore::Tensor &residual) const;

private:
INFINICORE_NN_MODULE(infinicore::nn::RMSNorm, input_layernorm);
INFINICORE_NN_MODULE(infinicore::nn::RMSNorm, post_attention_layernorm);
INFINICORE_NN_MODULE(DeepseekV2Attention, self_attn);
INFINICORE_NN_MODULE(DeepseekV2MLP, dense_mlp);
INFINICORE_NN_MODULE(DeepseekV2MoE, moe_mlp);
bool use_moe_{false};
};

} // namespace infinilm::models::deepseek_v2
Loading
Loading