[V1] Simplify Shutdown

vllm/v1/engine/async_llm.py

@@ -103,9 +103,6 @@ def sigquit_handler(signum, frame):
 
         self.output_handler: Optional[asyncio.Task] = None
 
-    def __del__(self):
-        self.shutdown()
-
     @classmethod
     def from_engine_args(
         cls,
@@ -136,15 +133,6 @@ def from_engine_args(
             stat_loggers=stat_loggers,
         )
 
-    def shutdown(self):
-        """Shutdown, cleaning up the background proc and IPC."""
-
-        if engine_core := getattr(self, "engine_core", None):
-            engine_core.shutdown()
-
-        if handler := getattr(self, "output_handler", None):
-            handler.cancel()
-
     @classmethod
     def _get_executor_cls(cls, vllm_config: VllmConfig) -> Type[Executor]:
         executor_class: Type[Executor]

vllm/v1/engine/core.py

@@ -126,9 +126,6 @@ def step(self) -> List[EngineCoreOutput]:
             scheduler_output, output)
         return engine_core_outputs
 
-    def shutdown(self):
-        self.model_executor.shutdown()
-
     def profile(self, is_start: bool = True):
         self.model_executor.profile(is_start)
 
@@ -187,7 +184,6 @@ def signal_handler(signum, frame):
         signal.signal(signal.SIGINT, signal_handler)
 
         parent_process = psutil.Process().parent()
-        engine_core = None
         try:
             engine_core = EngineCoreProc(*args, **kwargs)
             engine_core.run_busy_loop()
@@ -200,11 +196,6 @@ def signal_handler(signum, frame):
             logger.error("EngineCore hit an exception: %s", traceback)
             parent_process.send_signal(signal.SIGQUIT)
 
-        finally:
-            if engine_core is not None:
-                engine_core.shutdown()
-                engine_core = None
-
     def run_busy_loop(self):
         """Core busy loop of the EngineCore."""
 

vllm/v1/engine/core_client.py

@@ -1,4 +1,5 @@
-from typing import List, Optional, Type
+import weakref
+from typing import List, Type
 
 import msgspec
 import zmq
@@ -52,9 +53,6 @@ def make_client(
 
         return InprocClient(vllm_config, executor_class, log_stats)
 
-    def shutdown(self):
-        pass
-
     def get_output(self) -> List[EngineCoreOutput]:
         raise NotImplementedError
 
@@ -104,12 +102,6 @@ def add_request(self, request: EngineCoreRequest) -> None:
     def abort_requests(self, request_ids: List[str]) -> None:
         self.engine_core.abort_requests(request_ids)
 
-    def shutdown(self):
-        self.engine_core.shutdown()
-
-    def __del__(self):
-        self.shutdown()
-
     def profile(self, is_start: bool = True) -> None:
         self.engine_core.profile(is_start)
 
@@ -134,6 +126,9 @@ def __init__(
         executor_class: Type[Executor],
         log_stats: bool = False,
     ):
+        # Ensure cleanup of ZMQ during GC.
+        self._finalizer = weakref.finalize(self, self.shutdown)
+
         # Serialization setup.
         self.encoder = PickleEncoder()
         self.decoder = msgspec.msgpack.Decoder(EngineCoreOutputs)
@@ -153,7 +148,6 @@ def __init__(
                                             zmq.constants.PUSH)
 
         # Start EngineCore in background process.
-        self.proc_handle: Optional[BackgroundProcHandle]
         self.proc_handle = BackgroundProcHandle(
             input_path=input_path,
             output_path=output_path,
@@ -166,13 +160,8 @@ def __init__(
             })
 
     def shutdown(self):
-        # Shut down the zmq context.
         self.ctx.destroy(linger=0)
 
-        if hasattr(self, "proc_handle") and self.proc_handle:
-            self.proc_handle.shutdown()
-            self.proc_handle = None
-
 
 class SyncMPClient(MPClient):
     """Synchronous client for multi-proc EngineCore."""

vllm/v1/engine/llm_engine.py

@@ -205,10 +205,3 @@ def get_tokenizer_group(
                             f"found type: {type(tokenizer_group)}")
 
         return tokenizer_group
-
-    def __del__(self):
-        self.shutdown()
-
-    def shutdown(self):
-        if engine_core := getattr(self, "engine_core", None):
-            engine_core.shutdown()

vllm/v1/utils.py

@@ -91,6 +91,7 @@ def __init__(
         target_fn: Callable,
         process_kwargs: Dict[Any, Any],
     ):
+        # Ensure cleanup of background process during GC.
         self._finalizer = weakref.finalize(self, self.shutdown)
 
         context = get_mp_context()
@@ -114,9 +115,6 @@ def __init__(
             raise RuntimeError(f"{process_name} initialization failed. "
                                "See root cause above.")
 
-    def __del__(self):
-        self.shutdown()
-
     def shutdown(self):
         # Shutdown the process if needed.
         if hasattr(self, "proc") and self.proc.is_alive():