Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix vocab_size inconsistency for sampler #2398

Closed
wants to merge 1 commit into from
Closed

Fix vocab_size inconsistency for sampler #2398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions vllm/engine/llm_engine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,18 +86,20 @@ def __init__(
# TODO(woosuk): Print more configs in debug mode.

self.model_config = model_config
self.cache_config = cache_config
self.parallel_config = parallel_config
self.scheduler_config = scheduler_config
self.log_stats = log_stats
self._verify_args()

self.tokenizer = get_tokenizer(
model_config.tokenizer,
tokenizer_mode=model_config.tokenizer_mode,
trust_remote_code=model_config.trust_remote_code,
tokenizer_revision=model_config.tokenizer_revision,
revision=model_config.revision)
model_config.hf_config.sampler_vocab_size = min(
len(self.tokenizer), model_config.hf_config.vocab_size)
self.cache_config = cache_config
Copy link
Collaborator

Choose a reason for hiding this comment

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

These lines don't need to move right?

Copy link
Author

Choose a reason for hiding this comment

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

This could work, because self.model_config = model_config is a reference assignment.
Maybe it's better to move line 89-96 before self.model_config = model_config?

self.parallel_config = parallel_config
self.scheduler_config = scheduler_config
self.log_stats = log_stats
self._verify_args()

self.seq_counter = Counter()

