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
084bbac8
Unverified
Commit
084bbac8
authored
Feb 28, 2025
by
Rui Qiao
Committed by
GitHub
Feb 28, 2025
Browse files
[core] Bump ray to 2.43 (#13994)
Signed-off-by:
Rui Qiao
<
ruisearch42@gmail.com
>
parent
28943d36
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
10 deletions
+8
-10
.github/dependabot.yml
.github/dependabot.yml
+1
-1
requirements-cuda.txt
requirements-cuda.txt
+1
-1
requirements-test.in
requirements-test.in
+1
-1
requirements-test.txt
requirements-test.txt
+1
-1
vllm/executor/ray_distributed_executor.py
vllm/executor/ray_distributed_executor.py
+4
-6
No files found.
.github/dependabot.yml
View file @
084bbac8
...
@@ -23,7 +23,7 @@ updates:
...
@@ -23,7 +23,7 @@ updates:
-
dependency-name
:
"
lm-format-enforcer"
-
dependency-name
:
"
lm-format-enforcer"
-
dependency-name
:
"
gguf"
-
dependency-name
:
"
gguf"
-
dependency-name
:
"
compressed-tensors"
-
dependency-name
:
"
compressed-tensors"
-
dependency-name
:
"
ray[
adag]"
-
dependency-name
:
"
ray[
cgraph]"
# Ray Compiled Graph
-
dependency-name
:
"
lm-eval"
-
dependency-name
:
"
lm-eval"
groups
:
groups
:
minor-update
:
minor-update
:
...
...
requirements-cuda.txt
View file @
084bbac8
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
-r requirements-common.txt
-r requirements-common.txt
# Dependencies for NVIDIA GPUs
# Dependencies for NVIDIA GPUs
ray[
adag
]
=
= 2.4
0
.0 # Required for pipeline parallelism in V1.
ray[
cgraph
]
>
= 2.4
3
.0 # R
ay Compiled Graph, r
equired for pipeline parallelism in V1.
torch == 2.5.1
torch == 2.5.1
torchaudio==2.5.1
torchaudio==2.5.1
# These must be updated alongside torch
# These must be updated alongside torch
...
...
requirements-test.in
View file @
084bbac8
...
@@ -16,7 +16,7 @@ vector_quantize_pytorch # required for minicpmo_26 test
...
@@ -16,7 +16,7 @@ vector_quantize_pytorch # required for minicpmo_26 test
vocos # required for minicpmo_26 test
vocos # required for minicpmo_26 test
peft
peft
pqdm
pqdm
ray[
adag]=
=2.4
0
.0
ray[
cgraph]>
=2.4
3
.0
# Ray Compiled Graph, required by pipeline parallelism tests
sentence-transformers # required for embedding tests
sentence-transformers # required for embedding tests
soundfile # required for audio tests
soundfile # required for audio tests
jiwer # required for audio tests
jiwer # required for audio tests
...
...
requirements-test.txt
View file @
084bbac8
...
@@ -472,7 +472,7 @@ pyyaml==6.0.2
...
@@ -472,7 +472,7 @@ pyyaml==6.0.2
# vocos
# vocos
rapidfuzz==3.12.1
rapidfuzz==3.12.1
# via jiwer
# via jiwer
ray==2.4
0
.0
ray==2.4
3
.0
# via -r requirements-test.in
# via -r requirements-test.in
redis==5.2.0
redis==5.2.0
# via tensorizer
# via tensorizer
...
...
vllm/executor/ray_distributed_executor.py
View file @
084bbac8
...
@@ -500,7 +500,7 @@ class RayDistributedExecutor(DistributedExecutorBase):
...
@@ -500,7 +500,7 @@ class RayDistributedExecutor(DistributedExecutorBase):
import
pkg_resources
import
pkg_resources
from
packaging
import
version
from
packaging
import
version
required_version
=
version
.
parse
(
"2.40"
)
required_version
=
version
.
parse
(
"2.4
3.
0"
)
current_version
=
version
.
parse
(
current_version
=
version
.
parse
(
pkg_resources
.
get_distribution
(
"ray"
).
version
)
pkg_resources
.
get_distribution
(
"ray"
).
version
)
if
current_version
<
required_version
:
if
current_version
<
required_version
:
...
@@ -512,20 +512,19 @@ class RayDistributedExecutor(DistributedExecutorBase):
...
@@ -512,20 +512,19 @@ class RayDistributedExecutor(DistributedExecutorBase):
"ray.experimental.compiled_dag_ref"
)
"ray.experimental.compiled_dag_ref"
)
if
cgraph_spec
is
None
:
if
cgraph_spec
is
None
:
raise
ValueError
(
"Ray Compiled Graph is not installed. "
raise
ValueError
(
"Ray Compiled Graph is not installed. "
"Run `pip install ray[
adag
]` to install it."
)
"Run `pip install ray[
cgraph
]` to install it."
)
cupy_spec
=
importlib
.
util
.
find_spec
(
"cupy"
)
cupy_spec
=
importlib
.
util
.
find_spec
(
"cupy"
)
if
cupy_spec
is
None
and
envs
.
VLLM_USE_RAY_COMPILED_DAG_NCCL_CHANNEL
:
if
cupy_spec
is
None
and
envs
.
VLLM_USE_RAY_COMPILED_DAG_NCCL_CHANNEL
:
raise
ValueError
(
raise
ValueError
(
"cupy is not installed but required since "
"cupy is not installed but required since "
"VLLM_USE_RAY_COMPILED_DAG_NCCL_CHANNEL is set. "
"VLLM_USE_RAY_COMPILED_DAG_NCCL_CHANNEL is set. "
"Run `pip install ray[
adag
]` and check cupy installation."
)
"Run `pip install ray[
cgraph
]` and check cupy installation."
)
def
_compiled_ray_dag
(
self
,
enable_asyncio
:
bool
):
def
_compiled_ray_dag
(
self
,
enable_asyncio
:
bool
):
assert
self
.
parallel_config
.
use_ray
assert
self
.
parallel_config
.
use_ray
self
.
_check_ray_cgraph_installation
()
self
.
_check_ray_cgraph_installation
()
from
ray.dag
import
InputNode
,
MultiOutputNode
from
ray.dag
import
InputNode
,
MultiOutputNode
from
ray.experimental.channel.torch_tensor_type
import
TorchTensorType
logger
.
info
(
"VLLM_USE_RAY_COMPILED_DAG_NCCL_CHANNEL = %s"
,
logger
.
info
(
"VLLM_USE_RAY_COMPILED_DAG_NCCL_CHANNEL = %s"
,
envs
.
VLLM_USE_RAY_COMPILED_DAG_NCCL_CHANNEL
)
envs
.
VLLM_USE_RAY_COMPILED_DAG_NCCL_CHANNEL
)
...
@@ -574,8 +573,7 @@ class RayDistributedExecutor(DistributedExecutorBase):
...
@@ -574,8 +573,7 @@ class RayDistributedExecutor(DistributedExecutorBase):
if
envs
.
VLLM_USE_RAY_COMPILED_DAG_NCCL_CHANNEL
\
if
envs
.
VLLM_USE_RAY_COMPILED_DAG_NCCL_CHANNEL
\
else
"auto"
else
"auto"
outputs
=
[
outputs
=
[
output
.
with_type_hint
(
output
.
with_tensor_transport
(
transport
=
transport
)
TorchTensorType
(
transport
=
transport
))
for
output
in
outputs
for
output
in
outputs
]
]
...
...
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