Skip to content

Draft: [P/D] Get P/D working w/ DP #18495

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
Closed
wants to merge 34 commits into from
Closed

Draft: [P/D] Get P/D working w/ DP #18495

wants to merge 34 commits into from

Conversation

@wseaton
Copy link
Contributor

@wseaton wseaton commented May 21, 2025 •
edited by github-actions bot
Loading

Draft PR, testing with 1P1D where DP=2 for D

This is a stacked PR, it has merged in commits already present in: #18559

wseaton added 10 commits May 20, 2025 21:36
@wseaton
working startup
637b92d
@wseaton
Revert "working startup"
e03457e 
This reverts commit 637b92d.
@wseaton
add rank logging
d392e2a 
Signed-off-by: Will Eaton <weaton@redhat.com>
@wseaton
fixup rank log
37397c8 
Signed-off-by: Will Eaton <weaton@redhat.com>
@wseaton
plumb unique rank
ccbf80d 
Signed-off-by: Will Eaton <weaton@redhat.com>
@wseaton
fix uniqueness
da47bf0 
Signed-off-by: Will Eaton <weaton@redhat.com>
@wseaton
fix plumbing unique_port
5cd28b1 
Signed-off-by: Will Eaton <weaton@redhat.com>
@wseaton
unify rank logic
2c7738e 
Signed-off-by: Will Eaton <weaton@redhat.com>
@wseaton
fix device mapping problem in the blocks
558f360 
Signed-off-by: Will Eaton <weaton@redhat.com>
@wseaton
revert
661fe20 
Signed-off-by: Will Eaton <weaton@redhat.com>
@github-actions
Copy link

github-actions bot commented May 21, 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.

🚀

wseaton added 2 commits May 21, 2025 12:57
@wseaton
defer creation of engine_id to hopefully post fork
d37af26 
Signed-off-by: Will Eaton <weaton@redhat.com>
@wseaton
add debugging to toy proxy server
3e0f3c2 
Signed-off-by: Will Eaton <weaton@redhat.com>
@mergify mergify bot added the v1 label May 21, 2025
njhill
njhill reviewed May 21, 2025
View reviewed changes
wseaton added 3 commits May 21, 2025 20:05
@wseaton
add a ton of logging
c2b078e 
Signed-off-by: Will Eaton <weaton@redhat.com>
@wseaton
revert uuid placement for bisect
cb397be 
Signed-off-by: Will Eaton <weaton@redhat.com>
@wseaton
add regeneration for engine_ids
a8ab4e5 
Signed-off-by: Will Eaton <weaton@redhat.com>
wseaton and others added 6 commits May 21, 2025 21:30
@wseaton
add scheduler logging for kv wait state
fd7e675 
Signed-off-by: Will Eaton <weaton@redhat.com>
@wseaton
add moar scheduler logging
0ee72a4 
Signed-off-by: Will Eaton <weaton@redhat.com>
@wseaton
add moar scheduler logging
6700da2 
Signed-off-by: Will Eaton <weaton@redhat.com>
@wseaton
logging
fb5b4e5 
Signed-off-by: Will Eaton <weaton@redhat.com>
@njhill
[BugFix] Make DP work with connector-delayed new requests
bf51c1f 
Signed-off-by: Nick Hill <nhill@redhat.com>
@njhill @wseaton
[BugFix] Make DP work with connector-delayed new requests
c13a483 
Signed-off-by: Nick Hill <nhill@redhat.com>
wseaton and others added 4 commits May 22, 2025 15:36
@wseaton
make optional and default to none
4bb459b 
Signed-off-by: Will Eaton <weaton@redhat.com>
@wseaton
fix rank blocks
2b4159e 
Signed-off-by: Will Eaton <weaton@redhat.com>
@njhill
fix comment
ad78003 
Signed-off-by: Nick Hill <nhill@redhat.com>
@njhill
fix linting
6064eaf 
Signed-off-by: Nick Hill <nhill@redhat.com>
@mergify
Copy link

mergify bot commented May 23, 2025

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

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 May 23, 2025
wseaton and others added 6 commits May 27, 2025 10:35
@wseaton
more logging
03895a1 
Signed-off-by: Will Eaton <weaton@redhat.com>
@wseaton
don't get/set forward context in the gpu runner
598c76a
@wseaton
remove logging stepwise
be4b9f8 
Signed-off-by: Will Eaton <weaton@redhat.com>
@wseaton @njhill
Apply suggestions from code review
82d77c3 
Co-authored-by: Nick Hill <nhill@redhat.com>
@wseaton
clean up debug logging
973af85 
Signed-off-by: Will Eaton <weaton@redhat.com>
@wseaton
Merge branch 'main' into fork/dp-hacking
7a3f921
@mergify mergify bot removed the needs-rebase label May 27, 2025
@wseaton
Copy link
Contributor Author

wseaton commented May 28, 2025

Once #18559 is merged I will pluck the relevant remaining changes into a clean branch.

tlrmchlsmth
tlrmchlsmth reviewed May 28, 2025
View reviewed changes
vllm/distributed/kv_transfer/kv_connector/v1/nixl_connector.py
Comment on lines +340 to +347
# NOTE(weaton): Hack to get rank uniqueness across TP + DP ranks.
# Used for NIXL side channel communication.
self.unique_rank = (get_dp_group().rank_in_group *
self.world_size) + self.rank
logger.debug(
"NIXL worker %s TP rank %s, DP local rank %s, unique rank %s",
self.engine_id, self.rank,
get_dp_group().local_rank, self.unique_rank)
Copy link
Member

@tlrmchlsmth tlrmchlsmth May 28, 2025

Choose a reason for hiding this comment

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

Instead of construction the unique rank, can we do self.world_rank = get_world_group().rank_in_group? This should be less hacky and right for PP as well

vllm/v1/engine/core.py
=======
return (engine_core_outputs,
scheduler_output.total_num_scheduled_tokens > 0)
>>>>>>> njhill/fix-dp-with-delayed-req
Copy link
Member

@tlrmchlsmth tlrmchlsmth May 28, 2025

Choose a reason for hiding this comment

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

Some merge conflict markers to clean up here

vllm/v1/worker/gpu_model_runner.py
Comment on lines +1471 to +1478
# The KVConnector API takes in a ForwardContext here because it might need it
# in certain cases, in the `NixlConnector` path we basically ignore it. A
# future note here is to consider changing this to Optional[ForwardContext].
# This work could also better be moved elsewhere.
#
# NOTE(weaton): Passing None here because getting the forward context
# is a blocking operation in the DP case.
kv_connector.start_load_kv(None)
Copy link
Member

@tlrmchlsmth tlrmchlsmth May 28, 2025

Choose a reason for hiding this comment

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

We've basically dodged this issue with the forward context changes in #18559, right?

Copy link
Contributor Author

@wseaton wseaton May 29, 2025

Choose a reason for hiding this comment

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

Yep, #18559 is tested to fix this when this change is reverted, so all good

@wseaton wseaton closed this May 29, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tlrmchlsmth tlrmchlsmth tlrmchlsmth left review comments

@njhill njhill njhill left review comments

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

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

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

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

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

Assignees

No one assigned

Labels

v1

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@wseaton @tlrmchlsmth @njhill