Unverified Commit 4f5b059f authored by Tyler Michael Smith's avatar Tyler Michael Smith Committed by GitHub
Browse files

Clean up unused padding_idx variables across many model definitions (#13240)


Signed-off-by: default avatarTyler Michael Smith <tyler@neuralmagic.com>
parent 288ca110
...@@ -370,7 +370,6 @@ class ArcticModel(nn.Module): ...@@ -370,7 +370,6 @@ class ArcticModel(nn.Module):
cache_config = vllm_config.cache_config cache_config = vllm_config.cache_config
quant_config = vllm_config.quant_config quant_config = vllm_config.quant_config
self.padding_idx = config.pad_token_id
self.vocab_size = config.vocab_size self.vocab_size = config.vocab_size
self.embed_tokens = VocabParallelEmbedding( self.embed_tokens = VocabParallelEmbedding(
self.vocab_size, self.vocab_size,
......
...@@ -267,7 +267,6 @@ class BaiChuanModel(nn.Module): ...@@ -267,7 +267,6 @@ class BaiChuanModel(nn.Module):
quant_config = vllm_config.quant_config quant_config = vllm_config.quant_config
self.config = config self.config = config
self.padding_idx = config.pad_token_id
self.vocab_size = config.vocab_size self.vocab_size = config.vocab_size
self.embed_tokens = VocabParallelEmbedding( self.embed_tokens = VocabParallelEmbedding(
......
...@@ -725,7 +725,6 @@ class BartModel(nn.Module): ...@@ -725,7 +725,6 @@ class BartModel(nn.Module):
self.config = config self.config = config
self.padding_idx = config.pad_token_id
lora_vocab = (lora_config.lora_extra_vocab_size * lora_vocab = (lora_config.lora_extra_vocab_size *
(lora_config.max_loras or 1)) if lora_config else 0 (lora_config.max_loras or 1)) if lora_config else 0
self.vocab_size = config.vocab_size + lora_vocab self.vocab_size = config.vocab_size + lora_vocab
......
...@@ -851,7 +851,6 @@ class ChameleonModel(nn.Module): ...@@ -851,7 +851,6 @@ class ChameleonModel(nn.Module):
quant_config = vllm_config.quant_config quant_config = vllm_config.quant_config
self.config = config self.config = config
self.padding_idx = config.pad_token_id
self.vocab_size = config.vocab_size self.vocab_size = config.vocab_size
self.embed_tokens = VocabParallelEmbedding( self.embed_tokens = VocabParallelEmbedding(
self.vocab_size, self.vocab_size,
......
...@@ -339,7 +339,6 @@ class DeepseekModel(nn.Module): ...@@ -339,7 +339,6 @@ class DeepseekModel(nn.Module):
cache_config = vllm_config.cache_config cache_config = vllm_config.cache_config
quant_config = vllm_config.quant_config quant_config = vllm_config.quant_config
self.padding_idx = config.pad_token_id
self.vocab_size = config.vocab_size self.vocab_size = config.vocab_size
self.embed_tokens = VocabParallelEmbedding( self.embed_tokens = VocabParallelEmbedding(
......
...@@ -570,7 +570,6 @@ class DeepseekV2Model(nn.Module): ...@@ -570,7 +570,6 @@ class DeepseekV2Model(nn.Module):
cache_config = vllm_config.cache_config cache_config = vllm_config.cache_config
quant_config = vllm_config.quant_config quant_config = vllm_config.quant_config
self.padding_idx = config.pad_token_id
self.vocab_size = config.vocab_size self.vocab_size = config.vocab_size
if get_pp_group().is_first_rank: if get_pp_group().is_first_rank:
......
...@@ -313,7 +313,6 @@ class ExaoneModel(nn.Module): ...@@ -313,7 +313,6 @@ class ExaoneModel(nn.Module):
lora_config = vllm_config.lora_config lora_config = vllm_config.lora_config
self.config = config self.config = config
self.padding_idx = config.pad_token_id
lora_vocab = ((lora_config.lora_extra_vocab_size * lora_vocab = ((lora_config.lora_extra_vocab_size *
(lora_config.max_loras or 1)) if lora_config else 0) (lora_config.max_loras or 1)) if lora_config else 0)
self.vocab_size = config.vocab_size + lora_vocab self.vocab_size = config.vocab_size + lora_vocab
......
...@@ -592,7 +592,6 @@ class Florence2LanguageModel(nn.Module): ...@@ -592,7 +592,6 @@ class Florence2LanguageModel(nn.Module):
self.config = config self.config = config
self.padding_idx = config.pad_token_id
self.vocab_size = config.vocab_size self.vocab_size = config.vocab_size
self.shared = BartScaledWordEmbedding(self.vocab_size, config.d_model) self.shared = BartScaledWordEmbedding(self.vocab_size, config.d_model)
......
...@@ -255,7 +255,6 @@ class FuyuForCausalLM(nn.Module, SupportsMultiModal, SupportsPP): ...@@ -255,7 +255,6 @@ class FuyuForCausalLM(nn.Module, SupportsMultiModal, SupportsPP):
self.config = config self.config = config
self.multimodal_config = multimodal_config self.multimodal_config = multimodal_config
self.padding_idx = config.pad_token_id
self.vocab_size = config.text_config.vocab_size self.vocab_size = config.text_config.vocab_size
self.image_token_id = _IMAGE_TOKEN_ID self.image_token_id = _IMAGE_TOKEN_ID
self.image_feature_size = config.patch_size**2 * config.num_channels self.image_feature_size = config.patch_size**2 * config.num_channels
......
...@@ -260,7 +260,6 @@ class GraniteModel(nn.Module): ...@@ -260,7 +260,6 @@ class GraniteModel(nn.Module):
lora_config = vllm_config.lora_config lora_config = vllm_config.lora_config
self.config = config self.config = config
self.padding_idx = config.pad_token_id
lora_vocab = (lora_config.lora_extra_vocab_size * lora_vocab = (lora_config.lora_extra_vocab_size *
(lora_config.max_loras or 1)) if lora_config else 0 (lora_config.max_loras or 1)) if lora_config else 0
self.vocab_size = config.vocab_size + lora_vocab self.vocab_size = config.vocab_size + lora_vocab
......
...@@ -252,7 +252,6 @@ class GraniteMoeModel(nn.Module): ...@@ -252,7 +252,6 @@ class GraniteMoeModel(nn.Module):
quant_config = vllm_config.quant_config quant_config = vllm_config.quant_config
lora_config = vllm_config.lora_config lora_config = vllm_config.lora_config
self.padding_idx = config.pad_token_id
lora_vocab = (lora_config.lora_extra_vocab_size * lora_vocab = (lora_config.lora_extra_vocab_size *
(lora_config.max_loras or 1)) if lora_config else 0 (lora_config.max_loras or 1)) if lora_config else 0
self.vocab_size = config.vocab_size + lora_vocab self.vocab_size = config.vocab_size + lora_vocab
......
...@@ -404,7 +404,6 @@ class Idefics3Model(nn.Module): ...@@ -404,7 +404,6 @@ class Idefics3Model(nn.Module):
quant_config = vllm_config.quant_config quant_config = vllm_config.quant_config
self.config = config self.config = config
self.padding_idx = self.config.text_config.pad_token_id
self.vocab_size = self.config.text_config.vocab_size self.vocab_size = self.config.text_config.vocab_size
self.vision_model = Idefics3VisionTransformer( self.vision_model = Idefics3VisionTransformer(
config.vision_config, config.vision_config,
......
...@@ -261,7 +261,6 @@ class InternLM2Model(nn.Module): ...@@ -261,7 +261,6 @@ class InternLM2Model(nn.Module):
quant_config = vllm_config.quant_config quant_config = vllm_config.quant_config
self.config = config self.config = config
self.padding_idx = config.pad_token_id
self.vocab_size = config.vocab_size self.vocab_size = config.vocab_size
self.tok_embeddings = VocabParallelEmbedding( self.tok_embeddings = VocabParallelEmbedding(
config.vocab_size, config.vocab_size,
......
...@@ -271,7 +271,6 @@ class JambaModel(nn.Module): ...@@ -271,7 +271,6 @@ class JambaModel(nn.Module):
lora_config = vllm_config.lora_config lora_config = vllm_config.lora_config
self.config = config self.config = config
self.padding_idx = config.pad_token_id
lora_vocab = ((lora_config.lora_extra_vocab_size * lora_vocab = ((lora_config.lora_extra_vocab_size *
(lora_config.max_loras or 1)) if lora_config else 0) (lora_config.max_loras or 1)) if lora_config else 0)
self.vocab_size = config.vocab_size + lora_vocab self.vocab_size = config.vocab_size + lora_vocab
......
...@@ -302,7 +302,6 @@ class LlamaModel(nn.Module): ...@@ -302,7 +302,6 @@ class LlamaModel(nn.Module):
self.config = config self.config = config
self.quant_config = quant_config self.quant_config = quant_config
self.padding_idx = config.pad_token_id
lora_vocab = (lora_config.lora_extra_vocab_size * lora_vocab = (lora_config.lora_extra_vocab_size *
(lora_config.max_loras or 1)) if lora_config else 0 (lora_config.max_loras or 1)) if lora_config else 0
self.vocab_size = config.vocab_size + lora_vocab self.vocab_size = config.vocab_size + lora_vocab
......
...@@ -90,7 +90,6 @@ class MambaModel(nn.Module): ...@@ -90,7 +90,6 @@ class MambaModel(nn.Module):
is_lora_enabled = bool(lora_config) is_lora_enabled = bool(lora_config)
self.config = config self.config = config
self.padding_idx = config.pad_token_id
lora_vocab = ((lora_config.lora_extra_vocab_size * lora_vocab = ((lora_config.lora_extra_vocab_size *
(lora_config.max_loras or 1)) if lora_config else 0) (lora_config.max_loras or 1)) if lora_config else 0)
self.vocab_size = config.vocab_size + lora_vocab self.vocab_size = config.vocab_size + lora_vocab
......
...@@ -365,7 +365,6 @@ class MiniCPMModel(nn.Module): ...@@ -365,7 +365,6 @@ class MiniCPMModel(nn.Module):
self.config = config self.config = config
self.cache_config = cache_config self.cache_config = cache_config
self.quant_config = quant_config self.quant_config = quant_config
self.padding_idx = config.pad_token_id
lora_vocab = (lora_config.lora_extra_vocab_size * lora_vocab = (lora_config.lora_extra_vocab_size *
(lora_config.max_loras or 1)) if lora_config else 0 (lora_config.max_loras or 1)) if lora_config else 0
self.vocab_size = config.vocab_size + lora_vocab self.vocab_size = config.vocab_size + lora_vocab
......
...@@ -254,7 +254,6 @@ class MixtralModel(nn.Module): ...@@ -254,7 +254,6 @@ class MixtralModel(nn.Module):
quant_config = vllm_config.quant_config quant_config = vllm_config.quant_config
lora_config = vllm_config.lora_config lora_config = vllm_config.lora_config
self.padding_idx = config.pad_token_id
lora_vocab = (lora_config.lora_extra_vocab_size * lora_vocab = (lora_config.lora_extra_vocab_size *
(lora_config.max_loras or 1)) if lora_config else 0 (lora_config.max_loras or 1)) if lora_config else 0
self.vocab_size = config.vocab_size + lora_vocab self.vocab_size = config.vocab_size + lora_vocab
......
...@@ -302,7 +302,6 @@ class MixtralModel(nn.Module): ...@@ -302,7 +302,6 @@ class MixtralModel(nn.Module):
cache_config = vllm_config.cache_config cache_config = vllm_config.cache_config
quant_config = vllm_config.quant_config quant_config = vllm_config.quant_config
self.padding_idx = config.pad_token_id
self.vocab_size = config.vocab_size self.vocab_size = config.vocab_size
self.embed_tokens = VocabParallelEmbedding( self.embed_tokens = VocabParallelEmbedding(
......
...@@ -1031,7 +1031,6 @@ class MllamaTextModel(nn.Module): ...@@ -1031,7 +1031,6 @@ class MllamaTextModel(nn.Module):
cache_config = vllm_config.cache_config cache_config = vllm_config.cache_config
quant_config = vllm_config.quant_config quant_config = vllm_config.quant_config
self.padding_idx = config.pad_token_id
self.vocab_size = config.vocab_size self.vocab_size = config.vocab_size
self.embed_tokens = VocabParallelEmbedding(config.vocab_size + 8, self.embed_tokens = VocabParallelEmbedding(config.vocab_size + 8,
config.hidden_size) config.hidden_size)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment