Skip to content

Commit f632a5e

Browse files
authored
[PD Disaggregation] 1. fix p2p_initialize => async, 2. fix metrics in PD 3. fix uniexecutor interface (#3893)
1 parent 167ec42 commit f632a5e

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

lmdeploy/pytorch/engine/engine.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,7 @@ async def _async_loop_migration(self, resp_que: asyncio.Queue, has_runable_event
10941094
resp=msg.resp,
10951095
finish=False,
10961096
token_ids=np.array(token_ids),
1097-
metrics_info=req_metrics,
1097+
req_metrics=req_metrics,
10981098
)
10991099
outputs[session_id] = out
11001100
self.update_running_migration([msg], np.array([token_ids]), [False], [None])

lmdeploy/pytorch/engine/executor/uni_executor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ def p2p_initialize(self, init_request: DistServeInitRequest):
112112
"""
113113
return [self.model_agent.cache_engine.p2p_initialize(init_request)]
114114

115-
def p2p_connect(self, conn_request: List[DistServeKVTransferEndpointInfo]):
115+
def p2p_connect(self, remote_engine_id: str, conn_request: List[DistServeKVTransferEndpointInfo]):
116116
"""rdma_connect."""
117-
self.model_agent.cache_engine.p2p_connect(conn_request)
117+
self.model_agent.cache_engine.p2p_connect(remote_engine_id, conn_request)
118118

119119
async def migrate(self, batch: MigrationExecutionBatch):
120120
"""KV Cache Migration."""

lmdeploy/pytorch/engine/mp_engine/base_worker.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ def get_schedule_metrics(self):
8383
"""Get schedule metrics."""
8484
return self.engine.get_schedule_metrics()
8585

86-
def p2p_initialize(self, conn_request: DistServeInitRequest):
86+
async def p2p_initialize(self, conn_request: DistServeInitRequest):
8787
"""Init rdma link."""
88-
return self.engine.p2p_initialize(conn_request)
88+
return await self.engine.p2p_initialize(conn_request)
8989

9090
def p2p_connect(self, conn_request: DistServeConnectionRequest):
9191
"""rdma_connect."""

0 commit comments

Comments
 (0)