Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenDAS
vllm_cscc
Commits
6e9ff050
Unverified
Commit
6e9ff050
authored
Nov 25, 2024
by
youkaichao
Committed by
GitHub
Nov 25, 2024
Browse files
[misc] do not read HOST_IP (#10644)
Signed-off-by:
youkaichao
<
youkaichao@gmail.com
>
parent
9db713a1
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
5 deletions
+12
-5
vllm/envs.py
vllm/envs.py
+1
-1
vllm/executor/ray_gpu_executor.py
vllm/executor/ray_gpu_executor.py
+2
-2
vllm/executor/ray_hpu_executor.py
vllm/executor/ray_hpu_executor.py
+2
-2
vllm/utils.py
vllm/utils.py
+7
-0
No files found.
vllm/envs.py
View file @
6e9ff050
...
@@ -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
...
...
vllm/executor/ray_gpu_executor.py
View file @
6e9ff050
...
@@ -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
()
...
...
vllm/executor/ray_hpu_executor.py
View file @
6e9ff050
...
@@ -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
()
...
...
vllm/utils.py
View file @
6e9ff050
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment