-
-
Notifications
You must be signed in to change notification settings - Fork 4.6k
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
[Hardware][CPU] Support chunked-prefill and prefix-caching on CPU #10355
base: main
Are you sure you want to change the base?
Conversation
👋 Hi! Thank you for contributing to the vLLM project. 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 do one of these:
🚀 |
Signed-off-by: jiang1.li <[email protected]>
Signed-off-by: jiang1.li <[email protected]>
Signed-off-by: jiang1.li <[email protected]>
Signed-off-by: jiang1.li <[email protected]>
Signed-off-by: jiang1.li <[email protected]>
Signed-off-by: jiang1.li <[email protected]>
e9ddc0e
to
d33a175
Compare
Signed-off-by: jiang1.li <[email protected]>
# reset distributed env properly. Use a value > 1 just when you test. | ||
@pytest.mark.parametrize("tensor_parallel_size", [1]) | ||
@pytest.mark.parametrize("attention_backend", ["TORCH_SDPA"]) | ||
@pytest.mark.cpu_only |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you define this mark in pyproject.toml
?
docker exec cpu-test bash -c " | ||
set -e | ||
pytest -s -v -k cpu_only \ | ||
tests/basic_correctness/test_chunked_prefill.py" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We may need to increase the timeout, I think 25 minutes isn't enough now.
I'll leave the detailed review to @Isotr0py and @WoosukKwon . |
.. note:: | ||
More advanced features on `chunked-prefill`, `prefix-caching` and `FP8 KV cache` are under development and will be available soon. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since FP8 KV cache
is still under development, perhaps we can keep this note temporarily.
block_table = seq_group_metadata.block_tables[seq_id] | ||
seq_len = seq_data.get_len() | ||
context_len = seq_data.get_num_computed_tokens() | ||
if is_prompt: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we separate the contents of this "if else" statement into two functions like _compute_prompt
and _compute_decode
? I think this if else statement is a little bit too long.
data.input_mrope_positions[0].extend( # type: ignore | ||
next_pos[0]) | ||
data.input_mrope_positions[1].extend( # type: ignore | ||
next_pos[1]) | ||
data.input_mrope_positions[2].extend( # type: ignore | ||
next_pos[2]) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
data.input_mrope_positions[0].extend( # type: ignore | |
next_pos[0]) | |
data.input_mrope_positions[1].extend( # type: ignore | |
next_pos[1]) | |
data.input_mrope_positions[2].extend( # type: ignore | |
next_pos[2]) | |
for idx in range(3): | |
input_mrope_positions[idx].extend(next_pos[idx]) |
I think we can keep the previous for loop here to avoid duplicate code.
self.input_data.input_mrope_positions[0].extend( # type: ignore | ||
mrope_positions[0]) | ||
self.input_data.input_mrope_positions[1].extend( # type: ignore | ||
mrope_positions[1]) | ||
self.input_data.input_mrope_positions[2].extend( # type: ignore | ||
mrope_positions[2]) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
self.input_data.input_mrope_positions[0].extend( # type: ignore | |
mrope_positions[0]) | |
self.input_data.input_mrope_positions[1].extend( # type: ignore | |
mrope_positions[1]) | |
self.input_data.input_mrope_positions[2].extend( # type: ignore | |
mrope_positions[2]) | |
for idx in range(3): | |
input_mrope_positions[idx].extend(next_pos[idx]) |
Ditto.
query_lens_tensor = torch.tensor(prefill_query_lens, | ||
dtype=torch.int32, | ||
device="cpu") | ||
kv_lens_tensor = torch.tensor(prefill_seq_lens, | ||
dtype=torch.int32, | ||
device="cpu") | ||
query_start_loc = torch.zeros(input_data.num_prefills + 1, | ||
dtype=torch.int32, | ||
device="cpu") | ||
kv_start_loc = torch.zeros(input_data.num_prefills + 1, | ||
dtype=torch.int32, | ||
device="cpu") | ||
torch.cumsum(query_lens_tensor, | ||
dim=0, | ||
dtype=torch.int32, | ||
out=query_start_loc[1:]) | ||
torch.cumsum(kv_lens_tensor, | ||
dim=0, | ||
dtype=torch.int32, | ||
out=kv_start_loc[1:]) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should not prepare attention metadata in model runner explicitly. We can implement TorchSDPAMetadataBuilder
and move these logics there (just like xformers and FA).
This PR provides CPU chunked-prefill and prefix-caching support. For now only FP32 and BF16 are supported, ipex-2.6 will provide the FP16 support.
PR Checklist (Click to Expand)
Thank you for your contribution to vLLM! Before submitting the pull request, please ensure the PR meets the following criteria. This helps vLLM maintain the code quality and improve the efficiency of the review process.
PR Title and Classification
Only specific types of PRs will be reviewed. The PR title is prefixed appropriately to indicate the type of change. Please use one of the following:
[Bugfix]
for bug fixes.[CI/Build]
for build or continuous integration improvements.[Doc]
for documentation fixes and improvements.[Model]
for adding a new model or improving an existing model. Model name should appear in the title.[Frontend]
For changes on the vLLM frontend (e.g., OpenAI API server,LLM
class, etc.)[Kernel]
for changes affecting CUDA kernels or other compute kernels.[Core]
for changes in the core vLLM logic (e.g.,LLMEngine
,AsyncLLMEngine
,Scheduler
, etc.)[Hardware][Vendor]
for hardware-specific changes. Vendor name should appear in the prefix (e.g.,[Hardware][AMD]
).[Misc]
for PRs that do not fit the above categories. Please use this sparingly.Note: If the PR spans more than one category, please include all relevant prefixes.
Code Quality
The PR need to meet the following code quality standards:
format.sh
to format your code.docs/source/
if the PR modifies the user-facing behaviors of vLLM. It helps vLLM user understand and utilize the new features or changes.Adding or changing kernels
Each custom kernel needs a schema and one or more implementations to be registered with PyTorch.
Tensors
require meta-functions. Meta-functions should be implemented and registered in python so that dynamic dims can be handled automatically. See above documents for a description of meta-functions.torch.libary.opcheck()
to test the function registration and meta-function for any registered ops. Seetests/kernels
for examples.Notes for Large Changes
Please keep the changes as concise as possible. For major architectural changes (>500 LOC excluding kernel/data/config/test), we would expect a GitHub issue (RFC) discussing the technical design and justification. Otherwise, we will tag it with
rfc-required
and might not go through the PR.What to Expect for the Reviews
The goal of the vLLM team is to be a transparent reviewing machine. We would like to make the review process transparent and efficient and make sure no contributor feel confused or frustrated. However, the vLLM team is small, so we need to prioritize some PRs over others. Here is what you can expect from the review process:
action-required
label on the PR if there are changes required. The contributor should address the comments and ping the reviewer to re-review the PR.Thank You
Finally, thank you for taking the time to read these guidelines and for your interest in contributing to vLLM. Your contributions make vLLM a great tool for everyone!