[P/D][V1] KV Connector API V1 (#15960)
Signed-off-by: ApostaC <yihua98@uchicago.edu> Signed-off-by: rshaw@neuralmagic.com <robertgshaw2@gmail.com> Signed-off-by: remi <remi@mistral.ai> Co-authored-by: rshaw@neuralmagic.com <robertgshaw2@gmail.com> Co-authored-by: Robert Shaw <114415538+robertgshaw2-redhat@users.noreply.github.com> Co-authored-by: Rémi Delacourt <54138269+Flechman@users.noreply.github.com> Co-authored-by: Tyler Michael Smith <tysmith@redhat.com>
This commit is contained in:
co-authored by
rshaw@neuralmagic.com <robertgshaw2@gmail.com>
Robert Shaw
Rémi Delacourt
Tyler Michael Smith
parent
0377b8310b
commit
3408e47159
@@ -11,6 +11,10 @@ import torch.distributed as dist
|
||||
|
||||
import vllm.envs as envs
|
||||
from vllm.config import VllmConfig
|
||||
from vllm.distributed.kv_transfer import (get_kv_transfer_group,
|
||||
has_kv_transfer_group,
|
||||
is_v1_kv_transfer_group)
|
||||
from vllm.distributed.kv_transfer.kv_connector.v1 import KVConnectorBase_V1
|
||||
from vllm.logger import init_logger
|
||||
|
||||
if TYPE_CHECKING:
|
||||
@@ -98,6 +102,17 @@ def set_forward_context(attn_metadata: Any,
|
||||
virtual_engine=virtual_engine,
|
||||
attn_metadata=attn_metadata,
|
||||
dp_metadata=dp_metadata)
|
||||
|
||||
# KVConnector: trigger (possibly async) load before forward.
|
||||
# Each attn layer will block until the reading is complete.
|
||||
trigger_kv_transfer = (attn_metadata is not None
|
||||
and has_kv_transfer_group()
|
||||
and is_v1_kv_transfer_group())
|
||||
if trigger_kv_transfer:
|
||||
kv_connector = get_kv_transfer_group()
|
||||
assert isinstance(kv_connector, KVConnectorBase_V1)
|
||||
kv_connector.start_load_kv(_forward_context)
|
||||
|
||||
try:
|
||||
yield
|
||||
finally:
|
||||
@@ -133,4 +148,12 @@ def set_forward_context(attn_metadata: Any,
|
||||
logger.info(("Batchsize forward time stats "
|
||||
"(batchsize, count, median_time(ms)): %s"),
|
||||
forward_stats)
|
||||
|
||||
# KVConnector: each attn layer triggers (possibly async) save.
|
||||
# Ensure all those operations complete before forward() is done.
|
||||
if trigger_kv_transfer:
|
||||
kv_connector = get_kv_transfer_group()
|
||||
assert isinstance(kv_connector, KVConnectorBase_V1)
|
||||
kv_connector.wait_for_save()
|
||||
|
||||
_forward_context = prev_context
|
||||
|
||||
Reference in New Issue
Block a user