Skip to content

Commit cbe364c

Browse files
fix rebase error
Signed-off-by: Lucas Wilkinson <lwilkins@redhat.com>
1 parent 8dae978 commit cbe364c

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

vllm/v1/attention/backends/flashinfer.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from typing import TYPE_CHECKING, Any, Optional
88

99
import torch
10+
1011
from flashinfer import (BatchDecodeWithPagedKVCacheWrapper,
1112
BatchPrefillWithPagedKVCacheWrapper,
1213
MultiLevelCascadeAttentionWrapper)
@@ -19,14 +20,11 @@
1920
from vllm.logger import init_logger
2021
from vllm.platforms import current_platform
2122
from vllm.v1.attention.backends.flash_attn import use_cascade_attention
22-
from vllm.v1.attention.backends.utils import (AttentionMetadataBuilder,
23-
CommonAttentionMetadata,
24-
PerLayerParameters,
25-
get_kv_cache_layout,
26-
get_per_layer_parameters,
27-
infer_global_hyperparameters,
28-
reoder_batch_to_split_decodes_and_prefills,
29-
split_decodes_and_prefills)
23+
from vllm.v1.attention.backends.utils import (
24+
AttentionMetadataBuilder, CommonAttentionMetadata, PerLayerParameters,
25+
get_kv_cache_layout, get_per_layer_parameters,
26+
infer_global_hyperparameters, reoder_batch_to_split_decodes_and_prefills,
27+
split_decodes_and_prefills)
3028
from vllm.v1.kv_cache_interface import AttentionSpec
3129

3230
if TYPE_CHECKING:
@@ -450,7 +448,7 @@ def build(self,
450448
num_kv_heads=self.kv_cache_spec.num_kv_heads,
451449
head_dim=self.kv_cache_spec.head_size,
452450
page_size=page_size,
453-
kv_data_type=self.kv_cache_spec.dtype,
451+
kv_data_type=kv_cache_dtype,
454452
q_data_type=self.vllm_config.model_config.dtype,
455453
slot_mapping=common_attn_metadata.slot_mapping,
456454
num_decodes=num_decodes,

0 commit comments

Comments
 (0)