Fix vllm:prompt_tokens_total metric calculation
#2869
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
NikolaBorisov
approved these changes
Feb 14, 2024
tests/conftest.py
Outdated
| @@ -14,11 +14,9 @@ | |||
|
|
|||
|
|
|||
| def _read_prompts(filename: str) -> str: | |||
There was a problem hiding this comment.
Looks like this function has wrong signature. output seems to be List[str]
|
@simon-mo This is small fix for stats. Safe to merge |
zhuohan123
approved these changes
Feb 19, 2024
|
I noticed that the 2nd prompt of Possibly related to: #975 |
xjpang
pushed a commit
to xjpang/vllm
that referenced
this pull request
Feb 22, 2024
xjpang
pushed a commit
to xjpang/vllm
that referenced
this pull request
Mar 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I have identified an issue with the
vllm:prompt_tokens_totalcounter metric when there are multiple prompts in a batch with different token lengths.The root cause of the problem lies in the metric counting the token length of the longest prompt in the batch multiplied by the number of prompts in the batch (as if the shorter prompts were padded to match the logest).
Code ref:
vllm/vllm/core/scheduler.py
Lines 262 to 263 in 7e45107
This PR resolves this issue by accurately counting the tokens of all the prompts in the batch. A simple unit test has been added to validate the correctness of the counter.
Additionally, I have fixed
_read_prompts()to read all prompts from a file, rather than the first prompt.