-
-
Notifications
You must be signed in to change notification settings - Fork 9.9k
[Misc] Fix skipped max-model-len validation when deriving max model length from tokenizer config #19660
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
[Misc] Fix skipped max-model-len validation when deriving max model length from tokenizer config #19660
Conversation
Signed-off-by: Ye (Charlotte) Qi <yeq@meta.com>
👋 Hi! Thank you for contributing to the vLLM project. 💬 Join our developer Slack at https://slack.vllm.ai to discuss your PR in #pr-reviews, coordinate on features in #feat- channels, or join special interest groups in #sig- channels. Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run Once the PR is approved and ready to go, your PR reviewer(s) can run CI to test the changes comprehensively before merging. To run CI, PR reviewers can either: Add 🚀 |
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.
Summary of Changes
Hello @yeqcharlotte, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!
This pull request addresses a bug where the validation of the max_model_len
parameter could be skipped if the final value was derived from the tokenizer configuration after the initial validation steps. By moving the tokenizer configuration lookup and consideration earlier in the validation process, I ensure that all relevant constraints, including those from the tokenizer, are applied correctly, preventing potential issues like exceeding the model's true maximum sequence length.
Highlights
- Configuration Validation: I've refactored the logic for determining and validating the maximum model length (
max_model_len
) to ensure that the value derived from the tokenizer configuration is considered before the main validation checks are performed. This fixes a bug where tokenizer-derived lengths could bypass validation. - Test Coverage: I've added a new unit test (
test_get_and_verify_max_len
) specifically to verify the correct behavior of theget_and_verify_max_len
function under different scenarios, including cases where the user-providedmax_model_len
exceeds the derived length from the model or tokenizer config.
Using Gemini Code Assist
The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.
Invoking Gemini
You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command>
or @gemini-code-assist <command>
. Below is a summary of the supported commands.
Feature | Command | Description |
---|---|---|
Code Review | /gemini review |
Performs a code review for the current pull request in its current state. |
Pull Request Summary | /gemini summary |
Provides a summary of the current pull request in its current state. |
Comment | @gemini-code-assist | Responds in comments when explicitly tagged, both in issue comments and review comments. |
Help | /gemini help |
Displays a list of available commands. |
Customization
To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/
folder in the base of the repository. Detailed instructions can be found here.
Limitations & Feedback
Gemini Code Assist is currently in preview and may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments to provide feedback.
You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.
Footnotes
-
Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configureGemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩
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.
Code Review
The pull request effectively addresses the issue of skipped max_model_len
validation. The changes are well-structured, and the addition of unit tests confirms the fix. The reordering of logic ensures tokenizer_config
is considered earlier, improving the robustness of the model configuration.
("model_id", "max_model_len", "expected_max_len", "should_raise"), [ | ||
("BAAI/bge-reranker-base", None, 512, False), | ||
("BAAI/bge-reranker-base", 256, 256, False), | ||
("BAAI/bge-reranker-base", 513, 512, True), |
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.
self.tokenizer, | ||
trust_remote_code=self.trust_remote_code, | ||
revision=self.tokenizer_revision) |
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.
Consider adding a comment explaining why tokenizer_config
is fetched here, as opposed to being passed down from the caller.
# Fetch tokenizer config to determine model max length.
tokenizer_config = try_get_tokenizer_config(
self.tokenizer,
trust_remote_code=self.trust_remote_code,
revision=self.tokenizer_revision)
"model_max_length", derived_max_model_len) | ||
derived_max_model_len = min(derived_max_model_len, | ||
tokenizer_model_max_length) |
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.
Consider adding a log message here to indicate when model_max_length
from the tokenizer config is being used to further limit derived_max_model_len
.
tokenizer_model_max_length = tokenizer_config.get(
"model_max_length", derived_max_model_len)
if tokenizer_model_max_length < derived_max_model_len:
logger.info(f"Limiting max model length to {tokenizer_model_max_length} based on tokenizer config.")
derived_max_model_len = min(derived_max_model_len,
tokenizer_model_max_length)
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.
Looks good to me.
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.
Thanks for fixing!
Thanks for the fix |
…ength from tokenizer config (vllm-project#19660) Signed-off-by: Ye (Charlotte) Qi <yeq@meta.com>
…ength from tokenizer config (vllm-project#19660) Signed-off-by: Ye (Charlotte) Qi <yeq@meta.com> Signed-off-by: minpeter <kali2005611@gmail.com>
…ength from tokenizer config (vllm-project#19660) Signed-off-by: Ye (Charlotte) Qi <yeq@meta.com> Signed-off-by: Yang Wang <elainewy@meta.com>
…ength from tokenizer config (vllm-project#19660) Signed-off-by: Ye (Charlotte) Qi <yeq@meta.com>
…ength from tokenizer config (vllm-project#19660) Signed-off-by: Ye (Charlotte) Qi <yeq@meta.com>
…ength from tokenizer config (vllm-project#19660) Signed-off-by: Ye (Charlotte) Qi <yeq@meta.com> Signed-off-by: avigny <47987522+avigny@users.noreply.github.com>
…ength from tokenizer config (vllm-project#19660) Signed-off-by: Ye (Charlotte) Qi <yeq@meta.com>
Purpose
_get_and_verify_max_len
attempts to derive max_model_len from a few HF configs then applies a bunch of validation.Overriding max_model_len through tokenizer after the validation is already done causes some validation to be skipped.
Hence, moving that logic to happen before we execute the logic around none of the max-model-len key is found inside
_get_and_verify_max_len
.Introduced in #19201.
Test Plan
Added unit tests
E2E edge case:
Test Result
unit tests passed
max-model-len would throw now while previously it got silently overriden.