diff --git a/ci/ray_ci/utils.py b/ci/ray_ci/utils.py index a9d6159aa8a3..be80290397dc 100644 --- a/ci/ray_ci/utils.py +++ b/ci/ray_ci/utils.py @@ -18,7 +18,7 @@ GLOBAL_CONFIG_FILE = ( os.environ.get("RAYCI_GLOBAL_CONFIG") or "ci/ray_ci/oss_config.yaml" ) -RAY_VERSION = "3.0.0.dev0" +RAY_VERSION = "2.32.0" def ci_init() -> None: diff --git a/java/api/pom_template.xml b/java/api/pom_template.xml index a7fdeb6bf23b..260f56199c1b 100644 --- a/java/api/pom_template.xml +++ b/java/api/pom_template.xml @@ -6,7 +6,7 @@ io.ray ray-superpom - 2.0.0-SNAPSHOT + 2.32.0 4.0.0 diff --git a/java/performance_test/pom_template.xml b/java/performance_test/pom_template.xml index fce0b10f8837..0e7866ff1ef1 100644 --- a/java/performance_test/pom_template.xml +++ b/java/performance_test/pom_template.xml @@ -6,7 +6,7 @@ io.ray ray-superpom - 2.0.0-SNAPSHOT + 2.32.0 4.0.0 diff --git a/java/pom.xml b/java/pom.xml index 958f735666d6..ad312f71ae18 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -5,7 +5,7 @@ 4.0.0 io.ray ray-superpom - 2.0.0-SNAPSHOT + 2.32.0 pom Ray Project Parent POM An open source framework that provides a simple, universal API for building distributed applications. @@ -63,7 +63,7 @@ 1.8 UTF-8 - 2.0.0-SNAPSHOT + 2.32.0 diff --git a/java/runtime/pom_template.xml b/java/runtime/pom_template.xml index 69010485406e..a60e6eecc144 100644 --- a/java/runtime/pom_template.xml +++ b/java/runtime/pom_template.xml @@ -6,7 +6,7 @@ io.ray ray-superpom - 2.0.0-SNAPSHOT + 2.32.0 4.0.0 diff --git a/java/serve/pom_template.xml b/java/serve/pom_template.xml index 9df520f0d2bc..b504723bc7e9 100644 --- a/java/serve/pom_template.xml +++ b/java/serve/pom_template.xml @@ -6,7 +6,7 @@ io.ray ray-superpom - 2.0.0-SNAPSHOT + 2.32.0 4.0.0 diff --git a/java/test/pom_template.xml b/java/test/pom_template.xml index 2d46e93b4371..d931fbdcbe2e 100644 --- a/java/test/pom_template.xml +++ b/java/test/pom_template.xml @@ -6,7 +6,7 @@ io.ray ray-superpom - 2.0.0-SNAPSHOT + 2.32.0 4.0.0 diff --git a/python/ray/_version.py b/python/ray/_version.py index ebc9a8b52868..59f4b2c6482d 100644 --- a/python/ray/_version.py +++ b/python/ray/_version.py @@ -1,6 +1,6 @@ # Replaced with the current commit when building the wheels. commit = "{{RAY_COMMIT_SHA}}" -version = "3.0.0.dev0" +version = "2.32.0" if __name__ == "__main__": print("%s %s" % (version, commit)) diff --git a/python/ray/train/_internal/utils.py b/python/ray/train/_internal/utils.py index 8e02bae239aa..c7b5e34764a8 100644 --- a/python/ray/train/_internal/utils.py +++ b/python/ray/train/_internal/utils.py @@ -22,6 +22,9 @@ from ray.exceptions import RayActorError from ray.types import ObjectRef +# Terrible code importing +from ray._private.worker import _global_node + T = TypeVar("T") logger = logging.getLogger(__name__) @@ -64,7 +67,7 @@ def check_for_failure( def get_address_and_port() -> Tuple[str, int]: """Returns the IP address and a free port on this node.""" - addr = ray.util.get_node_ip_address() + addr = ray.util.get_cached_node_ip_address(_global_node.address_info["session_dir"]) # TODO this code is quite hacky port = find_free_port() return addr, port diff --git a/python/ray/util/__init__.py b/python/ray/util/__init__.py index 257cfd3494d0..fae0859cf15d 100644 --- a/python/ray/util/__init__.py +++ b/python/ray/util/__init__.py @@ -3,7 +3,7 @@ import ray from ray._private.client_mode_hook import client_mode_hook from ray._private.auto_init_hook import wrap_auto_init -from ray._private.services import get_node_ip_address +from ray._private.services import get_cached_node_ip_address, get_node_ip_address from ray.util import iter from ray.util import rpdb as pdb from ray.util import debugpy as ray_debugpy @@ -61,6 +61,7 @@ def list_named_actors(all_namespaces: bool = False) -> List[str]: "placement_group_table", "get_placement_group", "get_current_placement_group", + "get_cached_node_ip_address", "get_node_ip_address", "remove_placement_group", "ray_debugpy", diff --git a/src/ray/common/constants.h b/src/ray/common/constants.h index 31e68c11339b..d34e9cbe3c10 100644 --- a/src/ray/common/constants.h +++ b/src/ray/common/constants.h @@ -64,7 +64,7 @@ constexpr int kMessagePackOffset = 9; constexpr char kSetupWorkerFilename[] = "setup_worker.py"; /// The version of Ray -constexpr char kRayVersion[] = "3.0.0.dev0"; +constexpr char kRayVersion[] = "2.32.0"; /*****************************/ /* ENV labels for autoscaler */