-
-
Notifications
You must be signed in to change notification settings - Fork 5.9k
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
[Bugfix][Kernel] allow non-power-of-two head sizes in prefix prefill #4128
Conversation
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.
LGTM!! Didn't know there was such limitation. Is there any other known limitation from this kernel ?
@@ -195,7 +201,8 @@ def _fwd_kernel( | |||
out_ptrs = Out + off_o | |||
tl.store(out_ptrs, | |||
acc, | |||
mask=offs_m[:, None] < cur_batch_seq_len - cur_batch_ctx_len) | |||
mask=dim_mask[None, :] & |
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.
This condition seems to be shared across all conditions, is this correct? If so, should we create a separate mask that combines 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.
The conditions are actually subtly different for each tl.load()
. My limited understanding of Triton is that it will inline the condition in the load operation, so I think it's better to keep two separate 1D tensors rather the pre-computing the 2D matrix anyways.
Thank you for quick review! I haven't run into any other limitations. |
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.
LGTM for me if tests pass. Probably need the original author of the kernel to take a look (was the person you? or do you happen to know?)
Looks like the original author is @caoshiyi |
I synced the fork, that should fix the spec-decoding tests I think |
cc @caoshiyi can you have a quick look at the PR? |
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.
@youkaichao @WoosukKwon can you help take a look? My skim is this is correct but my triton experience is limited.
Looks good to me if the tests passed. Thanks for fixing this! |
@rkooo567 it looks like this kernel (and also rocm_flash_attn) do not support sliding window attention. I guess if one does attention in chunks, one can drop the blocks that are out of window in the block manager (cf #3665) which takes care of most of tokens that are out of window, but not all (also depending on chunk size). I suspect having a slightly bigger window every now and then shouldn't be bad for model overall performance, but it would definitely affect the exact results. |
@rkooo567 hard to say. This PR was my first ever Triton code... But I will try to at least estimate. |
The existing prefix prefill kernel only supports head dimension that is a power of two. This due to Triton only supporting power of two block sizes. This PR enlarges the Q,K,V tensors to the next power of two and pads them with zeros when reading (and writing).
It doesn't seem to affect performance of the non-padded case.
CC @rkooo567
FIX #4127
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.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!