mirror of
https://github.com/vllm-project/vllm.git
synced 2025-10-20 14:53:52 +08:00
[executor] feat: add supports_pp attr to executors (#21786)
Signed-off-by: Haibin Lin <haibin.lin@bytedance.com>
This commit is contained in:
@ -1490,14 +1490,18 @@ class EngineArgs:
|
||||
and _warn_or_fallback("Engine in background thread")):
|
||||
return False
|
||||
|
||||
if (self.pipeline_parallel_size > 1
|
||||
and self.distributed_executor_backend
|
||||
not in (ParallelConfig.distributed_executor_backend, "ray",
|
||||
"mp", "external_launcher")):
|
||||
name = "Pipeline Parallelism without Ray distributed executor " \
|
||||
"or multiprocessing executor or external launcher"
|
||||
_raise_or_fallback(feature_name=name, recommend_to_remove=False)
|
||||
return False
|
||||
if self.pipeline_parallel_size > 1:
|
||||
supports_pp = getattr(self.distributed_executor_backend,
|
||||
'supports_pp', False)
|
||||
if not supports_pp and self.distributed_executor_backend not in (
|
||||
ParallelConfig.distributed_executor_backend, "ray", "mp",
|
||||
"external_launcher"):
|
||||
name = "Pipeline Parallelism without Ray distributed " \
|
||||
"executor or multiprocessing executor or external " \
|
||||
"launcher"
|
||||
_raise_or_fallback(feature_name=name,
|
||||
recommend_to_remove=False)
|
||||
return False
|
||||
|
||||
# The platform may be supported on V1, but off by default for now.
|
||||
if not current_platform.default_v1( # noqa: SIM103
|
||||
|
@ -35,6 +35,7 @@ class ExecutorBase(ABC):
|
||||
"""
|
||||
|
||||
uses_ray: bool # whether the executor uses Ray for orchestration.
|
||||
supports_pp: bool = False # whether the executor supports PP
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
|
@ -41,6 +41,8 @@ logger = init_logger(__name__)
|
||||
|
||||
class MultiprocExecutor(Executor):
|
||||
|
||||
supports_pp: bool = True
|
||||
|
||||
def _init_executor(self) -> None:
|
||||
# Call self.shutdown at exit to clean up
|
||||
# and ensure workers will be terminated.
|
||||
|
@ -43,6 +43,8 @@ class FutureWrapper(Future):
|
||||
class RayDistributedExecutor(RayDistributedExecutorV0, Executor):
|
||||
"""Ray distributed executor using Ray Compiled Graphs."""
|
||||
|
||||
supports_pp: bool = True
|
||||
|
||||
def _init_executor(self) -> None:
|
||||
super()._init_executor()
|
||||
|
||||
|
Reference in New Issue
Block a user