Skip to content
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

[Bugfix] Check that number of images matches number of <|image|> tokens with mllama #13911

Merged
merged 3 commits into from
Feb 28, 2025
Merged

[Bugfix] Check that number of images matches number of <|image|> tokens with mllama #13911

merged 3 commits into from
Feb 28, 2025

Conversation

tjohnson31415
Copy link
Contributor

@tjohnson31415 tjohnson31415 commented Feb 26, 2025 •
edited by github-actions bot
Loading

This check was originally added in
#11939

But was removed as part of the refactoring in
#11427

I also updated a test so it would have caused the crash before this fix was applied.

Relates to #10648

@github-actions GitHub Actions
Copy link

👋 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 fastcheck CI which starts running only a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of those by going to your fastcheck build on Buildkite UI (linked in the PR checks section) and unblock them. If you do not have permission to unblock, ping simon-mo or khluu to add you in our Buildkite org.

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 ready label to the PR or enable auto-merge.

🚀

DarkLight1337
DarkLight1337 reviewed Feb 26, 2025
View reviewed changes
tests/models/encoder_decoder/vision_language/test_mllama.py
# Number of image tags is greater than the number of images provided
prompt = "<|begin_of_text|><|image|><|image|> Compare the two images" # noqa: E501
# Number of image groups is greater than the number of images provided
prompt = "<|begin_of_text|><|image|> <|image|> Compare the two images" # noqa: E501
Copy link
Member

@DarkLight1337 DarkLight1337 Feb 26, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Is this whitespace necessary? If so, please add a note.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes. The crash only triggers if there are more groups of <|image|> tokens. I updated the comment from tags to groups to indicate that

@tjohnson31415 tjohnson31415 mentioned this pull request Feb 26, 2025
Open
1 task
DarkLight1337
DarkLight1337 approved these changes Feb 27, 2025
View reviewed changes
Copy link
Member

@DarkLight1337 DarkLight1337 left a comment

Choose a reason for hiding this comment

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

Otherwise LGTM. cc @Isotr0py

Isotr0py
Isotr0py approved these changes Feb 27, 2025
View reviewed changes
Copy link
Collaborator

@Isotr0py Isotr0py left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks for fixing this!

@Isotr0py Isotr0py enabled auto-merge (squash) February 27, 2025 05:12
@github-actions github-actions bot added the ready ONLY add when PR is ready to merge/full CI is needed label Feb 27, 2025
auto-merge was automatically disabled February 27, 2025 17:44

Head branch was pushed to by a user without write access

@tjohnson31415
fix: add back image token count check
bd789f8 
This check was originally added in
vllm-project#11939

But was removed as part of the refactoring in
vllm-project#11427

Signed-off-by: Travis Johnson <tsjohnso@us.ibm.com>
@tjohnson31415
test: fix test_regression to trigger the crash
994e54e 
Signed-off-by: Travis Johnson <tsjohnso@us.ibm.com>
@tjohnson31415
review: update comments for clarity
ef6ae8c 
Signed-off-by: Travis Johnson <tsjohnso@us.ibm.com>
@DarkLight1337 DarkLight1337 enabled auto-merge (squash) February 28, 2025 03:06
@DarkLight1337 DarkLight1337 merged commit 73e0225 into vllm-project:main Feb 28, 2025
37 checks passed
@tjohnson31415 tjohnson31415 deleted the fix-mllama-crash branch February 28, 2025 04:54
johnnynunez pushed a commit to johnnynunez/vllm that referenced this pull request Mar 3, 2025
@tjohnson31415 @johnnynunez
[Bugfix] Check that number of images matches number of <|image|> toke…
2608eab 
…ns with mllama (vllm-project#13911)

Signed-off-by: Travis Johnson <tsjohnso@us.ibm.com>
Signed-off-by: Johnny <johnnynuca14@gmail.com>
Akshat-Tripathi pushed a commit to krai/vllm that referenced this pull request Mar 3, 2025
@tjohnson31415 @Akshat-Tripathi
[Bugfix] Check that number of images matches number of <|image|> toke…
0e21ae3 
…ns with mllama (vllm-project#13911)

Signed-off-by: Travis Johnson <tsjohnso@us.ibm.com>
lk-chen pushed a commit to lk-chen/vllm that referenced this pull request Mar 5, 2025
@tjohnson31415 @lk-chen
[Bugfix] Check that number of images matches number of <|image|> toke…
367760b 
…ns with mllama (vllm-project#13911)

Signed-off-by: Travis Johnson <tsjohnso@us.ibm.com>
Signed-off-by: Linkun Chen <github@lkchen.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Isotr0py Isotr0py Isotr0py approved these changes

@DarkLight1337 DarkLight1337 DarkLight1337 approved these changes

@ywang96 ywang96 Awaiting requested review from ywang96 ywang96 is a code owner

Assignees
No one assigned
Labels
ready ONLY add when PR is ready to merge/full CI is needed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tjohnson31415 @Isotr0py @DarkLight1337