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

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

Merged
merged 2 commits into from
Jan 10, 2025
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d57792b
fix(mllama): add check that num image tokens equals num images
tjohnson31415 Jan 10, 2025
f3cfc9c
add assert guards
tjohnson31415 Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions vllm/model_executor/models/mllama.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,13 @@ def input_processor_for_mllama(

assert is_list_of(image_data, Image.Image)

num_image_tokens = dec_inputs['prompt_token_ids'].count(
MLLAMA_IMAGE_TOKEN_ID)
if num_image_tokens != len(image_data):
raise ValueError(
f"The number of image tokens ({num_image_tokens}) must be"
f" the same as the number of images ({len(image_data)})")

# Since only the last group of consecutive images
# are attended by the decoded tokens, we only need to
# get the number of tiles for those images.
Expand Down Expand Up @@ -1493,6 +1500,8 @@ def convert_sparse_cross_attention_mask_to_dense(
dense_mask[seq_start + start:seq_start + end,
tile_start:tile_start + tile] = 1
tile_start += tile
assert ts != -1
assert td != 0
Copy link
Contributor Author

Choose a reason for hiding this comment

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

When the request has more groups of <|image|> tokens than images, the tile_range_for_decode would come out to [-1 , -1] resulting in an empty cached_k and cached_v in _attention_with_mask.

These asserts guard against that to prevent an illegal memory access.

tile_range_for_decode.append((ts, ts + td))
seq_start += length

Expand Down
Loading