Skip to content

[FIX] Fix shape mismatch for swapped sequences when logprobs > 0 #1971

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

Closed
derange-alembic wants to merge 2 commits into from
Closed

[FIX] Fix shape mismatch for swapped sequences when logprobs > 0 #1971

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dc7101
Fix shape mismatch of swapped sequences when logprobs > 0
derange-alembic Dec 7, 2023
4838080
Format the code.
derange-alembic Dec 7, 2023
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
10 changes: 8 additions & 2 deletions vllm/model_executor/layers/sampler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,10 +539,13 @@ def _get_logprobs(
prompt_len = sampling_metadata.prompt_lens[i]
prompt_tokens = sampling_metadata.seq_data[
seq_ids[0]].prompt_token_ids
# Swapped seqs have output tokens.
output_tokens = sampling_metadata.seq_data[
seq_ids[0]].output_token_ids
batched_logprobs_query_seq_indices.extend(
sample_idx + j for j in range(prompt_len - 1))
batched_logprobs_query_token_indices.extend(
token_id for token_id in prompt_tokens[1:])
token_id for token_id in prompt_tokens[1:] + output_tokens)
sample_idx += prompt_len - 1
batched_logprobs_query_seq_indices.extend(
[sample_idx + parent_id for parent_id in parent_ids])
Expand Down Expand Up @@ -586,8 +589,11 @@ def _get_logprobs(
prompt_len = sampling_metadata.prompt_lens[i]
prompt_tokens = sampling_metadata.seq_data[
seq_ids[0]].prompt_token_ids
# Swapped seqs have output tokens.
output_tokens = sampling_metadata.seq_data[
seq_ids[0]].output_token_ids
group_prompt_logprobs: PromptLogprobs = [None]
for token_id in prompt_tokens[1:]:
for token_id in prompt_tokens[1:] + output_tokens:
Comment on lines +592 to +596
Copy link
Copy Markdown
Collaborator

@WoosukKwon WoosukKwon Dec 21, 2023

Choose a reason for hiding this comment

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

Why is output_tokens used for prompt logprobs?

prompt_logprobs_dict = {
token_id:
batched_logprobs_query_result[query_result_idx].item()
Expand Down