Skip to content

[Misc] Some minor simplifications to detokenization logic #3670

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
Merged
merged 2 commits into from
Apr 1, 2024
Merged

[Misc] Some minor simplifications to detokenization logic #3670

merged 2 commits into from
Apr 1, 2024

Conversation

njhill
Copy link
Member

@njhill njhill commented Mar 27, 2024

Some simplifications made for clarity while studying the detokenization code (when working on stop string related fixes).

njhill
njhill commented Mar 27, 2024
View reviewed changes
vllm/transformers_utils/detokenizer.py Outdated
Copy link
Member Author

Choose a reason for hiding this comment

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

seq.tokens can never be None here

@njhill njhill marked this pull request as draft March 28, 2024 00:22
@njhill
Copy link
Member Author

njhill commented Mar 28, 2024

@Yard1 the other thing I thought would make sense would be to move the detokenize_incrementally and convert_prompt_ids_to_tokens functions from tokenizer.py to detokenizer.py. Didn't include that in this PR yet though so as not to obscure the other deltas. WDYT?

@njhill njhill marked this pull request as ready for review March 28, 2024 00:43
Yard1
Yard1 approved these changes Mar 28, 2024
View reviewed changes
Copy link
Collaborator

@Yard1 Yard1 left a comment

Choose a reason for hiding this comment

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

Looks good, I think we can do the move to detokenizer.py in this PR

@njhill
Copy link
Member Author

njhill commented Mar 28, 2024

Thanks @Yard1! Have now pushed another commit moving those functions.

njhill added 2 commits March 29, 2024 10:23
@njhill
[Misc] Some minor simplifications to detokenization logic
4a46b20 
Some simplifications made for clarity while studying the detokenization code (when working on stop string related fixes).
@njhill
Move detokenize-related functions from tokenizer.py to detokenizer.py
04218da
@njhill
Copy link
Member Author

njhill commented Mar 29, 2024

@Yard1 good to merge?

@njhill
Copy link
Member Author

njhill commented Apr 1, 2024

Going to merge now that I have the power, since this was already approved.

@njhill njhill merged commit 49782fc into vllm-project:main Apr 1, 2024
@njhill njhill deleted the detok-simplify branch April 1, 2024 20:22
@dtrifiro dtrifiro mentioned this pull request May 15, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Yard1 Yard1 Yard1 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@njhill @Yard1