"xcode/vscode:/vscode.git/clone" did not exist on "c18438ca2983d4f334cfdbd4453e15c41111fa17"
Unverified Commit 6e9ff050 authored by youkaichao's avatar youkaichao Committed by GitHub
Browse files

[misc] do not read HOST_IP (#10644)


Signed-off-by: default avataryoukaichao <youkaichao@gmail.com>
parent 9db713a1
...@@ -153,7 +153,7 @@ environment_variables: Dict[str, Callable[[], Any]] = { ...@@ -153,7 +153,7 @@ environment_variables: Dict[str, Callable[[], Any]] = {
# If you are using multi-node inference, you should set this differently # If you are using multi-node inference, you should set this differently
# on each node. # on each node.
'VLLM_HOST_IP': 'VLLM_HOST_IP':
lambda: os.getenv('VLLM_HOST_IP', "") or os.getenv("HOST_IP", ""), lambda: os.getenv('VLLM_HOST_IP', ""),
# used in distributed environment to manually set the communication port # used in distributed environment to manually set the communication port
# Note: if VLLM_PORT is set, and some code asks for multiple ports, the # Note: if VLLM_PORT is set, and some code asks for multiple ports, the
......
...@@ -216,8 +216,8 @@ class RayGPUExecutor(DistributedGPUExecutor): ...@@ -216,8 +216,8 @@ class RayGPUExecutor(DistributedGPUExecutor):
f"Every node should have a unique IP address. Got {n_nodes}" f"Every node should have a unique IP address. Got {n_nodes}"
f" nodes with node ids {list(node_workers.keys())} and " f" nodes with node ids {list(node_workers.keys())} and "
f"{n_ips} unique IP addresses {all_ips}. Please check your" f"{n_ips} unique IP addresses {all_ips}. Please check your"
" network configuration. If you set `VLLM_HOST_IP` or " " network configuration. If you set `VLLM_HOST_IP`"
"`HOST_IP` environment variable, make sure it is unique for" " environment variable, make sure it is unique for"
" each node.") " each node.")
VLLM_INSTANCE_ID = get_vllm_instance_id() VLLM_INSTANCE_ID = get_vllm_instance_id()
......
...@@ -192,8 +192,8 @@ class RayHPUExecutor(DistributedGPUExecutor): ...@@ -192,8 +192,8 @@ class RayHPUExecutor(DistributedGPUExecutor):
f"Every node should have a unique IP address. Got {n_nodes}" f"Every node should have a unique IP address. Got {n_nodes}"
f" nodes with node ids {list(node_workers.keys())} and " f" nodes with node ids {list(node_workers.keys())} and "
f"{n_ips} unique IP addresses {all_ips}. Please check your" f"{n_ips} unique IP addresses {all_ips}. Please check your"
" network configuration. If you set `VLLM_HOST_IP` or " " network configuration. If you set `VLLM_HOST_IP` "
"`HOST_IP` environment variable, make sure it is unique for" "environment variable, make sure it is unique for"
" each node.") " each node.")
VLLM_INSTANCE_ID = get_vllm_instance_id() VLLM_INSTANCE_ID = get_vllm_instance_id()
......
...@@ -467,6 +467,13 @@ async def collect_from_async_generator( ...@@ -467,6 +467,13 @@ async def collect_from_async_generator(
def get_ip() -> str: def get_ip() -> str:
host_ip = envs.VLLM_HOST_IP host_ip = envs.VLLM_HOST_IP
if "HOST_IP" in os.environ and "VLLM_HOST_IP" not in os.environ:
logger.warning(
"The environment variable HOST_IP is deprecated and ignored, as"
" it is often used by Docker and other software to"
"interact with the container's network stack. Please"
"use VLLM_HOST_IP instead to set the IP address for vLLM processes"
" to communicate with each other.")
if host_ip: if host_ip:
return host_ip return host_ip
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment