-
Notifications
You must be signed in to change notification settings - Fork 2.8k
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
[Core] Refactoring sampler and support prompt logprob for chunked prefill #4309
[Core] Refactoring sampler and support prompt logprob for chunked prefill #4309
Conversation
seq_group.sampling_params.detokenize and self.detokenizer: | ||
def process_prompt_logprob(self, seq_group: SequenceGroup, | ||
outputs: List[SequenceGroupOutput]) -> None: | ||
assert len(outputs) == 1, ("Single step should only has 1 output.") |
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.
cc @cadedaniel is this assumption correct?
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.
correct!
vllm/worker/cpu_model_runner.py
Outdated
generators=generators, | ||
) | ||
return sampling_metadata | ||
# def _prepare_sample( |
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.
Will remove after confirming tests are passed
vllm/worker/neuron_model_runner.py
Outdated
generators=generators, | ||
) | ||
return sampling_metadata | ||
# def _prepare_sample( |
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.
Will remove after confirming tests are passed
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.
Thank you for the refactor SangBin! The code looks much better now. I left some small comments. But in general the code looks pretty good to me.
|
||
seq_group_idx = categorized_seq_group_idx[sampling_type] |
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.
seq_group_idx
-> seq_group_ids
? Originally I would like to emphasize this is a list of IDs.
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.
reverted to id. I thought it was confusing because each seq_group already has request_id (and it doesn't match). But no strong preference.
@zhuohan123 thanks for the review! All comments are addressed! |
yay. Thanks for the review again @zhuohan123 !! time to refactoring model runner... |
Summary;
Refactoring sampling metadata and sampler. More concretely
do_sample
toSequenceGroupMetadata
. If it is set to False, sampling/sample logprob calculation for the corresponding seq_group is skipped.perform_sampling
because it is leaky and overlaps withdo_sample
. I just useis_driver_worker
directly for the same purpose.Fix prompt logprob for chunked prefil
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!