[BugFix][Frontend] Use LoRA tokenizer in OpenAI APIs #6227
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
Currently the LoRA tokenizers aren't used in the OpenAI APIs, meaning the behaviour won't be correct if adapters are used that have custom added tokens. This PR includes changes to address that. It mostly replaces vllm-project#3512. More work is needed to address remaining inconsistencies in tokenization behaviour between the OpenAI front-end and standalone LLMEngine/AsyncLLMEngine use, including: - Standalone cases don't honor truncation and add_special_tokens request parameters - OpenAI API cases don't make use of TokenizerGroups for possible parallelization of tokenization As well as some other inefficiencies. But these are to be addressed in follow-on PRs.
|
@dtrifiro FYI |
Thanks @DarkLight1337, yes test is forthcoming. |
…okenizer-take2 # Conflicts: # vllm/entrypoints/openai/serving_chat.py # vllm/entrypoints/openai/serving_completion.py # vllm/entrypoints/openai/serving_engine.py
DarkLight1337
approved these changes
Jul 11, 2024
|
We can merge after the test case is added. |
…okenizer-take2 # Conflicts: # tests/async_engine/test_chat_template.py # tests/entrypoints/openai/test_completion.py # vllm/entrypoints/openai/serving_chat.py # vllm/entrypoints/openai/serving_completion.py
…okenizer-take2 # Conflicts: # tests/entrypoints/openai/test_chat.py # tests/entrypoints/openai/test_completion.py # tests/entrypoints/openai/test_tokenization.py
|
@DarkLight1337 tests now added! and there were a lot of merge conflicts to resolve 😅 |
|
The error occurs because the |
|
Thanks @DarkLight1337! I pushed a fix before I read your comment, hopefully this should be ok too. |
fialhocoelho
pushed a commit
to opendatahub-io/vllm
that referenced
this pull request
Jul 19, 2024
Co-authored-by: Cyrus Leung <cyrus.tl.leung@gmail.com>
xjpang
pushed a commit
to xjpang/vllm
that referenced
this pull request
Jul 24, 2024
Co-authored-by: Cyrus Leung <cyrus.tl.leung@gmail.com>
gnpinkert
pushed a commit
to gnpinkert/vllm
that referenced
this pull request
Jul 26, 2024
Co-authored-by: Cyrus Leung <cyrus.tl.leung@gmail.com>
Alvant
pushed a commit
to compressa-ai/vllm
that referenced
this pull request
Oct 26, 2024
Co-authored-by: Cyrus Leung <cyrus.tl.leung@gmail.com> Signed-off-by: Alvant <alvasian@yandex.ru>
KuntaiDu
pushed a commit
to KuntaiDu/vllm
that referenced
this pull request
Nov 20, 2024
Co-authored-by: Cyrus Leung <cyrus.tl.leung@gmail.com>
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.
Currently the LoRA tokenizers aren't used in the OpenAI APIs, meaning the behaviour won't be correct if adapters are used that have custom added tokens. This PR includes changes to address that. It mostly replaces #3512.
More work is needed to address remaining inconsistencies in tokenization behaviour between the OpenAI front-end and standalone
LLMEngine/AsyncLLMEngineuse, including:TokenizerGroups for possible parallelization of tokenizationas well as some other inefficiencies.
But these are to be addressed in follow-on PRs.