-
-
Notifications
You must be signed in to change notification settings - Fork 5.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[ BugFix ] Prompt Logprobs Detokenization #6223
[ BugFix ] Prompt Logprobs Detokenization #6223
Conversation
@@ -836,7 +836,7 @@ def _get_prompt_logprob_if_needed( | |||
# Find prompt logprobs | |||
prompt_logprobs: Optional[PromptLogprobs] = None | |||
if is_prompt and sampling_params.prompt_logprobs is not None: | |||
prompt_logprobs = [] | |||
prompt_logprobs = [None] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The first token should have prompt_logprobs=None
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is not going to work with chunked prefill because the second chunk won't have None for the first prompt logprob
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice find @robertgshaw2-neuralmagic
Can we add a test to prevent regressions? |
sampler test broke |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we have a regression test? Also I have impression the current fix won't work with chunked prefill (mainly because second chunk won't have None for the first prompt logprob)
Yup, im fixing this right now |
Okay, chunked prefill needed more fixes than I expected. I had to back my changes out the sampler because it required poking around too much in the sequence_data to detect if we were at the start of a sequence or not which was breaking the abstractions
I added a regression test which tests the reconstructed prompts from the detokenized logprobs matches the original prompts with and without chunked prefill |
Co-authored-by: Zifei Tong <[email protected]>
|
||
@pytest.mark.parametrize("model", ["facebook/opt-125m"]) | ||
@pytest.mark.parametrize("chunked_prefill_token_size", [1, 4, 7, 16, -1]) | ||
def test_decode_logprobs_regression( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
def test_decode_logprobs_regression( | |
def test_decode_logprobs_chunked_prefill( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Really tricky to track down, nice job isolating this
oom in automation
Thanks for the fix! About the CI OOM issue, I am not sure if it's the best workaround, but |
try wait for gpu memory to clear
try again
Co-authored-by: Zifei Tong <[email protected]>
Co-authored-by: Zifei Tong <[email protected]>
Co-authored-by: Zifei Tong <[email protected]>
Co-authored-by: Zifei Tong <[email protected]> Signed-off-by: Alvant <[email protected]>
SUMMARY:
lm-eval-harness
v0.4.2-v0.5.1
BEFORE FIX:
AFTER FIX:
FIX #4904
FIX #4772
FIX #5334
FIX #5872
BEFORE SUBMITTING, PLEASE READ THE CHECKLIST BELOW AND FILL IN THE DESCRIPTION ABOVE
PR Checklist (Click to Expand)
Thank you for your contribution to vLLM! Before submitting the pull request, please ensure the PR meets the following criteria. This helps vLLM maintain the code quality and improve the efficiency of the review process.
PR Title and Classification
Only specific types of PRs will be reviewed. The PR title is prefixed appropriately to indicate the type of change. Please use one of the following:
[Bugfix]
for bug fixes.[CI/Build]
for build or continuous integration improvements.[Doc]
for documentation fixes and improvements.[Model]
for adding a new model or improving an existing model. Model name should appear in the title.[Frontend]
For changes on the vLLM frontend (e.g., OpenAI API server,LLM
class, etc.)[Kernel]
for changes affecting CUDA kernels or other compute kernels.[Core]
for changes in the core vLLM logic (e.g.,LLMEngine
,AsyncLLMEngine
,Scheduler
, etc.)[Hardware][Vendor]
for hardware-specific changes. Vendor name should appear in the prefix (e.g.,[Hardware][AMD]
).[Misc]
for PRs that do not fit the above categories. Please use this sparingly.Note: If the PR spans more than one category, please include all relevant prefixes.
Code Quality
The PR need to meet the following code quality standards:
format.sh
to format your code.docs/source/
if the PR modifies the user-facing behaviors of vLLM. It helps vLLM user understand and utilize the new features or changes.Notes for Large Changes
Please keep the changes as concise as possible. For major architectural changes (>500 LOC excluding kernel/data/config/test), we would expect a GitHub issue (RFC) discussing the technical design and justification. Otherwise, we will tag it with
rfc-required
and might not go through the PR.What to Expect for the Reviews
The goal of the vLLM team is to be a transparent reviewing machine. We would like to make the review process transparent and efficient and make sure no contributor feel confused or frustrated. However, the vLLM team is small, so we need to prioritize some PRs over others. Here is what you can expect from the review process:
action-required
label on the PR if there are changes required. The contributor should address the comments and ping the reviewer to re-review the PR.Thank You
Finally, thank you for taking the time to read these guidelines and for your interest in contributing to vLLM. Your contributions make vLLM a great tool for everyone!