Skip to content

Conversation

heheda12345
Copy link
Collaborator

For hybrid allocator, the logic to get num_computed_tokens from a KVCacheBlocks will be complex. To avoid computing that value in allocate_slots, we pass it from the return value of get_computed_blocks to the argument of allocate_slots

Signed-off-by: Chen Zhang <zhangch99@outlook.com>
@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.

🚀

@mergify
Copy link

mergify bot commented May 12, 2025

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

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 12, 2025
@WoosukKwon WoosukKwon added the ready ONLY add when PR is ready to merge/full CI is needed label May 12, 2025
Copy link
Collaborator

@WoosukKwon WoosukKwon left a comment

Choose a reason for hiding this comment

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

LGTM!

…mputed_tokens

Signed-off-by: Chen Zhang <zhangch99@outlook.com>
@mergify mergify bot removed the needs-rebase label May 13, 2025
@DarkLight1337
Copy link
Member

The failing test looks related to KV cache

Signed-off-by: Chen Zhang <zhangch99@outlook.com>
@heheda12345
Copy link
Collaborator Author

heheda12345 commented May 13, 2025

@WoosukKwon Can you double-check the fix for NIXL compatibility? Thanks!

Copy link
Collaborator

@WoosukKwon WoosukKwon left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for the fix

@WoosukKwon WoosukKwon enabled auto-merge (squash) May 13, 2025 17:11
@vllm-bot vllm-bot merged commit f2ae883 into vllm-project:main May 14, 2025
57 of 59 checks passed
njhill added a commit to njhill/vllm that referenced this pull request May 15, 2025
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>
njhill added a commit to njhill/vllm that referenced this pull request May 16, 2025
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>
njhill added a commit to neuralmagic/vllm that referenced this pull request May 16, 2025
* [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>
zzzyq pushed a commit to zzzyq/vllm that referenced this pull request May 24, 2025
…vllm-project#18001)

Signed-off-by: Chen Zhang <zhangch99@outlook.com>
Signed-off-by: Yuqi Zhang <yuqizhang@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants