From 0636a973e025bd41538b9f920f814a4621a4d5fa Mon Sep 17 00:00:00 2001 From: shun001 <962034936@qq.com> Date: Thu, 4 Jun 2026 14:40:36 +0800 Subject: [PATCH] [vLLM] Fix vLLM Ray executor env var compatibility --- roll/distributed/strategy/vllm_strategy.py | 2 +- roll/third_party/vllm/ray_distributed_executor.py | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/roll/distributed/strategy/vllm_strategy.py b/roll/distributed/strategy/vllm_strategy.py index 6ee0f9d9d..87abeb945 100644 --- a/roll/distributed/strategy/vllm_strategy.py +++ b/roll/distributed/strategy/vllm_strategy.py @@ -14,7 +14,7 @@ from vllm import RequestOutput, SamplingParams from vllm.lora.request import LoRARequest from vllm.sampling_params import RequestOutputKind, BeamSearchParams -from vllm.inputs.data import TokensPrompt +from vllm.inputs import TokensPrompt from vllm.utils import random_uuid from roll.distributed.executor.worker import Worker diff --git a/roll/third_party/vllm/ray_distributed_executor.py b/roll/third_party/vllm/ray_distributed_executor.py index 150706ad3..b51704af5 100644 --- a/roll/third_party/vllm/ray_distributed_executor.py +++ b/roll/third_party/vllm/ray_distributed_executor.py @@ -7,7 +7,15 @@ from ray.util.scheduling_strategies import PlacementGroupSchedulingStrategy from vllm.v1.executor.ray_executor import RayDistributedExecutor, RayWorkerMetaData -from vllm.v1.executor.ray_utils import RayWorkerWrapper +try: + from vllm.v1.executor.ray_utils import ( + RayWorkerWrapper, + WORKER_SPECIFIC_ENV_VARS, + ) +except ImportError: + from vllm.v1.executor.ray_utils import RayWorkerWrapper + + WORKER_SPECIFIC_ENV_VARS = RayDistributedExecutor.WORKER_SPECIFIC_ENV_VARS from vllm.platforms import current_platform from vllm.ray.ray_env import get_env_vars_to_copy from vllm.utils.network_utils import get_distributed_init_method, get_ip, get_open_port @@ -177,7 +185,7 @@ def _init_workers_ray(self, placement_group: "PlacementGroup", **ray_remote_kwar # Environment variables to copy from driver to workers env_vars_to_copy = get_env_vars_to_copy( - exclude_vars=self.WORKER_SPECIFIC_ENV_VARS, + exclude_vars=WORKER_SPECIFIC_ENV_VARS, additional_vars=set(current_platform.additional_env_vars), destination="workers", )