"docs/vscode:/vscode.git/clone" did not exist on "d201d419730dec120b0ecb60ae212f08c0b68be0"
Unverified Commit a25ade5d authored by Nick Hill's avatar Nick Hill Committed by GitHub
Browse files

[BugFix] Ensure appropriate guards in destructors (#25284)


Signed-off-by: default avatarNick Hill <nhill@redhat.com>
Co-authored-by: default avatargemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
parent 8945b001
...@@ -1183,7 +1183,7 @@ class AllReduceFusionPass(VllmInductorPass): ...@@ -1183,7 +1183,7 @@ class AllReduceFusionPass(VllmInductorPass):
self.end_and_log() self.end_and_log()
def __del__(self): def __del__(self):
if self.disabled: if getattr(self, "disabled", True):
return return
if flashinfer_comm is not None: if flashinfer_comm is not None:
flashinfer_comm.trtllm_destroy_ipc_workspace_for_all_reduce( flashinfer_comm.trtllm_destroy_ipc_workspace_for_all_reduce(
......
...@@ -569,9 +569,10 @@ class NixlConnectorWorker: ...@@ -569,9 +569,10 @@ class NixlConnectorWorker:
def __del__(self): def __del__(self):
"""Cleanup background threads on destruction.""" """Cleanup background threads on destruction."""
self._handshake_initiation_executor.shutdown(wait=False) if executor := getattr(self, "_handshake_initiation_executor", None):
if self._nixl_handshake_listener_t: executor.shutdown(wait=False)
self._nixl_handshake_listener_t.join(timeout=0) if listener_t := getattr(self, "_nixl_handshake_listener_t", None):
listener_t.join(timeout=0)
@staticmethod @staticmethod
def _nixl_handshake_listener(metadata: NixlAgentMetadata, def _nixl_handshake_listener(metadata: NixlAgentMetadata,
......
...@@ -235,9 +235,6 @@ class ExecutorBase(ABC): ...@@ -235,9 +235,6 @@ class ExecutorBase(ABC):
"""Shutdown the executor.""" """Shutdown the executor."""
self.collective_rpc("shutdown") self.collective_rpc("shutdown")
def __del__(self):
self.shutdown()
async def execute_model_async( async def execute_model_async(
self, self,
execute_model_req: ExecuteModelRequest) -> List[SamplerOutput]: execute_model_req: ExecuteModelRequest) -> List[SamplerOutput]:
......
...@@ -683,7 +683,8 @@ class Worker(WorkerBase): ...@@ -683,7 +683,8 @@ class Worker(WorkerBase):
tensorizer_config=tensorizer_config, ) tensorizer_config=tensorizer_config, )
def shutdown(self) -> None: def shutdown(self) -> None:
self.model_runner.ensure_kv_transfer_shutdown() if runner := getattr(self, "model_runner", None):
runner.ensure_kv_transfer_shutdown()
def init_worker_distributed_environment( def init_worker_distributed_environment(
......
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