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] Fix broken phi3-v mm_processor_kwargs tests #11263

Merged
merged 2 commits into from
Dec 18, 2024
Merged

[Bugfix] Fix broken phi3-v mm_processor_kwargs tests #11263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
227d890
fix broken phi3v mm_processor_kwargs tests
Isotr0py Dec 17, 2024
a59a0f1
clean up
Isotr0py Dec 17, 2024
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
12 changes: 5 additions & 7 deletions tests/models/decoder_only/vision_language/mm_processor_kwargs/test_phi3v.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,14 @@ def test_max_tokens_override(get_max_phi3v_image_tokens, model: str,

@pytest.mark.parametrize("model", models)
@pytest.mark.parametrize(
"num_crops,expected_toks_per_img,num_imgs",
"num_crops,expected_toks_per_img",
[
(4, 757, 1),
(4, 757, 2),
(16, 1921, 1),
(16, 1921, 2),
(4, 757),
(16, 1921),
# the default num_crops of phi-3.5-vision is 4
(None, 757, 2),
(None, 757, 2),
(None, 757),
])
@pytest.mark.parametrize("num_imgs", [1, 2])
def test_processor_override(processor_for_phi3v, image_assets: _ImageAssets,
model: str, num_crops: Optional[int],
expected_toks_per_img: int, num_imgs: int):
Expand Down
17 changes: 12 additions & 5 deletions vllm/model_executor/models/phi3v.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,11 +302,18 @@ def add_image_newline(self, image_features_hd):
return image_features_hd_newline


def get_max_phi3v_image_tokens(ctx: InputContext) -> int:
processor = ctx.get_hf_processor()
image_processor = processor.image_processor # type: ignore

return image_processor.calc_num_image_tokens_from_image_size(
def get_max_phi3v_image_tokens(
ctx: InputContext,
*,
num_crops: Optional[int] = None,
) -> int:
mm_processor_kwargs = {}
if num_crops:
mm_processor_kwargs["num_crops"] = num_crops

processor = ctx.get_hf_processor(**mm_processor_kwargs)

return processor.calc_num_image_tokens_from_image_size(
width=MAX_IMAGE_FEATURE_SIZE_WIDTH,
height=MAX_IMAGE_FEATURE_SIZE_HEIGHT,
)
Expand Down
Loading