Skip to content
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

[v1] Move block pool operations to a separate class #13973

Merged
merged 9 commits into from
Feb 28, 2025

Conversation

heheda12345
Copy link
Collaborator

@heheda12345 heheda12345 commented Feb 27, 2025

This PR moves containers of KVCacheBlock in KVCacheManager, including block_pool, free_block_queue, and cached_block_hash_to_block into a new BlockPool class. It is just an API clean up, and doesn't change any behavior of the KVCacheManager.

It is a preparation of the hybrid allocator (#11382) and helps avoid code duplication between the current KVCacheManager and the new KVCacheManager for hybrid model.

This PR is split from #13296

CC @comaniac @WoosukKwon

Signed-off-by: Chen Zhang <zhangch99@outlook.com>
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 mergify bot added the v1 label Feb 27, 2025
Copy link
Collaborator

@comaniac comaniac left a comment

Choose a reason for hiding this comment

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

Pretty clean. Should be good to go once comments addressed

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

@comaniac I've updated the PR based on your review. Can you take another look?

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

@comaniac comaniac left a comment

Choose a reason for hiding this comment

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

LGTM!

@comaniac comaniac added the ready ONLY add when PR is ready to merge/full CI is needed label Feb 28, 2025
@comaniac comaniac enabled auto-merge (squash) February 28, 2025 19:01
@comaniac comaniac merged commit 28943d3 into vllm-project:main Feb 28, 2025
43 of 47 checks passed
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.

2 participants