Skip to content

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

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
Feb 28, 2025
Merged

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

merged 9 commits into from
Feb 28, 2025

Conversation

@heheda12345
Copy link
Collaborator

@heheda12345 heheda12345 commented Feb 27, 2025 •
edited by github-actions bot
Loading

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

@heheda12345
add block pool
ffebfca 
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 mergify bot added the v1 label Feb 27, 2025
comaniac
comaniac reviewed Feb 27, 2025
View reviewed changes
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

@heheda12345
remove _ in block_pool objects
9ce42c9 
Signed-off-by: Chen Zhang <zhangch99@outlook.com>
@heheda12345
add docstring to blockpool
24b2038 
Signed-off-by: Chen Zhang <zhangch99@outlook.com>
@heheda12345
fix prefix cache test type annotation
16560e7 
Signed-off-by: Chen Zhang <zhangch99@outlook.com>
@heheda12345
return false
676f662 
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?

comaniac
comaniac reviewed Feb 28, 2025
View reviewed changes
@heheda12345
remove num_cached_block_hashes
b5d7f73 
Signed-off-by: Chen Zhang <zhangch99@outlook.com>
@heheda12345
add fixme
bb44a25 
Signed-off-by: Chen Zhang <zhangch99@outlook.com>
@heheda12345
add assert
289e80f 
Signed-off-by: Chen Zhang <zhangch99@outlook.com>
comaniac
comaniac reviewed Feb 28, 2025
View reviewed changes
comaniac
comaniac approved these changes Feb 28, 2025
View reviewed changes
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
Akshat-Tripathi pushed a commit to krai/vllm that referenced this pull request Mar 3, 2025
@heheda12345 @comaniac @Akshat-Tripathi
[v1] Move block pool operations to a separate class (vllm-project#13973)
0532919 
Signed-off-by: Chen Zhang <zhangch99@outlook.com>
Co-authored-by: Cody Yu <hao.yu.cody@gmail.com>
lulmer pushed a commit to lulmer/vllm that referenced this pull request Apr 7, 2025
@heheda12345 @comaniac @lulmer
[v1] Move block pool operations to a separate class (vllm-project#13973)
6654326 
Signed-off-by: Chen Zhang <zhangch99@outlook.com>
Co-authored-by: Cody Yu <hao.yu.cody@gmail.com>
Signed-off-by: Louis Ulmer <ulmerlouis@gmail.com>
@ckhordiasma ckhordiasma mentioned this pull request Apr 17, 2025
Closed
shreyankg pushed a commit to shreyankg/vllm that referenced this pull request May 3, 2025
@heheda12345 @comaniac @shreyankg
[v1] Move block pool operations to a separate class (vllm-project#13973)
9e4de78 
Signed-off-by: Chen Zhang <zhangch99@outlook.com>
Co-authored-by: Cody Yu <hao.yu.cody@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@comaniac comaniac comaniac approved these changes

@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

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

@ywang96 ywang96 Awaiting requested review from ywang96 ywang96 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

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.

2 participants

@heheda12345 @comaniac