Skip to content

P/D Stable Branch #85

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
Open
wants to merge 32 commits into
base: main
Choose a base branch
from
Open

P/D Stable Branch #85

wants to merge 32 commits into from

Conversation

robertgshaw2-redhat
Copy link
Collaborator

@robertgshaw2-redhat robertgshaw2-redhat commented May 14, 2025 •
edited by github-actions bot
Loading

SUMMARY:

  • ALL BUGFIXES SHOULD GO HERE

mgoin and others added 27 commits May 3, 2025 08:42
@mgoin @njhill
[V1] Support multiple kv connectors
3a70eda 
Signed-off-by: mgoin <mgoin64@gmail.com>
Signed-off-by: Nick Hill <nhill@redhat.com>
@mgoin @njhill
Example script
89a5788 
Signed-off-by: mgoin <mgoin64@gmail.com>
@mgoin @njhill
.
4fa62d4 
Signed-off-by: mgoin <mgoin64@gmail.com>
@mgoin @njhill
Add test
15ca542 
Signed-off-by: mgoin <mgoin64@gmail.com>
@mgoin @njhill
make mypy happy
cd5af12 
Signed-off-by: mgoin <mgoin64@gmail.com>
@njhill
move MultiKVConnectorMetadata to multi_connector.py
5a9a314 
Signed-off-by: Nick Hill <nhill@redhat.com>
@njhill
minor simplifications
2f5e537 
Signed-off-by: Nick Hill <nhill@redhat.com>
@mgoin @njhill
Remove script
014cb2c 
Signed-off-by: mgoin <mgoin64@gmail.com>
@njhill
michael inprogress
7370d83 
Signed-off-by: Nick Hill <nhill@redhat.com>
@mgoin @njhill
Make sure we pop requests from connector dict
df0a82b 
Signed-off-by: mgoin <mgoin64@gmail.com>
@mgoin @njhill
req_id -> request_id
8423135 
Signed-off-by: mgoin <mgoin64@gmail.com>
@mgoin
Update with better test
551fff1 
Signed-off-by: mgoin <mgoin64@gmail.com>
@njhill
add comment to test
10a26b6 
Signed-off-by: Nick Hill <nhill@redhat.com>
@njhill
Handle other new methods and latest API changes
35f3748 
Signed-off-by: Nick Hill <nhill@redhat.com>
@njhill
update get_finished() method with new arg
ff4e083 
Signed-off-by: Nick Hill <nhill@redhat.com>
@mgoin
Merge branch 'main' into multi-kv-connectors
a0f7136 
Signed-off-by: mgoin <mgoin64@gmail.com>
@mgoin
Move test to v1/kv_connector/unit
fc65a18 
Signed-off-by: mgoin <mgoin64@gmail.com>
@njhill
update KVTransferParams typing
e5e1191 
Signed-off-by: Nick Hill <nhill@redhat.com>
@mgoin
Fix typing issue for get_finished
8537d93 
Signed-off-by: mgoin <mgoin64@gmail.com>
@njhill
remove @DataClass from KVConnectorMetadata
9a767d1 
This was there originally but inadvertently dropped

Signed-off-by: Nick Hill <nhill@redhat.com>
@mgoin
Merge branch 'main' into multi-kv-connectors
59ba66f
@tlrmchlsmth @robertgshaw2-redhat
[P/D Disagg][Benchmarking] One request at a time benchmarking for P/D (…
9459f0a 
…#79)

* Benchmark one concurrent req

Signed-off-by: Tyler Michael Smith <tyler@neuralmagic.com>

* Updates

Signed-off-by: Tyler Michael Smith <tyler@neuralmagic.com>

* restore

Signed-off-by: Tyler Michael Smith <tyler@neuralmagic.com>

* Improve random requests, switch up initial test

Signed-off-by: Tyler Michael Smith <tyler@neuralmagic.com>

---------

Signed-off-by: Tyler Michael Smith <tyler@neuralmagic.com>
Signed-off-by: Nick Hill <nhill@redhat.com>
@njhill @robertgshaw2-redhat
add LMCache async save support
3a63220 
Requires version of LMCache with the corresponding changes

Signed-off-by: Nick Hill <nhill@redhat.com>
@njhill @robertgshaw2-redhat
handle disabled lmcache async save
6b8a8f8 
Signed-off-by: Nick Hill <nhill@redhat.com>
@njhill @robertgshaw2-redhat
fix
f5bc748 
Signed-off-by: Nick Hill <nhill@redhat.com>
@robertgshaw2-redhat
ifxed
ed1af74 
Signed-off-by: rshaw@neuralmagic.com <robertgshaw2@gmail.com>
@robertgshaw2-redhat
Merge remote-tracking branch 'nm-fork/multi-kv-connectors' into llm-d…
6a0c5cd 
…-launch-branch
@github-actions GitHub Actions
Copy link

👋 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.

🚀

@njhill
[BugFix] Fix ordering of KVConnector finished send/rcv sets
b6826ef 
Signed-off-by: Nick Hill <nhill@redhat.com>
njhill and others added 3 commits May 16, 2025 07:51
@njhill
Merge pull request #89 from njhill/pdl-fix-send-rcv-order
f7faa01 
[BugFix] Fix ordering of KVConnector finished send/rcv sets
@njhill
[BugFix] Fix multi async save in MultiConnector (#90)
3032553 
The MultiKVConnector impl keeps track of cases where multiple connectors are async saving the same request, but this state needs to be shared from the scheduler side to the worker side.

Signed-off-by: Nick Hill <nhill@redhat.com>
@njhill @NickLucche
[BugFix] Fix handling of num_computed_tokens with connector (#91)
16bed57 
* [BugFix] Fix handling of num_computed_tokens with connector

vllm-project#18001 changed the behaviour subtly and broke some multi-connector cases.

This change ensures we don't call the connector get_num_new_matched_tokens method a second time for a given request after an async load has completed.

Signed-off-by: Nick Hill <nhill@redhat.com>

* fix linting

Signed-off-by: Nick Hill <nhill@redhat.com>

* handle full cache hit on P/D decode worker case

Signed-off-by: Nick Hill <nhill@redhat.com>

* fix comment wording

Co-authored-by: Nicolò Lucchesi <nicolo.lucchesi@gmail.com>

---------

Signed-off-by: Nick Hill <nhill@redhat.com>
Co-authored-by: Nicolò Lucchesi <nicolo.lucchesi@gmail.com>
@robertgshaw2-redhat
[Bugfix][P/D] Fix Preemption + Prefix Cache Bug (#92)
db9a82d 
* updated

Signed-off-by: rshaw@neuralmagic.com <robertgshaw2@gmail.com>

* cleanup issue

Signed-off-by: rshaw@neuralmagic.com <robertgshaw2@gmail.com>

---------

Signed-off-by: rshaw@neuralmagic.com <robertgshaw2@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tlrmchlsmth tlrmchlsmth tlrmchlsmth approved these changes

@njhill njhill Awaiting requested review from njhill njhill 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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@robertgshaw2-redhat @tlrmchlsmth @mgoin @njhill