-
-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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.
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
[BugFix] Apply get_cached_tokenizer to the tokenizer setter of LLM #5207
[BugFix] Apply get_cached_tokenizer to the tokenizer setter of LLM #5207
Conversation
Stange, this property should already be cached: vllm/vllm/transformers_utils/tokenizer.py Lines 17 to 55 in 7a64d24
|
I change the tokenizer by the func from vllm.transformers_utils.tokenizer import get_cached_tokenizer
def set_tokenizer(
self,
tokenizer: Union[PreTrainedTokenizer, PreTrainedTokenizerFast],
) -> None:
self.llm_engine.tokenizer.tokenizer = get_cached_tokenizer(tokenizer) |
690c598
to
8b90883
Compare
8b90883
to
1de6859
Compare
@youkaichao Processed prompts: 95%|█████████▍| 1014/1070 [00:43<00:01, 45.00it/s]
Processed prompts: 96%|█████████▌| 1022/1070 [00:43<00:00, 52.35it/s]
Processed prompts: 96%|█████████▌| 1028/1070 [00:44<00:00, 44.96it/s]
Processed prompts: 97%|█████████▋| 1034/1070 [00:44<00:00, 40.40it/s]
Processed prompts: 97%|█████████▋| 1043/1070 [00:44<00:00, 49.90it/s]
Processed prompts: 98%|█████████▊| 1049/1070 [00:44<00:00, 36.90it/s]
Processed prompts: 99%|█████████▊| 1054/1070 [00:44<00:00, 28.55it/s]
Processed prompts: 99%|█████████▉| 1058/1070 [00:45<00:00, 27.48it/s]
Processed prompts: 99%|█████████▉| 1062/1070 [00:45<00:00, 23.82it/s]
Processed prompts: 100%|█████████▉| 1065/1070 [00:45<00:00, 21.18it/s]
Processed prompts: 100%|█████████▉| 1068/1070 [00:45<00:00, 20.53it/s]
Processed prompts: 100%|██████████| 1070/1070 [00:47<00:00, 22.66it/s]
master-0: [2024-06-04 15:00:18,031] [INFO] [launch.py:351:main] Process 1405 exits successfully. |
@@ -152,7 +153,7 @@ def set_tokenizer( | |||
self, | |||
tokenizer: Union[PreTrainedTokenizer, PreTrainedTokenizerFast], | |||
) -> None: | |||
self.llm_engine.tokenizer.tokenizer = tokenizer |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
better add a check, if the tokenizer is already cached, then just set it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A check is added. While the CachedTokenizer is dynamic, I have no choice but compare the class name. Is there any good ideal?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the string compare is fine here. If you wanted to be extremely safe you could change CachedTokenizer to be VLLMCachedTokenizer
LGTM in general, please address the comments. |
00ceab9
to
0a8be35
Compare
0a8be35
to
08d3181
Compare
@@ -152,7 +153,7 @@ def set_tokenizer( | |||
self, | |||
tokenizer: Union[PreTrainedTokenizer, PreTrainedTokenizerFast], | |||
) -> None: | |||
self.llm_engine.tokenizer.tokenizer = tokenizer |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the string compare is fine here. If you wanted to be extremely safe you could change CachedTokenizer to be VLLMCachedTokenizer
…llm-project#5207) Co-authored-by: qiujiawei9 <qiujiawei9@jd.com>
…llm-project#5207) Co-authored-by: qiujiawei9 <qiujiawei9@jd.com>
…llm-project#5207) Co-authored-by: qiujiawei9 <qiujiawei9@jd.com>
…llm-project#5207) Co-authored-by: qiujiawei9 <qiujiawei9@jd.com>
…llm-project#5207) Co-authored-by: qiujiawei9 <qiujiawei9@jd.com>
…llm-project#5207) Co-authored-by: qiujiawei9 <qiujiawei9@jd.com>
…llm-project#5207) Co-authored-by: qiujiawei9 <qiujiawei9@jd.com>
Change the func to get lengh of tokenizer from
len(tokenizer)
totokenizer.vocab_size
FIX the issue decribed in #5206 #5240
FIX #5206
FIX #5240
BEFORE SUBMITTING, PLEASE READ THE CHECKLIST BELOW AND FILL IN THE DESCRIPTION ABOVE
PR Checklist (Click to Expand)
Thank you for your contribution to vLLM! Before submitting the pull request, please ensure the PR meets the following criteria. This helps vLLM maintain the code quality and improve the efficiency of the review process.
PR Title and Classification
Only specific types of PRs will be reviewed. The PR title is prefixed appropriately to indicate the type of change. Please use one of the following:
[Bugfix]
for bug fixes.[CI/Build]
for build or continuous integration improvements.[Doc]
for documentation fixes and improvements.[Model]
for adding a new model or improving an existing model. Model name should appear in the title.[Frontend]
For changes on the vLLM frontend (e.g., OpenAI API server,LLM
class, etc.)[Kernel]
for changes affecting CUDA kernels or other compute kernels.[Core]
for changes in the core vLLM logic (e.g.,LLMEngine
,AsyncLLMEngine
,Scheduler
, etc.)[Hardware][Vendor]
for hardware-specific changes. Vendor name should appear in the prefix (e.g.,[Hardware][AMD]
).[Misc]
for PRs that do not fit the above categories. Please use this sparingly.Note: If the PR spans more than one category, please include all relevant prefixes.
Code Quality
The PR need to meet the following code quality standards:
format.sh
to format your code.docs/source/
if the PR modifies the user-facing behaviors of vLLM. It helps vLLM user understand and utilize the new features or changes.Notes for Large Changes
Please keep the changes as concise as possible. For major architectural changes (>500 LOC excluding kernel/data/config/test), we would expect a GitHub issue (RFC) discussing the technical design and justification. Otherwise, we will tag it with
rfc-required
and might not go through the PR.What to Expect for the Reviews
The goal of the vLLM team is to be a transparent reviewing machine. We would like to make the review process transparent and efficient and make sure no contributor feel confused or frustrated. However, the vLLM team is small, so we need to prioritize some PRs over others. Here is what you can expect from the review process:
action-required
label on the PR if there are changes required. The contributor should address the comments and ping the reviewer to re-review the PR.Thank You
Finally, thank you for taking the time to read these guidelines and for your interest in contributing to vLLM. Your contributions make vLLM a great tool for everyone!