Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Seanshi/cached node addr #1

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/ray_ci/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion java/api/pom_template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.ray</groupId>
<artifactId>ray-superpom</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.32.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion java/performance_test/pom_template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.ray</groupId>
<artifactId>ray-superpom</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.32.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
4 changes: 2 additions & 2 deletions java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.ray</groupId>
<artifactId>ray-superpom</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.32.0</version>
<packaging>pom</packaging>
<name>Ray Project Parent POM</name>
<description>An open source framework that provides a simple, universal API for building distributed applications.
Expand Down Expand Up @@ -63,7 +63,7 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.version>2.0.0-SNAPSHOT</project.version>
<project.version>2.32.0</project.version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion java/runtime/pom_template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.ray</groupId>
<artifactId>ray-superpom</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.32.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion java/serve/pom_template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.ray</groupId>
<artifactId>ray-superpom</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.32.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion java/test/pom_template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.ray</groupId>
<artifactId>ray-superpom</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.32.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion python/ray/_version.py
Original file line number Diff line number Diff line change
@@ -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))
5 changes: 4 additions & 1 deletion python/ray/train/_internal/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion python/ray/util/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/ray/common/constants.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down