-
Notifications
You must be signed in to change notification settings - Fork 21
[OOT Plugin][Performance] Optimize metadata prepare #263
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
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -21,7 +21,6 @@ | |||||
| @dataclass | ||||||
| class AiterFlashAttentionPhaseMetadata: | ||||||
| max_query_len: int | ||||||
| min_query_len: int | ||||||
| max_seq_len: int | ||||||
| query_start_loc: torch.Tensor | ||||||
|
|
||||||
|
|
@@ -58,7 +57,6 @@ class AiterChunkContextMetadata: | |||||
| @dataclass | ||||||
| class AiterFlashAttentionChunkPrefillMetadata: | ||||||
| max_query_len: int | ||||||
| min_query_len: int | ||||||
| max_seq_len: int | ||||||
| query_start_loc: torch.Tensor | ||||||
| chunk_context_metadata: AiterChunkContextMetadata | ||||||
|
|
@@ -300,17 +298,31 @@ def build( | |||||
| num_extend_tokens, | ||||||
| num_prefill_tokens, | ||||||
| ) = split_ret | ||||||
| prefill_only = num_decodes == 0 and num_extends == 0 and num_prefills > 0 | ||||||
| decode_only = num_decodes > 0 and num_extends == 0 and num_prefills == 0 | ||||||
| mixed_request = not (prefill_only or decode_only) | ||||||
|
|
||||||
| query_start_loc_cpu = common_attn_metadata.query_start_loc_cpu | ||||||
| seq_lens = common_attn_metadata.seq_lens.cpu() | ||||||
| query_lens_cpu = query_start_loc_cpu[1:] - query_start_loc_cpu[:-1] | ||||||
| if mixed_request: | ||||||
| seq_lens = common_attn_metadata.seq_lens.cpu() | ||||||
| query_lens_cpu = query_start_loc_cpu[1:] - query_start_loc_cpu[:-1] | ||||||
| else: | ||||||
| seq_lens = None | ||||||
| query_lens_cpu = None | ||||||
|
|
||||||
| decode_metadata = None | ||||||
| if num_decodes > 0: | ||||||
| decode_metadata = AiterFlashAttentionDecodeMetadata( | ||||||
| max_query_len=query_lens_cpu[:num_decodes].max().item(), | ||||||
| min_query_len=query_lens_cpu[:num_decodes].min().item(), | ||||||
| max_seq_len=seq_lens[:num_decodes].max().item(), | ||||||
| max_query_len=( | ||||||
| common_attn_metadata.max_query_len | ||||||
| if decode_only | ||||||
| else query_lens_cpu[:num_decodes].max().item() | ||||||
| ), | ||||||
| max_seq_len=( | ||||||
| common_attn_metadata.max_seq_len | ||||||
| if decode_only | ||||||
| else seq_lens[:num_decodes].max().item() | ||||||
| ), | ||||||
| query_start_loc=common_attn_metadata.query_start_loc[: num_decodes + 1], | ||||||
| ) | ||||||
|
|
||||||
|
|
@@ -435,26 +447,32 @@ def build( | |||||
| ) | ||||||
| extend_metadata = AiterFlashAttentionChunkPrefillMetadata( | ||||||
| max_query_len=query_lens_for_extend.max().item(), | ||||||
| min_query_len=query_lens_for_extend.min().item(), | ||||||
| max_seq_len=seq_lens[num_extends_slice].max().item(), | ||||||
| query_start_loc=query_start_loc_device - query_start_loc_device[0], | ||||||
| chunk_context_metadata=chunk_context_metadata, | ||||||
| ) | ||||||
|
|
||||||
| prefill_metadata = None | ||||||
| if num_prefills > 0: | ||||||
| query_lens_for_prefill = query_lens_cpu[num_decodes + num_extends :] | ||||||
| query_start_loc_device = common_attn_metadata.query_start_loc[ | ||||||
| num_decodes + num_extends : | ||||||
| ] | ||||||
| prefill_metadata = AiterFlashAttentionPrefillMetadata( | ||||||
| max_query_len=query_lens_for_prefill.max().item(), | ||||||
| min_query_len=query_lens_for_prefill.min().item(), | ||||||
| max_seq_len=seq_lens[num_decodes + num_extends :].max().item(), | ||||||
| max_query_len=( | ||||||
| common_attn_metadata.max_query_len | ||||||
| if prefill_only | ||||||
| else query_lens_cpu[num_decodes + num_extends :].max().item() | ||||||
| ), | ||||||
| max_seq_len=( | ||||||
| common_attn_metadata.max_seq_len | ||||||
| if prefill_only | ||||||
| else query_lens_cpu[num_decodes + num_extends :].max().item() | ||||||
|
||||||
| else query_lens_cpu[num_decodes + num_extends :].max().item() | |
| else seq_lens[num_decodes + num_extends :].max().item() |
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.
vllm don't have something like seq_lens_cpu?
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.
vllm deprecate the seq_lens_cpu in
common_metadatafor a while.