xinyun/vllm
1
0
Fork 0
mirror of https://git.datalinker.icu/vllm-project/vllm.git synced 2026-07-20 23:57:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Isotr0py <2037008807@qq.com>
This commit is contained in:
Isotr0py 2024-12-19 02:16:40 +08:00 committed by GitHub
parent 60508ffda9
commit 996aa70f00
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/models/decoder_only/vision_language/mm_processor_kwargs/test_phi3v.py
View File

@ -58,16 +58,14 @@ def test_max_tokens_override(get_max_phi3v_image_tokens, model: str,
@pytest.mark.parametrize("model", models) @pytest.mark.parametrize("model", models)
@pytest.mark.parametrize( @pytest.mark.parametrize(
"num_crops,expected_toks_per_img,num_imgs", "num_crops,expected_toks_per_img",
[ [
(4, 757, 1), (4, 757),
(4, 757, 2), (16, 1921),
(16, 1921, 1),
(16, 1921, 2),
# the default num_crops of phi-3.5-vision is 4 # the default num_crops of phi-3.5-vision is 4
(None, 757, 2), (None, 757),
(None, 757, 2),
]) ])
@pytest.mark.parametrize("num_imgs", [1, 2])
def test_processor_override(processor_for_phi3v, image_assets: _ImageAssets, def test_processor_override(processor_for_phi3v, image_assets: _ImageAssets,
model: str, num_crops: Optional[int], model: str, num_crops: Optional[int],
expected_toks_per_img: int, num_imgs: int): expected_toks_per_img: int, num_imgs: int):

15
vllm/model_executor/models/phi3v.py
View File

@ -302,11 +302,18 @@ class Phi3HDImageEmbedding(Phi3ImageEmbeddingBase):
return image_features_hd_newline return image_features_hd_newline
def get_max_phi3v_image_tokens(ctx: InputContext) -> int: def get_max_phi3v_image_tokens(
processor = ctx.get_hf_processor() ctx: InputContext,
image_processor = processor.image_processor # type: ignore *,
num_crops: Optional[int] = None,
) -> int:
mm_processor_kwargs = {}
if num_crops:
mm_processor_kwargs["num_crops"] = num_crops
return image_processor.calc_num_image_tokens_from_image_size( processor = ctx.get_hf_processor(**mm_processor_kwargs)
return processor.calc_num_image_tokens_from_image_size(
width=MAX_IMAGE_FEATURE_SIZE_WIDTH, width=MAX_IMAGE_FEATURE_SIZE_WIDTH,
height=MAX_IMAGE_FEATURE_SIZE_HEIGHT, height=MAX_IMAGE_FEATURE_SIZE_HEIGHT,
) )