Skip to content

[V1] Aggregate chunked prompt logprobs in model runner #14875

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 9 commits into from
Mar 24, 2025
Merged

[V1] Aggregate chunked prompt logprobs in model runner #14875

merged 9 commits into from
Mar 24, 2025

Conversation

@njhill
Copy link
Member

@njhill njhill commented Mar 15, 2025 •
edited by github-actions bot
Loading

Addresses #14239

Alternative to #14240 avoiding tensor concatenation by pre-allocating CPU tensors and copying GPU chunks into them.

@afeldman-nm

@github-actions
Copy link

github-actions bot commented Mar 15, 2025

👋 Hi! Thank you for contributing to the vLLM project.

💬 Join our developer Slack at https://slack.vllm.ai to discuss your PR in #pr-reviews, coordinate on features in #feat- channels, or join special interest groups in #sig- channels.

Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run fastcheck CI which starts running only a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of those by going to your fastcheck build on Buildkite UI (linked in the PR checks section) and unblock them. If you do not have permission to unblock, ping simon-mo or khluu to add you in our Buildkite org.

Once the PR is approved and ready to go, your PR reviewer(s) can run CI to test the changes comprehensively before merging.

To run CI, PR reviewers can either: Add ready label to the PR or enable auto-merge.

🚀

@mergify mergify bot added the v1 label Mar 15, 2025
@njhill
[V1] Aggregate prompt logprobs in model runner
0d450f8 
Signed-off-by: Nick Hill <nhill@redhat.com>
@njhill njhill changed the title [V1] Aggregate prompt logprobs in model runner [V1] Aggregate chunked prompt logprobs in model runner Mar 16, 2025
@njhill njhill force-pushed the agg-prompt-logprob-chunks branch from b69760b to 0d450f8 Compare March 16, 2025 00:12
@njhill njhill mentioned this pull request Mar 16, 2025
Closed
@njhill njhill added the ready ONLY add when PR is ready to merge/full CI is needed label Mar 16, 2025
njhill added 3 commits March 16, 2025 10:57
@njhill
fix dtype
59e10c0 
Signed-off-by: Nick Hill <nhill@redhat.com>
@njhill
Fix edge case
3a3deb1 
Signed-off-by: Nick Hill <nhill@redhat.com>
@njhill
Merge remote-tracking branch 'refs/remotes/origin/main' into agg-prom…
34daab3 
…pt-logprob-chunks
afeldman-nm
afeldman-nm suggested changes Mar 19, 2025
View reviewed changes
Copy link
Contributor

@afeldman-nm afeldman-nm left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @njhill , thanks for this nice concise fix. Made a few suggestions. Remarkably it is does not seem that this PR requires unit test changes, since partial prefill was never unit-tested (woops) ;)

vllm/v1/metrics/stats.py
# partially completed prompt.
# This will be reverted in a follow up PR and we should re-enable
# this assertion / invariant.
if is_prefilling:
Copy link
Contributor

@afeldman-nm afeldman-nm Mar 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might want @markmc 's review on stats, although this all looks good to me.

@mergify
Copy link

mergify bot commented Mar 21, 2025

This pull request has merge conflicts that must be resolved before it can be
merged. Please rebase the PR, @njhill.

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

@mergify mergify bot added the needs-rebase label Mar 21, 2025
@mergify mergify bot removed the needs-rebase label Mar 21, 2025
robertgshaw2-redhat
robertgshaw2-redhat reviewed Mar 21, 2025
View reviewed changes
robertgshaw2-redhat
robertgshaw2-redhat reviewed Mar 21, 2025
View reviewed changes
@robertgshaw2-redhat
Copy link
Collaborator

robertgshaw2-redhat commented Mar 21, 2025

There are two comments:

  • There is a memory leak if requests are aborted during partial prefills with prompt logprobs
  • I think we can simplify some special casing (this is nit)

njhill added 2 commits March 22, 2025 08:49
@njhill
address review comments
fec7927 
Signed-off-by: Nick Hill <nhill@redhat.com>
@njhill
move LogprobsTensors construction to static method
acbbfc0 
Signed-off-by: Nick Hill <nhill@redhat.com>
@robertgshaw2-redhat robertgshaw2-redhat merged commit 3aee657 into vllm-project:main Mar 24, 2025
32 of 33 checks passed
@robertgshaw2-redhat
Copy link
Collaborator

robertgshaw2-redhat commented Mar 24, 2025

LGTM thanks!

@njhill njhill deleted the agg-prompt-logprob-chunks branch March 24, 2025 16:41
@njhill njhill mentioned this pull request Mar 24, 2025
Closed
1 task
erictang000 pushed a commit to erictang000/vllm that referenced this pull request Mar 25, 2025
@njhill @erictang000
[V1] Aggregate chunked prompt logprobs in model runner (vllm-project#…
f3c79d4 
…14875)

Signed-off-by: Nick Hill <nhill@redhat.com>
wrmedford pushed a commit to wrmedford/vllm that referenced this pull request Mar 26, 2025
@njhill @wrmedford
[V1] Aggregate chunked prompt logprobs in model runner (vllm-project#…
1020254 
…14875)

Signed-off-by: Nick Hill <nhill@redhat.com>
Signed-off-by: Wes Medford <wryanmedford@gmail.com>
lulmer pushed a commit to lulmer/vllm that referenced this pull request Apr 7, 2025
@njhill @lulmer
[V1] Aggregate chunked prompt logprobs in model runner (vllm-project#…
a68b528 
…14875)

Signed-off-by: Nick Hill <nhill@redhat.com>
Signed-off-by: Louis Ulmer <ulmerlouis@gmail.com>
@ckhordiasma ckhordiasma mentioned this pull request Apr 17, 2025
Closed
lk-chen pushed a commit to lk-chen/vllm that referenced this pull request Apr 29, 2025
@njhill @lk-chen
[V1] Aggregate chunked prompt logprobs in model runner (vllm-project#…
7f741c4 
…14875)

Signed-off-by: Nick Hill <nhill@redhat.com>
shreyankg pushed a commit to shreyankg/vllm that referenced this pull request May 3, 2025
@njhill @shreyankg
[V1] Aggregate chunked prompt logprobs in model runner (vllm-project#…
78dc690 
…14875)

Signed-off-by: Nick Hill <nhill@redhat.com>
RichardoMrMu pushed a commit to RichardoMrMu/vllm that referenced this pull request May 12, 2025
@njhill
[V1] Aggregate chunked prompt logprobs in model runner (vllm-project#…
81ddc54 
…14875)

Signed-off-by: Nick Hill <nhill@redhat.com>
Signed-off-by: Mu Huai <tianbowen.tbw@antgroup.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@robertgshaw2-redhat robertgshaw2-redhat robertgshaw2-redhat approved these changes

@WoosukKwon WoosukKwon Awaiting requested review from WoosukKwon WoosukKwon is a code owner

@ywang96 ywang96 Awaiting requested review from ywang96 ywang96 is a code owner

@comaniac comaniac Awaiting requested review from comaniac

@alexm-redhat alexm-redhat Awaiting requested review from alexm-redhat alexm-redhat is a code owner

+1 more reviewer

@afeldman-nm afeldman-nm afeldman-nm approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

ready ONLY add when PR is ready to merge/full CI is needed v1

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@njhill @robertgshaw2-redhat @afeldman-nm