Skip to content

GitLab

Unverified Commit d022115c authored by youngrok cha's avatar youngrok cha Committed by GitHub
Browse files

[Bugfix] Inconsistent token calculation compared to HF in llava family (#18479) 


Signed-off-by: default avatarjaycha <jaycha@ncsoft.com>
parent acb54ca8
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
vllm/model_executor/models/llava_next.py
View file @ d022115c
...@@ -135,11 +135,13 @@ class LlavaNextProcessingInfo(BaseLlavaProcessingInfo): ...@@ -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)
......
vllm/model_executor/models/llava_onevision.py
View file @ d022115c
...@@ -116,11 +116,13 @@ class LlavaOnevisionProcessingInfo(LlavaNextProcessingInfo): ...@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment