xinyun/vllm
1
0
Fork 0
mirror of https://git.datalinker.icu/vllm-project/vllm.git synced 2026-06-09 20:49:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

[core] Pass all driver env vars to ray workers unless excluded (#14099)

Browse Source 
Signed-off-by: Rui Qiao <ruisearch42@gmail.com>
This commit is contained in:
Rui Qiao 2025-03-03 19:44:17 -08:00 committed by GitHub
parent 989f4f430c
commit bf13d40972
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
vllm/executor/ray_distributed_executor.py
View File

@ -1,6 +1,7 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
import asyncio import asyncio
import json
import os import os
from collections import defaultdict from collections import defaultdict
from dataclasses import dataclass from dataclasses import dataclass
@ -48,6 +49,24 @@ class RayWorkerMetaData:
class RayDistributedExecutor(DistributedExecutorBase): class RayDistributedExecutor(DistributedExecutorBase):
"""Ray-based distributed executor"""
# These env vars are worker-specific, therefore are NOT copied
# from the driver to the workers
WORKER_SPECIFIC_ENV_VARS = {
"VLLM_HOST_IP", "VLLM_HOST_PORT", "LOCAL_RANK", "CUDA_VISIBLE_DEVICES"
}
config_home = envs.VLLM_CONFIG_ROOT
# This file contains a list of env vars that should not be copied
# from the driver to the Ray workers.
non_carry_over_env_vars_file = os.path.join(
config_home, "ray_non_carry_over_env_vars.json")
if os.path.exists(non_carry_over_env_vars_file):
with open(non_carry_over_env_vars_file) as f:
non_carry_over_env_vars = set(json.load(f))
else:
non_carry_over_env_vars = set()
uses_ray: bool = True uses_ray: bool = True
@ -311,9 +330,9 @@ class RayDistributedExecutor(DistributedExecutorBase):
# Environment variables to copy from driver to workers # Environment variables to copy from driver to workers
env_vars_to_copy = [ env_vars_to_copy = [
"VLLM_ATTENTION_BACKEND", "TPU_CHIPS_PER_HOST_BOUNDS", v for v in envs.environment_variables
"TPU_HOST_BOUNDS", "VLLM_USE_V1", "VLLM_TRACE_FUNCTION", if v not in self.WORKER_SPECIFIC_ENV_VARS
"VLLM_TORCH_PROFILER_DIR", "VLLM_TEST_ENABLE_EP" and v not in self.non_carry_over_env_vars
] ]
# Copy existing env vars to each worker's args # Copy existing env vars to each worker's args
@ -323,9 +342,14 @@ class RayDistributedExecutor(DistributedExecutorBase):
if name in os.environ: if name in os.environ:
args[name] = os.environ[name] args[name] = os.environ[name]
logger.info("non_carry_over_env_vars from config: %s",
self.non_carry_over_env_vars)
logger.info( logger.info(
"Copying the following environment variables to workers: %s", "Copying the following environment variables to workers: %s",
[v for v in env_vars_to_copy if v in os.environ]) [v for v in env_vars_to_copy if v in os.environ])
logger.info(
"If certain env vars should NOT be copied to workers, add them to "
"%s file", self.non_carry_over_env_vars_file)
self._env_vars_for_all_workers = ( self._env_vars_for_all_workers = (
all_args_to_update_environment_variables) all_args_to_update_environment_variables)