From a4f2eff529909790d66c8175412c483b5450de31 Mon Sep 17 00:00:00 2001 From: darthhexx Date: Tue, 24 Sep 2024 17:02:09 +1000 Subject: [PATCH 1/2] Ray 2.9.x doesn't expose available_resources_per_node so expose the GlobalState function --- vllm/executor/ray_utils.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/vllm/executor/ray_utils.py b/vllm/executor/ray_utils.py index 59e9854393b6..eb559ee2a451 100644 --- a/vllm/executor/ray_utils.py +++ b/vllm/executor/ray_utils.py @@ -21,6 +21,12 @@ from ray._private.state import available_resources_per_node from ray.util import placement_group_table from ray.util.placement_group import PlacementGroup + try: + from ray._private.state import available_resources_per_node + except ImportError: + # Ray 2.9.x doesn't expose `available_resources_per_node` + from ray._private.state import state as _state + available_resources_per_node = _state._available_resources_per_node class RayWorkerWrapper(WorkerWrapperBase): """Ray wrapper for vllm.worker.Worker, allowing Worker to be From 4bc50ec4844080fc7fab34fac36937ed57a13bdd Mon Sep 17 00:00:00 2001 From: darthhexx Date: Tue, 24 Sep 2024 17:59:25 +1000 Subject: [PATCH 2/2] Remove the original import Signed-off-by: darthhexx --- vllm/executor/ray_utils.py | 1 - 1 file changed, 1 deletion(-) diff --git a/vllm/executor/ray_utils.py b/vllm/executor/ray_utils.py index eb559ee2a451..7e46acefc5b0 100644 --- a/vllm/executor/ray_utils.py +++ b/vllm/executor/ray_utils.py @@ -18,7 +18,6 @@ try: import ray - from ray._private.state import available_resources_per_node from ray.util import placement_group_table from ray.util.placement_group import PlacementGroup try: