[Core] Avoid using extra thread in UniProcExecutor (#40891)

Signed-off-by: Nick Hill <nickhill123@gmail.com>
This commit is contained in:
Nick Hill
2026-05-07 15:33:00 -07:00
committed by GitHub
parent 54f548e9e5
commit 10ebb40d62
+21 -16
View File
@@ -2,7 +2,7 @@
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
import os
from collections.abc import Callable
from concurrent.futures import Future, ThreadPoolExecutor
from concurrent.futures import Future
from functools import cached_property
from multiprocessing import Lock
from typing import Any
@@ -23,6 +23,25 @@ from vllm.v1.worker.worker_base import WorkerWrapperBase
logger = init_logger(__name__)
class AsyncOutputFuture(Future):
def __init__(self, async_output: AsyncModelRunnerOutput, single_value: bool):
self.async_output = async_output
self.single_value = single_value
super().__init__()
def result(self, timeout=None):
if timeout is not None:
raise RuntimeError("timeout not implemented")
if not super().done():
try:
output = self.async_output.get_output()
self.set_result(output if self.single_value else [output])
except Exception as e:
self.set_exception(e)
return super().result()
class UniProcExecutor(Executor):
def _init_executor(self) -> None:
"""Initialize the worker and load the model."""
@@ -37,12 +56,6 @@ class UniProcExecutor(Executor):
shared_worker_lock=Lock(),
)
self.async_output_thread: ThreadPoolExecutor | None = None
if self.max_concurrent_batches > 1:
self.async_output_thread = ThreadPoolExecutor(
max_workers=1, thread_name_prefix="WorkerAsyncOutput"
)
self.driver_worker.init_worker(all_kwargs=[kwargs])
self.driver_worker.init_device()
@@ -83,15 +96,7 @@ class UniProcExecutor(Executor):
try:
result = run_method(self.driver_worker, method, args, kwargs)
if isinstance(result, AsyncModelRunnerOutput):
if (async_thread := self.async_output_thread) is not None:
if single_value:
return async_thread.submit(result.get_output)
def get_output_list() -> list[Any]:
return [result.get_output()]
return async_thread.submit(get_output_list)
result = result.get_output()
return AsyncOutputFuture(result, single_value)
future = Future[Any]()
future.set_result(result if single_value else [result])
except Exception as e: