Skip to content

Commit b562044

Browse files
fix rebase error
Signed-off-by: Lucas Wilkinson <lwilkins@redhat.com>
1 parent 6034d1d commit b562044

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

vllm/v1/attention/backends/mla/common.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -208,12 +208,10 @@
208208
UnquantizedLinearMethod)
209209
from vllm.platforms import current_platform
210210
from vllm.utils import cdiv, round_down
211-
from vllm.v1.attention.backends.utils import (AttentionMetadataBuilder,
212-
CommonAttentionMetadata,
213-
get_per_layer_parameters,
214-
infer_global_hyperparameters,
215-
reoder_batch_to_split_decodes_and_prefills,
216-
split_decodes_and_prefills)
211+
from vllm.v1.attention.backends.utils import (
212+
AttentionMetadataBuilder, CommonAttentionMetadata,
213+
get_per_layer_parameters, infer_global_hyperparameters,
214+
reoder_batch_to_split_decodes_and_prefills, split_decodes_and_prefills)
217215
from vllm.v1.kv_cache_interface import AttentionSpec
218216

219217
try:
@@ -681,7 +679,7 @@ def build(self,
681679
decode=decode_metadata,
682680
)
683681

684-
if self._use_fi_prefill and self._num_prefills > 0:
682+
if self._use_fi_prefill and num_prefills > 0:
685683
assert isinstance(attn_metadata.prefill, FlashInferPrefillMetadata)
686684
self._build_fi_prefill_wrappers(attn_metadata.prefill)
687685

0 commit comments

Comments
 (0)