|
1 |
| -from typing import List, Optional, Type |
| 1 | +from typing import List, Optional, Tuple, Type |
2 | 2 |
|
3 | 3 | import pytest
|
4 | 4 |
|
5 | 5 | from vllm.multimodal.utils import rescale_image_size
|
| 6 | +from vllm.sequence import SampleLogprobs |
6 | 7 | from vllm.utils import is_cpu
|
7 | 8 |
|
8 | 9 | from ..conftest import IMAGE_ASSETS, HfRunner, VllmRunner, _ImageAssets
|
|
19 | 20 | models = ["adept/fuyu-8b"]
|
20 | 21 |
|
21 | 22 |
|
| 23 | +def vllm_to_hf_output(vllm_output: Tuple[List[int], str, |
| 24 | + Optional[SampleLogprobs]]): |
| 25 | + """Sanitize vllm output to be comparable with hf output.""" |
| 26 | + output_ids, output_str, out_logprobs = vllm_output |
| 27 | + |
| 28 | + hf_output_str = output_str + "|ENDOFTEXT|" |
| 29 | + |
| 30 | + return output_ids, hf_output_str, out_logprobs |
| 31 | + |
| 32 | + |
22 | 33 | def run_test(
|
23 | 34 | hf_runner: Type[HfRunner],
|
24 | 35 | vllm_runner: Type[VllmRunner],
|
@@ -86,7 +97,9 @@ def run_test(
|
86 | 97 | vllm_outputs_per_image):
|
87 | 98 | check_logprobs_close(
|
88 | 99 | outputs_0_lst=hf_outputs,
|
89 |
| - outputs_1_lst=vllm_outputs, |
| 100 | + outputs_1_lst=[ |
| 101 | + vllm_to_hf_output(vllm_output) for vllm_output in vllm_outputs |
| 102 | + ], |
90 | 103 | name_0="hf",
|
91 | 104 | name_1="vllm",
|
92 | 105 | )
|
|
0 commit comments