# Create the parallel GPU workers.
Expand Down
5 changes: 4 additions & 1 deletion vllm/model_executor/models/aquila.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,10 @@ def __init__(
self.linear_method = linear_method
self.model = AquilaModel(config, linear_method)
self.lm_head = ParallelLMHead(config.vocab_size, config.hidden_size)
self.sampler = Sampler(config.vocab_size)
if hasattr(config, "sampler_vocab_size"):
self.sampler = Sampler(config.sampler_vocab_size)
else:
self.sampler = Sampler(config.vocab_size)

def forward(
self,
Expand Down
5 changes: 4 additions & 1 deletion vllm/model_executor/models/baichuan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,10 @@ def __init__(self,
self.linear_method = linear_method
self.model = BaiChuanModel(config, position_embedding, linear_method)
self.lm_head = ParallelLMHead(config.vocab_size, config.hidden_size)
self.sampler = Sampler(config.vocab_size)
if hasattr(config, "sampler_vocab_size"):
self.sampler = Sampler(config.sampler_vocab_size)
else:
self.sampler = Sampler(config.vocab_size)

def forward(
self,
Expand Down
5 changes: 4 additions & 1 deletion vllm/model_executor/models/bloom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,10 @@ def __init__(
self.linear_method = linear_method
self.transformer = BloomModel(config, linear_method)
self.lm_head_weight = self.transformer.word_embeddings.weight
self.sampler = Sampler(config.vocab_size)
if hasattr(config, "sampler_vocab_size"):
self.sampler = Sampler(config.sampler_vocab_size)
else:
self.sampler = Sampler(config.vocab_size)

def forward(
self,
Expand Down
5 changes: 4 additions & 1 deletion vllm/model_executor/models/chatglm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,10 @@ def __init__(
self.linear_method = linear_method
self.transformer = ChatGLMModel(config, linear_method)
self.lm_head_weight = self.transformer.output_layer.weight
self.sampler = Sampler(config.padded_vocab_size)
if hasattr(config, "sampler_vocab_size"):
self.sampler = Sampler(config.sampler_vocab_size)
else:
self.sampler = Sampler(config.vocab_size)

def forward(
self,
Expand Down
5 changes: 4 additions & 1 deletion vllm/model_executor/models/falcon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,10 @@ def __init__(
config.vocab_size,
config.hidden_size,
)
self.sampler = Sampler(config.vocab_size)
if hasattr(config, "sampler_vocab_size"):
self.sampler = Sampler(config.sampler_vocab_size)
else:
self.sampler = Sampler(config.vocab_size)

def forward(
self,
Expand Down
5 changes: 4 additions & 1 deletion vllm/model_executor/models/gpt2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,10 @@ def __init__(
self.linear_method = linear_method
self.transformer = GPT2Model(config, linear_method)
self.lm_head_weight = self.transformer.wte.weight
self.sampler = Sampler(config.vocab_size)
if hasattr(config, "sampler_vocab_size"):
self.sampler = Sampler(config.sampler_vocab_size)
else:
self.sampler = Sampler(config.vocab_size)

def forward(
self,
Expand Down
5 changes: 4 additions & 1 deletion vllm/model_executor/models/gpt_bigcode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,10 @@ def __init__(
self.linear_method = linear_method
self.transformer = GPTBigCodeModel(config, linear_method)
self.lm_head_weight = self.transformer.wte.weight
self.sampler = Sampler(config.vocab_size)
if hasattr(config, "sampler_vocab_size"):
self.sampler = Sampler(config.sampler_vocab_size)
else:
self.sampler = Sampler(config.vocab_size)

def forward(
self,
Expand Down
5 changes: 4 additions & 1 deletion vllm/model_executor/models/gpt_j.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,10 @@ def __init__(
config.n_embd,
bias=True,
)
self.sampler = Sampler(config.vocab_size)
if hasattr(config, "sampler_vocab_size"):
self.sampler = Sampler(config.sampler_vocab_size)
else:
self.sampler = Sampler(config.vocab_size)

def forward(
self,
Expand Down
5 changes: 4 additions & 1 deletion vllm/model_executor/models/gpt_neox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,10 @@ def __init__(
config.vocab_size,
config.hidden_size,
)
self.sampler = Sampler(config.vocab_size)
if hasattr(config, "sampler_vocab_size"):
self.sampler = Sampler(config.sampler_vocab_size)
else:
self.sampler = Sampler(config.vocab_size)

def forward(
self,
Expand Down
5 changes: 4 additions & 1 deletion vllm/model_executor/models/internlm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,10 @@ def __init__(
self.linear_method = linear_method
self.model = InternLMModel(config, linear_method)
self.lm_head = ParallelLMHead(config.vocab_size, config.hidden_size)
self.sampler = Sampler(config.vocab_size)
if hasattr(config, "sampler_vocab_size"):
self.sampler = Sampler(config.sampler_vocab_size)
else:
self.sampler = Sampler(config.vocab_size)

def forward(
self,
Expand Down
5 changes: 4 additions & 1 deletion vllm/model_executor/models/llama.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,10 @@ def __init__(
self.linear_method = linear_method
self.model = LlamaModel(config, linear_method)
self.lm_head = ParallelLMHead(config.vocab_size, config.hidden_size)
self.sampler = Sampler(config.vocab_size)
if hasattr(config, "sampler_vocab_size"):
self.sampler = Sampler(config.sampler_vocab_size)
else:
self.sampler = Sampler(config.vocab_size)

def forward(
self,
Expand Down
5 changes: 4 additions & 1 deletion vllm/model_executor/models/mistral.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,10 @@ def __init__(
self.linear_method = linear_method
self.model = MistralModel(config, linear_method)
self.lm_head = ParallelLMHead(config.vocab_size, config.hidden_size)
self.sampler = Sampler(config.vocab_size)
if hasattr(config, "sampler_vocab_size"):
self.sampler = Sampler(config.sampler_vocab_size)
else:
self.sampler = Sampler(config.vocab_size)

def forward(
self,
Expand Down
5 changes: 4 additions & 1 deletion vllm/model_executor/models/mixtral.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,10 @@ def __init__(
self.linear_method = linear_method
self.model = MixtralModel(config, linear_method)
self.lm_head = ParallelLMHead(config.vocab_size, config.hidden_size)
self.sampler = Sampler(config.vocab_size)
if hasattr(config, "sampler_vocab_size"):
self.sampler = Sampler(config.sampler_vocab_size)
else:
self.sampler = Sampler(config.vocab_size)

def forward(
self,
Expand Down
5 changes: 4 additions & 1 deletion vllm/model_executor/models/mpt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,10 @@ def __init__(

self.transformer = MPTModel(config, linear_method)
self.lm_head_weight = self.transformer.wte.weight
self.sampler = Sampler(config.vocab_size)
if hasattr(config, "sampler_vocab_size"):
self.sampler = Sampler(config.sampler_vocab_size)
else:
self.sampler = Sampler(config.vocab_size)

def forward(
self,
Expand Down
5 changes: 4 additions & 1 deletion vllm/model_executor/models/opt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,10 @@ def __init__(
self.linear_method = linear_method
self.model = OPTModel(config, linear_method)
self.lm_head_weight = self.model.decoder.embed_tokens.weight
self.sampler = Sampler(config.vocab_size)
if hasattr(config, "sampler_vocab_size"):
self.sampler = Sampler(config.sampler_vocab_size)
else:
self.sampler = Sampler(config.vocab_size)

def forward(
self,
Expand Down
5 changes: 4 additions & 1 deletion vllm/model_executor/models/phi_1_5.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,10 @@ def __init__(self,

self.transformer = PhiModel(config, linear_method)
self.lm_head = PhiCausalLMHead(config)
self.sampler = Sampler(config.vocab_size)
if hasattr(config, "sampler_vocab_size"):
self.sampler = Sampler(config.sampler_vocab_size)
else:
self.sampler = Sampler(config.vocab_size)

def forward(
self,
Expand Down
5 changes: 4 additions & 1 deletion vllm/model_executor/models/qwen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,10 @@ def __init__(
self.linear_method = linear_method
self.transformer = QWenModel(config, linear_method)
self.lm_head = ParallelLMHead(config.vocab_size, config.hidden_size)
self.sampler = Sampler(config.vocab_size)
if hasattr(config, "sampler_vocab_size"):
self.sampler = Sampler(config.sampler_vocab_size)
else:
self.sampler = Sampler(config.vocab_size)

def forward(
self,
Expand Down
5 changes: 4 additions & 1 deletion vllm/model_executor/models/yi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,10 @@ def __init__(
self.linear_method = linear_method
self.model = YiModel(config, linear_method)
self.lm_head = ParallelLMHead(config.vocab_size, config.hidden_size)
self.sampler = Sampler(config.vocab_size)
if hasattr(config, "sampler_vocab_size"):
self.sampler = Sampler(config.sampler_vocab_size)
else:
self.sampler = Sampler(config.vocab_size)

def forward(
self,
Expand Down
Loading