[Mypy Fix] Mypy fix for "vllm/model_executor/models/[aA][bB]" (#48977)

Signed-off-by: yewentao256 <zhyanwentao@126.com>
This commit is contained in:
Wentao Ye
2026-08-06 19:30:15 +00:00
committed by GitHub
parent d8eabdbfbe
commit adc3e03517
23 changed files with 214 additions and 167 deletions
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: Apache-2.0
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
import copy
from collections.abc import Iterable
from collections.abc import Callable, Iterable
import torch
import torch.nn as nn
@@ -133,19 +133,21 @@ class BailingMoeV25MLAAttention(nn.Module):
if self.q_lora_rank is not None:
# Use fused_qkv_a_proj when q_lora_rank is set
self.fused_qkv_a_proj = MergedColumnParallelLinear(
self.hidden_size,
[self.q_lora_rank, self.kv_lora_rank + self.qk_rope_head_dim],
bias=False,
quant_config=quant_config,
prefix=f"{prefix}.fused_qkv_a_proj",
disable_tp=True,
self.fused_qkv_a_proj: MergedColumnParallelLinear | None = (
MergedColumnParallelLinear(
self.hidden_size,
[self.q_lora_rank, self.kv_lora_rank + self.qk_rope_head_dim],
bias=False,
quant_config=quant_config,
prefix=f"{prefix}.fused_qkv_a_proj",
disable_tp=True,
)
)
self.q_a_layernorm = RMSNorm(
self.q_a_layernorm: RMSNorm | None = RMSNorm(
self.q_lora_rank,
eps=config.rms_norm_eps,
)
self.q_b_proj = ColumnParallelLinear(
self.q_b_proj: ColumnParallelLinear | None = ColumnParallelLinear(
self.q_lora_rank,
self.num_heads * self.qk_head_dim,
bias=False,
@@ -311,6 +313,8 @@ class BailingMoeV25(nn.Module):
"score_function and correction_bias should be "
"(softmax, None) or (sigmoid, not None)"
)
else:
self.score_function = "softmax"
# Shared experts (using BailingMLP)
if self.num_shared_experts > 0:
@@ -319,7 +323,7 @@ class BailingMoeV25(nn.Module):
else:
intermediate_size = config.moe_intermediate_size
intermediate_size *= config.num_shared_experts
self.shared_experts = BailingMLP(
self.shared_experts: BailingMLP | None = BailingMLP(
intermediate_size=intermediate_size,
config=config,
quant_config=quant_config,
@@ -613,7 +617,9 @@ class BailingMoeV25Model(nn.Module):
return False
param = params_dict[name]
weight_loader = getattr(param, "weight_loader", default_weight_loader)
weight_loader: Callable[..., None] = getattr(
param, "weight_loader", default_weight_loader
)
if shard_id is None:
weight_loader(param, tensor)
@@ -691,11 +697,16 @@ class BailingMoeV25Model(nn.Module):
continue
# Routed experts
for param_name, weight_name, expert_id, shard_id in expert_mappings:
for (
param_name,
weight_name,
expert_id,
expert_shard_id,
) in expert_mappings:
if weight_name not in norm_name:
continue
mapped = norm_name.replace(weight_name, param_name)
if load_param(mapped, weight, (expert_id, shard_id)):
if load_param(mapped, weight, (expert_id, expert_shard_id)):
break
continue
@@ -783,7 +794,7 @@ class BailingMoeV25ForCausalLM(nn.Module, HasInnerState, IsHybrid, SupportsPP):
def get_mamba_state_shape_from_config(
cls,
vllm_config: VllmConfig,
) -> tuple[tuple[int, ...], ...]:
) -> tuple[tuple[int, int, int]]:
"""Calculate shape for linear attention cache."""
config = vllm_config.model_config.hf_config
tp_size = vllm_config.parallel_config.tensor_parallel_size