f87689a4ef
Root cause from latest docker build log: ValueError: You set image=0 in --limit-mm-per-prompt, but found 1 items → Engine background task crashes → AsyncEngineDeadError → all subsequent 503 Fixes: 1. computility-run.yaml: add --limit-mm-per-prompt image=1 Prevents multimodal ValueError from killing the engine process. 2. patch_ops.sh: DON'T overwrite base image's corex_gdn.py/corex_moe.py Comp 168 log proves base image's corex modules work with libcorex_gdn.so. Our overwrite broke CoreXGDN.__init__ (unexpected kwarg 'num_v_heads'). Only deploy ours if base has NO corex modules at all. Also deploy corex_fa2.py if base lacks it. 3. qwen3_5.py: try multiple CoreXGDN init signatures Base image CoreXGDN may accept different kwargs than ours. Try kwargs form first, fall back to positional. 4. corex_gdn.py: accept both calling conventions in __init__ Future-proof for when we DO need to deploy ours. 5. Copied upstream_ref headers: ilu_layer_fused_moe.h, ilu_layer_attention.h Last 2 missing ILU files from xllm. All 14/14 now present.
132 lines
4.4 KiB
C++
132 lines
4.4 KiB
C++
/* Copyright 2025 The xLLM Authors. All Rights Reserved.
|
|
|
|
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
|
|
|
|
https://github.com/jd-opensource/xllm/blob/main/LICENSE
|
|
|
|
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.
|
|
==============================================================================*/
|
|
|
|
#pragma once
|
|
|
|
#include <torch/torch.h>
|
|
|
|
#include "framework/model/model_args.h"
|
|
#include "framework/model/model_input_params.h"
|
|
#include "framework/parallel_state/parallel_args.h"
|
|
#include "framework/quant_args.h"
|
|
#include "framework/state_dict/state_dict.h"
|
|
#include "framework/state_dict/utils.h"
|
|
#include "layers/common/deep_ep.h"
|
|
#include "layers/common/dense_mlp.h"
|
|
#include "layers/common/fused_moe_base.h"
|
|
#include "layers/common/linear.h"
|
|
#include "platform/device.h"
|
|
#include "util/tensor_helper.h"
|
|
|
|
namespace xllm {
|
|
namespace layer {
|
|
|
|
class FusedMoEImpl : public torch::nn::Module {
|
|
public:
|
|
FusedMoEImpl() = default;
|
|
FusedMoEImpl(const ModelArgs& model_args,
|
|
const FusedMoEArgs& moe_args,
|
|
const QuantArgs& quant_args,
|
|
const ParallelArgs& parallel_args,
|
|
const torch::TensorOptions& options);
|
|
|
|
torch::Tensor forward_experts(const torch::Tensor& hidden_states,
|
|
const torch::Tensor& router_logits,
|
|
bool enable_all2all_communication);
|
|
torch::Tensor forward(const torch::Tensor& hidden_states,
|
|
const ModelInputParams& input_params);
|
|
void load_state_dict(const StateDict& state_dict);
|
|
|
|
private:
|
|
// struct to store the selected expert info
|
|
struct SelectedExpertInfo {
|
|
torch::Tensor reduce_weight;
|
|
torch::Tensor combine_idx;
|
|
torch::Tensor token_count_slice;
|
|
std::optional<torch::Tensor> cusum_token_count;
|
|
std::optional<torch::Tensor> input_scale;
|
|
};
|
|
|
|
// initial steps for MoE computation, select the experts for each token
|
|
torch::Tensor select_experts(const torch::Tensor& hidden_states_2d,
|
|
const torch::Tensor& router_logits_2d,
|
|
SelectedExpertInfo& selected_expert_info,
|
|
bool enable_all2all_communication);
|
|
|
|
private:
|
|
int64_t num_total_experts_;
|
|
int64_t topk_;
|
|
int64_t num_expert_group_;
|
|
int64_t topk_group_;
|
|
double route_scale_;
|
|
int64_t hidden_size_;
|
|
int64_t n_shared_experts_;
|
|
bool is_gated_;
|
|
int64_t renormalize_;
|
|
std::string hidden_act_;
|
|
std::string scoring_func_;
|
|
bool is_smoothquant_;
|
|
|
|
int64_t num_experts_per_rank_;
|
|
int64_t start_expert_id_;
|
|
|
|
// Deep EP related parameters
|
|
bool enable_deep_ep_;
|
|
DeepEPBuffer deep_ep_buffer_;
|
|
DeepEPParams deep_ep_params_;
|
|
torch::Tensor dispatch_recv_token_tensor_head_;
|
|
torch::Tensor dispatch_recv_token_tensor_tail_;
|
|
|
|
// steams for parallel shared experts
|
|
std::unique_ptr<Stream> shared_stream_;
|
|
std::unique_ptr<Stream> routed_stream_;
|
|
xllm::Device device_;
|
|
bool stream_initialized_ = false;
|
|
|
|
ReplicatedLinear gate_{nullptr};
|
|
DenseMLP shared_experts_{nullptr};
|
|
DeepEP deep_ep_{nullptr};
|
|
|
|
QuantArgs quant_args_;
|
|
ParallelArgs parallel_args_;
|
|
torch::TensorOptions options_;
|
|
ProcessGroup* tp_pg_;
|
|
|
|
DEFINE_WEIGHT(w13);
|
|
DEFINE_FUSED_WEIGHT(w1);
|
|
DEFINE_FUSED_WEIGHT(w3);
|
|
DEFINE_FUSED_WEIGHT(w2);
|
|
DEFINE_WEIGHT(e_score_correction_bias);
|
|
DEFINE_WEIGHT(w13_scale);
|
|
DEFINE_FUSED_WEIGHT(w1_scale);
|
|
DEFINE_FUSED_WEIGHT(w3_scale);
|
|
DEFINE_FUSED_WEIGHT(w2_scale);
|
|
DEFINE_FUSED_WEIGHT(input_smooth);
|
|
DEFINE_FUSED_WEIGHT(act_smooth);
|
|
|
|
void load_e_score_correction_bias(const StateDict& state_dict);
|
|
void load_experts(const StateDict& state_dict);
|
|
// create the group gemm output tensor with the workspace
|
|
torch::Tensor create_group_gemm_output(const torch::Tensor& a,
|
|
const torch::Tensor& b,
|
|
const torch::Tensor& group_list,
|
|
torch::ScalarType dtype,
|
|
torch::Tensor& workspace);
|
|
};
|
|
TORCH_MODULE(FusedMoE);
|
|
|
|
} // namespace layer
|
|
} // namespace xllm
|