mirror of
https://git.datalinker.icu/vllm-project/vllm.git
synced 2026-07-10 02:17:09 +08:00
[BugFix] Fix ordering of KVConnector finished send/rcv sets (#18211)
Signed-off-by: Nick Hill <nhill@redhat.com>
This commit is contained in:
parent
1db4f47f81
commit
0ceaebf87b
@ -183,7 +183,8 @@ class KVConnectorBase_V1(ABC):
|
|||||||
finished generating tokens.
|
finished generating tokens.
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
ids of requests that have finished asynchronous (recving, sending).
|
ids of requests that have finished asynchronous transfer,
|
||||||
|
tuple of (sending/saving ids, recving/loading ids).
|
||||||
The finished saves/sends req ids must belong to a set provided in a
|
The finished saves/sends req ids must belong to a set provided in a
|
||||||
call to this method (this call or a prior one).
|
call to this method (this call or a prior one).
|
||||||
"""
|
"""
|
||||||
|
|||||||
@ -103,10 +103,10 @@ class MultiConnector(KVConnectorBase_V1):
|
|||||||
def get_finished(
|
def get_finished(
|
||||||
self, finished_req_ids: set[str]
|
self, finished_req_ids: set[str]
|
||||||
) -> tuple[Optional[set[str]], Optional[set[str]]]:
|
) -> tuple[Optional[set[str]], Optional[set[str]]]:
|
||||||
finished_recving: set[str] = set()
|
|
||||||
finished_sending: set[str] = set()
|
finished_sending: set[str] = set()
|
||||||
|
finished_recving: set[str] = set()
|
||||||
for c in self._connectors:
|
for c in self._connectors:
|
||||||
recving, sending = c.get_finished(finished_req_ids)
|
sending, recving = c.get_finished(finished_req_ids)
|
||||||
if not recving and not sending:
|
if not recving and not sending:
|
||||||
continue
|
continue
|
||||||
# Aggregate finished recving request ids.
|
# Aggregate finished recving request ids.
|
||||||
@ -125,7 +125,7 @@ class MultiConnector(KVConnectorBase_V1):
|
|||||||
else:
|
else:
|
||||||
self._extra_async_saves[req_id] = extra_pending - 1
|
self._extra_async_saves[req_id] = extra_pending - 1
|
||||||
|
|
||||||
return finished_recving or None, finished_sending or None
|
return finished_sending or None, finished_recving or None
|
||||||
|
|
||||||
# ==============================
|
# ==============================
|
||||||
# Scheduler-side methods
|
# Scheduler-side methods
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user