[BugFix] Fix min_tokens when eos_token_id is None
#4389
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: DefTruth <[email protected]>
simon-mo
approved these changes
Apr 26, 2024
simon-mo
reviewed
Apr 26, 2024
Comment on lines
170
to
177
| for j, seq_id in enumerate(seq_ids): | ||
| seq_data = sampling_metadata.seq_data[seq_id] | ||
| if len(seq_data.output_token_ids) < min_tokens: | ||
| seqs_to_penalize.append(i) | ||
| seqs_to_penalize.append(j) | ||
|
|
||
| if seqs_to_penalize: | ||
| # convert to the index into logits | ||
| seqs_to_penalize = [start_idx + i for i in seqs_to_penalize] | ||
| # use set() to remove any duplicates | ||
| token_ids_to_penalize = set(sampling_params.stop_token_ids + | ||
| [sampling_params.eos_token_id]) | ||
| seqs_to_penalize = [start_idx + j for j in seqs_to_penalize] |
There was a problem hiding this comment.
wait I don't understand the both i -> j here
There was a problem hiding this comment.
@simon-mo there is an outer loop over the sequence groups enumerated with index i and within that two separate loops that now each use index j (well this one is actually a comprehension)
There was a problem hiding this comment.
We could change this one to k just to be clearer? but they don't overlap so I think it's ok like this too...
There was a problem hiding this comment.
@simon-mo let me know if you're good with this, I think this is ready to merge if so!
DefTruth
reviewed
Apr 26, 2024
DefTruth
approved these changes
Apr 26, 2024
…_eos_token # Conflicts: # vllm/model_executor/layers/sampler.py
robertgshaw2-redhat
pushed a commit
to neuralmagic/nm-vllm
that referenced
this pull request
May 6, 2024
) Co-authored-by: DefTruth <[email protected]>
z103cb
pushed a commit
to z103cb/opendatahub_vllm
that referenced
this pull request
May 7, 2024
) Co-authored-by: DefTruth <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #4365
Also fix re-use of index variable
iwithin inner loop.