Skip to content

Commit 054e7ff

Browse files
committed
cruft
Signed-off-by: NickLucche <[email protected]>
1 parent 5c3a7f5 commit 054e7ff

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

tests/v1/kv_connector/nixl_integration/tp_config_sweep_accuracy_test.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ SCRIPT="v1/kv_connector/nixl_integration/run_accuracy_test.sh"
88
configs=(
99
"GPU_MEMORY_UTILIZATION=0.6 PREFILLER_TP_SIZE=2 DECODER_TP_SIZE=2"
1010
"GPU_MEMORY_UTILIZATION=0.6 PREFILLER_TP_SIZE=1 DECODER_TP_SIZE=2"
11+
"GPU_MEMORY_UTILIZATION=0.6 PREFILLER_TP_SIZE=2 DECODER_TP_SIZE=1"
1112
"GPU_MEMORY_UTILIZATION=0.8 MODEL_NAMES=deepseek-ai/deepseek-vl2-tiny" # MLA case
1213
"GPU_MEMORY_UTILIZATION=0.8 PREFILLER_TP_SIZE=1 DECODER_TP_SIZE=2 MODEL_NAMES=deepseek-ai/deepseek-vl2-tiny"
1314
"GPU_MEMORY_UTILIZATION=0.8 PREFILLER_TP_SIZE=2 DECODER_TP_SIZE=1 MODEL_NAMES=deepseek-ai/deepseek-vl2-tiny"

vllm/distributed/kv_transfer/kv_connector/utils.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
KV cache helper for store.
55
"""
66

7-
from collections import defaultdict
87
from collections.abc import Sequence
98
from concurrent.futures import CancelledError, Future
109
from typing import TYPE_CHECKING, Literal, cast
@@ -210,10 +209,7 @@ def update_finished_set(
210209
finished_recving=finished_recving or None,
211210
kv_connector_stats=aggregated_kv_connector_stats or None,
212211
invalid_block_ids=invalid_block_ids,
213-
<<<<<<< HEAD
214-
=======
215212
expected_finished_count=self._expected_finished_count,
216-
>>>>>>> 21c3711ba (review)
217213
)
218214

219215
return output

0 commit comments

Comments
 (0)