diff --git a/tools/pre_commit/mypy.py b/tools/pre_commit/mypy.py index dba3c2afd0..8a832746f4 100755 --- a/tools/pre_commit/mypy.py +++ b/tools/pre_commit/mypy.py @@ -124,7 +124,7 @@ EXCLUDE = [ r"vllm/model_executor/models/[qQ]", r"vllm/model_executor/models/[rR]", r"vllm/model_executor/models/[sS]", - r"vllm/model_executor/models/[tT]", + r"vllm/model_executor/models/transformers", r"vllm/model_executor/models/[uU]", r"vllm/model_executor/models/[vV]", r"vllm/model_executor/models/[wW]", diff --git a/vllm/model_executor/models/telechat2.py b/vllm/model_executor/models/telechat2.py index 637c456dbe..18042f62cb 100644 --- a/vllm/model_executor/models/telechat2.py +++ b/vllm/model_executor/models/telechat2.py @@ -28,7 +28,7 @@ import torch.nn as nn from vllm.config import VllmConfig from vllm.model_executor.models.llama import LlamaForCausalLM, LlamaModel -from .llama import LlamaDecoderLayer +from .llama import LlamaAttention, LlamaDecoderLayer, LlamaMLP from .utils import AutoWeightsLoader, PPMissingLayer, WeightsMapper @@ -46,7 +46,7 @@ class TeleChat2Model(LlamaModel): def __init__(self, *, vllm_config: VllmConfig, prefix: str = ""): hf_config = vllm_config.model_config.hf_config - vllm_config.model_config.hf_config.attribute_map = { + vllm_config.model_config.hf_config.attribute_map = { # type: ignore[misc] "num_hidden_layers": "n_layer", "num_attention_heads": "n_head", "intermediate_size": "ffn_hidden_size", @@ -63,11 +63,16 @@ class TeleChat2Model(LlamaModel): # Telechat2's gate_up_proj and qkv_proj don't have bias # see: https://github.com/vllm-project/vllm/pull/10311#issuecomment-2490297566 for layer in self.layers: - if not isinstance(layer, PPMissingLayer): - layer.self_attn.qkv_proj.bias = None - layer.self_attn.qkv_proj.skip_bias_add = True - layer.mlp.gate_up_proj.bias = None - layer.mlp.gate_up_proj.skip_bias_add = True + if isinstance(layer, PPMissingLayer): + continue + self_attn = layer.self_attn + mlp = layer.mlp + assert isinstance(self_attn, LlamaAttention) + assert isinstance(mlp, LlamaMLP) + self_attn.qkv_proj.register_parameter("bias", None) + self_attn.qkv_proj.skip_bias_add = True + mlp.gate_up_proj.register_parameter("bias", None) + mlp.gate_up_proj.skip_bias_add = True def _split_key_value( self, weights: Iterable[tuple[str, torch.Tensor]] diff --git a/vllm/model_executor/models/terratorch.py b/vllm/model_executor/models/terratorch.py index a160d5bd17..78bd541b7a 100644 --- a/vllm/model_executor/models/terratorch.py +++ b/vllm/model_executor/models/terratorch.py @@ -289,7 +289,7 @@ class Terratorch(nn.Module, IsAttentionFree, SupportsMultiModal): def load_weights(self, weights: Iterable[tuple[str, torch.Tensor]]) -> set[str]: params_list = [] model_buffers = dict(self.named_buffers()) - loaded_buffers = [] + loaded_buffers: list[str] = [] for key, value in weights: if isinstance(value, (dict, OrderedDict)): if key == "state_dict":