From 5416f683ca8e13ee8f1fa3c2f07f629faa4275ce Mon Sep 17 00:00:00 2001 From: ShaochenYu-YW <72957335+ShaochenYu-YW@users.noreply.github.com> Date: Thu, 13 Feb 2025 09:22:16 -0800 Subject: [PATCH 01/11] Update utils.py Signed-off-by: ShaochenYu-YW <72957335+ShaochenYu-YW@users.noreply.github.com> --- ci/ray_ci/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/ray_ci/utils.py b/ci/ray_ci/utils.py index 45210e7358e7..f6fd9b3a2442 100644 --- a/ci/ray_ci/utils.py +++ b/ci/ray_ci/utils.py @@ -14,7 +14,7 @@ POSTMERGE_PIPELINE = "0189e759-8c96-4302-b6b5-b4274406bf89" -RAY_VERSION = "2.10.0" +RAY_VERSION = "2.10.0+pinterest9" def chunk_into_n(list: List[str], n: int) -> List[List[str]]: From 6d178c3af905b3271c74b0236bfab679c4e792c6 Mon Sep 17 00:00:00 2001 From: ShaochenYu-YW <72957335+ShaochenYu-YW@users.noreply.github.com> Date: Thu, 13 Feb 2025 09:22:54 -0800 Subject: [PATCH 02/11] Update pom_template.xml Signed-off-by: ShaochenYu-YW <72957335+ShaochenYu-YW@users.noreply.github.com> --- java/api/pom_template.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/api/pom_template.xml b/java/api/pom_template.xml index f24b8fec1f4c..1c9739378b50 100644 --- a/java/api/pom_template.xml +++ b/java/api/pom_template.xml @@ -6,7 +6,7 @@ io.ray ray-superpom - 2.10.0 + 2.10.0+pinterest9 4.0.0 From e5d2ef78b35a43bd9e94a701d90fa4653f75abfe Mon Sep 17 00:00:00 2001 From: ShaochenYu-YW <72957335+ShaochenYu-YW@users.noreply.github.com> Date: Thu, 13 Feb 2025 09:23:24 -0800 Subject: [PATCH 03/11] Update pom_template.xml Signed-off-by: ShaochenYu-YW <72957335+ShaochenYu-YW@users.noreply.github.com> --- java/performance_test/pom_template.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/performance_test/pom_template.xml b/java/performance_test/pom_template.xml index 57e80fdbf6a0..21e233634183 100644 --- a/java/performance_test/pom_template.xml +++ b/java/performance_test/pom_template.xml @@ -6,7 +6,7 @@ io.ray ray-superpom - 2.10.0 + 2.10.0+pinterest9 4.0.0 From d0670bf39f38a3149c453bd49b19e66f68e543e3 Mon Sep 17 00:00:00 2001 From: ShaochenYu-YW <72957335+ShaochenYu-YW@users.noreply.github.com> Date: Thu, 13 Feb 2025 09:23:50 -0800 Subject: [PATCH 04/11] Update pom.xml Signed-off-by: ShaochenYu-YW <72957335+ShaochenYu-YW@users.noreply.github.com> --- java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/pom.xml b/java/pom.xml index c00465e56226..9550504ecf87 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -5,7 +5,7 @@ 4.0.0 io.ray ray-superpom - 2.10.0 + 2.10.0+pinterest9 pom Ray Project Parent POM An open source framework that provides a simple, universal API for building distributed applications. From e5929f0aeea46439d3c372d82be27b903779a109 Mon Sep 17 00:00:00 2001 From: ShaochenYu-YW <72957335+ShaochenYu-YW@users.noreply.github.com> Date: Thu, 13 Feb 2025 09:24:46 -0800 Subject: [PATCH 05/11] Update pom.xml Signed-off-by: ShaochenYu-YW <72957335+ShaochenYu-YW@users.noreply.github.com> --- java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/pom.xml b/java/pom.xml index 9550504ecf87..e4e1261f0ee9 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -63,7 +63,7 @@ 1.8 UTF-8 - 2.10.0 + 2.10.0+pinterest9 From 2c95804dc7cf7ff0dbccab85aa3d1ed2f2225f8a Mon Sep 17 00:00:00 2001 From: ShaochenYu-YW <72957335+ShaochenYu-YW@users.noreply.github.com> Date: Thu, 13 Feb 2025 09:26:10 -0800 Subject: [PATCH 06/11] Update pom_template.xml Signed-off-by: ShaochenYu-YW <72957335+ShaochenYu-YW@users.noreply.github.com> --- java/runtime/pom_template.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/runtime/pom_template.xml b/java/runtime/pom_template.xml index a7bebe7295fb..fa64a1ed16d4 100644 --- a/java/runtime/pom_template.xml +++ b/java/runtime/pom_template.xml @@ -6,7 +6,7 @@ io.ray ray-superpom - 2.10.0 + 2.10.0+pinterest9 4.0.0 From 6b51a380066e1715dd76d5959d1c222a120411ae Mon Sep 17 00:00:00 2001 From: ShaochenYu-YW <72957335+ShaochenYu-YW@users.noreply.github.com> Date: Thu, 13 Feb 2025 09:26:41 -0800 Subject: [PATCH 07/11] Update pom_template.xml Signed-off-by: ShaochenYu-YW <72957335+ShaochenYu-YW@users.noreply.github.com> --- java/test/pom_template.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/test/pom_template.xml b/java/test/pom_template.xml index 41c30a08a030..1a557a4b76c0 100644 --- a/java/test/pom_template.xml +++ b/java/test/pom_template.xml @@ -6,7 +6,7 @@ io.ray ray-superpom - 2.10.0 + 2.10.0+pinterest 4.0.0 From 97dbd7739208ee1f123f89fe3343a384d06c4207 Mon Sep 17 00:00:00 2001 From: ShaochenYu-YW <72957335+ShaochenYu-YW@users.noreply.github.com> Date: Thu, 13 Feb 2025 09:27:08 -0800 Subject: [PATCH 08/11] Update _version.py Signed-off-by: ShaochenYu-YW <72957335+ShaochenYu-YW@users.noreply.github.com> --- python/ray/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/ray/_version.py b/python/ray/_version.py index 40bba220d718..534eccb92f15 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 = "2.10.0" +version = "2.10.0+pinterest9" if __name__ == "__main__": print("%s %s" % (version, commit)) From 58d038d89e2840bc0a9870df6d6d9d6a47674210 Mon Sep 17 00:00:00 2001 From: ShaochenYu-YW <72957335+ShaochenYu-YW@users.noreply.github.com> Date: Thu, 13 Feb 2025 09:27:52 -0800 Subject: [PATCH 09/11] Update constants.h Signed-off-by: ShaochenYu-YW <72957335+ShaochenYu-YW@users.noreply.github.com> --- src/ray/common/constants.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ray/common/constants.h b/src/ray/common/constants.h index 2eb7489731c4..0bfd1123c85c 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[] = "2.10.0"; +constexpr char kRayVersion[] = "2.10.0+pinterest9"; /*****************************/ /* ENV labels for autoscaler */ From 0a0b9f924de70e945e9324a600d56d97bb776915 Mon Sep 17 00:00:00 2001 From: Chia-Wei Chen Date: Fri, 21 Mar 2025 13:45:08 -0700 Subject: [PATCH 10/11] add patch from https://github.com/ray-project/ray/pull/48212 --- ci/ray_ci/utils.py | 2 +- java/api/pom_template.xml | 2 +- java/performance_test/pom_template.xml | 2 +- java/pom.xml | 4 ++-- java/runtime/pom_template.xml | 2 +- python/ray/_version.py | 2 +- .../ray/autoscaler/_private/kuberay/autoscaling_config.py | 7 ++++--- src/ray/common/constants.h | 2 +- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ci/ray_ci/utils.py b/ci/ray_ci/utils.py index f6fd9b3a2442..27e1e1e9183d 100644 --- a/ci/ray_ci/utils.py +++ b/ci/ray_ci/utils.py @@ -14,7 +14,7 @@ POSTMERGE_PIPELINE = "0189e759-8c96-4302-b6b5-b4274406bf89" -RAY_VERSION = "2.10.0+pinterest9" +RAY_VERSION = "2.10.0+pinterest10" def chunk_into_n(list: List[str], n: int) -> List[List[str]]: diff --git a/java/api/pom_template.xml b/java/api/pom_template.xml index 1c9739378b50..1e610f135655 100644 --- a/java/api/pom_template.xml +++ b/java/api/pom_template.xml @@ -6,7 +6,7 @@ io.ray ray-superpom - 2.10.0+pinterest9 + 2.10.0+pinterest10 4.0.0 diff --git a/java/performance_test/pom_template.xml b/java/performance_test/pom_template.xml index 21e233634183..aa1ee0cb64dc 100644 --- a/java/performance_test/pom_template.xml +++ b/java/performance_test/pom_template.xml @@ -6,7 +6,7 @@ io.ray ray-superpom - 2.10.0+pinterest9 + 2.10.0+pinterest10 4.0.0 diff --git a/java/pom.xml b/java/pom.xml index e4e1261f0ee9..d173a35a4b08 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -5,7 +5,7 @@ 4.0.0 io.ray ray-superpom - 2.10.0+pinterest9 + 2.10.0+pinterest10 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.10.0+pinterest9 + 2.10.0+pinterest10 diff --git a/java/runtime/pom_template.xml b/java/runtime/pom_template.xml index fa64a1ed16d4..e66f12a8b06c 100644 --- a/java/runtime/pom_template.xml +++ b/java/runtime/pom_template.xml @@ -6,7 +6,7 @@ io.ray ray-superpom - 2.10.0+pinterest9 + 2.10.0+pinterest10 4.0.0 diff --git a/python/ray/_version.py b/python/ray/_version.py index 534eccb92f15..992ea2af7164 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 = "2.10.0+pinterest9" +version = "2.10.0+pinterest10" if __name__ == "__main__": print("%s %s" % (version, commit)) diff --git a/python/ray/autoscaler/_private/kuberay/autoscaling_config.py b/python/ray/autoscaler/_private/kuberay/autoscaling_config.py index b2a1d7725d4c..9e7ea7cb27d1 100644 --- a/python/ray/autoscaler/_private/kuberay/autoscaling_config.py +++ b/python/ray/autoscaler/_private/kuberay/autoscaling_config.py @@ -210,9 +210,10 @@ def _node_type_from_group_spec( # The head node type has no workers because the head is not a worker. min_workers = max_workers = 0 else: - # `minReplicas` and `maxReplicas` are required fields for each workerGroupSpec - min_workers = group_spec["minReplicas"] - max_workers = group_spec["maxReplicas"] + # `minReplicas` and `maxReplicas` are required fields for each workerGroupSpec. + # numOfHosts specifies the number of workers per replica in KubeRay v1.1+. + min_workers = group_spec["minReplicas"] * group_spec.get("numOfHosts", 1) + max_workers = group_spec["maxReplicas"] * group_spec.get("numOfHosts", 1) resources = _get_ray_resources_from_group_spec(group_spec, is_head) diff --git a/src/ray/common/constants.h b/src/ray/common/constants.h index 0bfd1123c85c..4cd07b592335 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[] = "2.10.0+pinterest9"; +constexpr char kRayVersion[] = "2.10.0+pinterest10"; /*****************************/ /* ENV labels for autoscaler */ From 5436e181c1259f3eb77cc96005995b3e1723fdb6 Mon Sep 17 00:00:00 2001 From: Chia-Wei Chen Date: Fri, 21 Mar 2025 14:12:24 -0700 Subject: [PATCH 11/11] revert version changes --- ci/ray_ci/utils.py | 2 +- java/api/pom_template.xml | 2 +- java/performance_test/pom_template.xml | 2 +- java/pom.xml | 4 ++-- java/runtime/pom_template.xml | 2 +- java/test/pom_template.xml | 2 +- python/ray/_version.py | 2 +- src/ray/common/constants.h | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ci/ray_ci/utils.py b/ci/ray_ci/utils.py index 27e1e1e9183d..45210e7358e7 100644 --- a/ci/ray_ci/utils.py +++ b/ci/ray_ci/utils.py @@ -14,7 +14,7 @@ POSTMERGE_PIPELINE = "0189e759-8c96-4302-b6b5-b4274406bf89" -RAY_VERSION = "2.10.0+pinterest10" +RAY_VERSION = "2.10.0" def chunk_into_n(list: List[str], n: int) -> List[List[str]]: diff --git a/java/api/pom_template.xml b/java/api/pom_template.xml index 1e610f135655..f24b8fec1f4c 100644 --- a/java/api/pom_template.xml +++ b/java/api/pom_template.xml @@ -6,7 +6,7 @@ io.ray ray-superpom - 2.10.0+pinterest10 + 2.10.0 4.0.0 diff --git a/java/performance_test/pom_template.xml b/java/performance_test/pom_template.xml index aa1ee0cb64dc..57e80fdbf6a0 100644 --- a/java/performance_test/pom_template.xml +++ b/java/performance_test/pom_template.xml @@ -6,7 +6,7 @@ io.ray ray-superpom - 2.10.0+pinterest10 + 2.10.0 4.0.0 diff --git a/java/pom.xml b/java/pom.xml index d173a35a4b08..c00465e56226 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -5,7 +5,7 @@ 4.0.0 io.ray ray-superpom - 2.10.0+pinterest10 + 2.10.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.10.0+pinterest10 + 2.10.0 diff --git a/java/runtime/pom_template.xml b/java/runtime/pom_template.xml index e66f12a8b06c..a7bebe7295fb 100644 --- a/java/runtime/pom_template.xml +++ b/java/runtime/pom_template.xml @@ -6,7 +6,7 @@ io.ray ray-superpom - 2.10.0+pinterest10 + 2.10.0 4.0.0 diff --git a/java/test/pom_template.xml b/java/test/pom_template.xml index 1a557a4b76c0..41c30a08a030 100644 --- a/java/test/pom_template.xml +++ b/java/test/pom_template.xml @@ -6,7 +6,7 @@ io.ray ray-superpom - 2.10.0+pinterest + 2.10.0 4.0.0 diff --git a/python/ray/_version.py b/python/ray/_version.py index 992ea2af7164..40bba220d718 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 = "2.10.0+pinterest10" +version = "2.10.0" if __name__ == "__main__": print("%s %s" % (version, commit)) diff --git a/src/ray/common/constants.h b/src/ray/common/constants.h index 4cd07b592335..2eb7489731c4 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[] = "2.10.0+pinterest10"; +constexpr char kRayVersion[] = "2.10.0"; /*****************************/ /* ENV labels for autoscaler */