Skip to content

GitLab

Unverified Commit 5a1c2e15 authored by CYJiang's avatar CYJiang Committed by GitHub
Browse files

[Mis] remove duplicate engine status checks (#19647) 


Signed-off-by: default avatargoogs1025 <googs1025@gmail.com>
parent 4c8f64fa
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
vllm/v1/engine/core_client.py
View file @ 5a1c2e15
...@@ -794,7 +794,6 @@ class AsyncMPClient(MPClient): ...@@ -794,7 +794,6 @@ class AsyncMPClient(MPClient):
request_type: EngineCoreRequestType, request_type: EngineCoreRequestType,
request: Any, request: Any,
engine: Optional[CoreEngine] = None) -> Awaitable[Any]: engine: Optional[CoreEngine] = None) -> Awaitable[Any]:
self.ensure_alive()
if engine is None: if engine is None:
engine = self.core_engine engine = self.core_engine
...@@ -1059,7 +1058,7 @@ class DPAsyncMPClient(AsyncMPClient): ...@@ -1059,7 +1058,7 @@ class DPAsyncMPClient(AsyncMPClient):
self.reqs_in_flight.pop(req_id, None) self.reqs_in_flight.pop(req_id, None)
async def abort_requests_async(self, request_ids: list[str]) -> None: async def abort_requests_async(self, request_ids: list[str]) -> None:
if not request_ids: if not request_ids or self.resources.engine_dead:
return return
if len(request_ids) == 1: if len(request_ids) == 1:
...@@ -1077,9 +1076,8 @@ class DPAsyncMPClient(AsyncMPClient): ...@@ -1077,9 +1076,8 @@ class DPAsyncMPClient(AsyncMPClient):
async def _abort_requests(self, request_ids: list[str], async def _abort_requests(self, request_ids: list[str],
engine: CoreEngine) -> None: engine: CoreEngine) -> None:
if not self.resources.engine_dead: await self._send_input(EngineCoreRequestType.ABORT, request_ids,
await self._send_input(EngineCoreRequestType.ABORT, request_ids, engine)
engine)
class RayDPClient(DPAsyncMPClient): class RayDPClient(DPAsyncMPClient):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment