mirror of
https://git.datalinker.icu/vllm-project/vllm.git
synced 2026-07-21 15:17:22 +08:00
[Bugfix] Inconsistent token calculation compared to HF in llava family (#18479)
Signed-off-by: jaycha <jaycha@ncsoft.com>
This commit is contained in:
parent
acb54ca8e1
commit
d022115cc6
@ -135,11 +135,13 @@ class LlavaNextProcessingInfo(BaseLlavaProcessingInfo):
|
|||||||
current_aspect_ratio = current_width / current_height
|
current_aspect_ratio = current_width / current_height
|
||||||
|
|
||||||
if aspect_ratio > current_aspect_ratio:
|
if aspect_ratio > current_aspect_ratio:
|
||||||
new_height = (original_height * current_width) // original_width
|
new_height = int(
|
||||||
|
round(original_height * (current_width / original_width), 7))
|
||||||
padding = (current_height - new_height) // 2
|
padding = (current_height - new_height) // 2
|
||||||
current_height = current_height - (2 * padding)
|
current_height = current_height - (2 * padding)
|
||||||
else:
|
else:
|
||||||
new_width = (original_width * current_height) // original_height
|
new_width = int(
|
||||||
|
round(original_width * (current_height / original_height), 7))
|
||||||
padding = (current_width - new_width) // 2
|
padding = (current_width - new_width) // 2
|
||||||
current_width = current_width - (2 * padding)
|
current_width = current_width - (2 * padding)
|
||||||
|
|
||||||
|
|||||||
@ -116,11 +116,13 @@ class LlavaOnevisionProcessingInfo(LlavaNextProcessingInfo):
|
|||||||
current_aspect_ratio = current_width / current_height
|
current_aspect_ratio = current_width / current_height
|
||||||
|
|
||||||
if aspect_ratio > current_aspect_ratio:
|
if aspect_ratio > current_aspect_ratio:
|
||||||
new_height = (original_height * current_width) // original_width
|
new_height = int(
|
||||||
|
round(original_height * (current_width / original_width), 7))
|
||||||
padding = (current_height - new_height) // 2
|
padding = (current_height - new_height) // 2
|
||||||
current_height = current_height - (2 * padding)
|
current_height = current_height - (2 * padding)
|
||||||
else:
|
else:
|
||||||
new_width = (original_width * current_height) // original_height
|
new_width = int(
|
||||||
|
round(original_width * (current_height / original_height), 7))
|
||||||
padding = (current_width - new_width) // 2
|
padding = (current_width - new_width) // 2
|
||||||
current_width = current_width - (2 * padding)
|
current_width = current_width - (2 * padding)
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user