Merge branch 'main' into enhancement-include-java-bindings

Author: yhori991

recipe/meta.yaml

@@ -1,31 +1,29 @@
-{% set version = "2.44.1" %}
+{% set version = "2.46.0" %}
 
 package:
   name: ray-packages
   version: {{ version }}
 
 source:
   url: https://github.com/ray-project/ray/archive/ray-{{ version }}.tar.gz
-  sha256: 7ac0d1b935528f5c57fd419c95e76376e4fab2270fcf1d0c8bcd55b03e9f6f21
+  sha256: 761adac3ea5dd127215e22976e140f0d66ca3bc0e029b2b21136182d0190cf98
   patches:
-    - patches/0002-Disable-making-entry-scripts.patch
-    - patches/0003-Ignore-warnings-in-event.cc-and-logging.cc.patch
-    - patches/0004-remove-dependencies.patch
-    - patches/0006-remove-stdlib-libc-from-.bazelrc.patch  # [osx and arm64]
+    - patches/0001-Disable-making-entry-scripts.patch
+    - patches/0002-Ignore-warnings-in-event.cc-and-logging.cc.patch
+    - patches/0003-remove-dependencies.patch
     # See https://github.com/conda-forge/ray-packages-feedstock/issues/136
     # Keep in sync with current or active migration of libgrpc to avoid
     # ABI breakage
-    - patches/0005-Vendor-grpc-1.67.1.patch
-    # Patch out old zlib-1.3.0 to remove fdopen, part of zlib-1.3.1
-    - patches/0007-patch-zlib-to-remove-define-fdopen-on-macos.patch
+    - patches/0004-Vendor-grpc-1.67.1.patch
+    - patches/0005-remove-stdlib-libc-from-.bazelrc.patch
     # Patch around non-const NAN on windows in protobuf 27.5
-    - patches/0008-patch-protobuf-use-of-nan-on-windows.patch
-    # Patch out zlib-1.2.13 to remove fdopen, part of zlib-1.3.1
-    - patches/0009-patch-zlib-in-prometheus-cpp-and-boost-as-well.patch
-    # Add misisng include in new logging code for different absl
-    - patches/0010-add-missing-include.patch
+    - patches/0006-patch-protobuf-use-of-nan-on-windows.patch
+    - patches/0007-patch-zlib-in-prometheus-cpp-and-boost.patch
+    # Add missing include in new logging code for different absl
+    - patches/0008-add-missing-include.patch
     # Patch bundled fmtlib/fmt in spdlog for char8_type which is invalid on macOS
-    - patches/0011-patch-bundled-fmt-in-spdlog-for-invalid-char8_type.patch
+    - patches/0009-patch-bundled-fmt-in-spdlog-for-invalid-char8_type.patch
+
 build:
   number: 1
 # Need these up here for conda-smithy to handle them properly.

…/0002-Disable-making-entry-scripts.patch …/0001-Disable-making-entry-scripts.patchrecipe/patches/0002-Disable-making-entry-scripts.patch renamed to recipe/patches/0001-Disable-making-entry-scripts.patch recipe/patches/0002-Disable-making-entry-scripts.patch renamed to recipe/patches/0001-Disable-making-entry-scripts.patch

@@ -1,17 +1,17 @@
-From d95e9a0a456a952df85f7aff5692ca37ca7f10ac Mon Sep 17 00:00:00 2001
+From 4572d7fc7e2cbf02c2d520577d7c50344b272c64 Mon Sep 17 00:00:00 2001
 From: Vasily Litvinov <vasilij.n.litvinov@intel.com>
 Date: Tue, 10 Nov 2020 23:26:35 +0300
-Subject: [PATCH 02/11] Disable making entry scripts
+Subject: [PATCH 1/9] Disable making entry scripts
 
 ---
  python/setup.py | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/python/setup.py b/python/setup.py
-index 98f8272413..90b2a2d3a6 100644
+index 838f3aa744..c287eb4cc1 100644
 --- a/python/setup.py
 +++ b/python/setup.py
-@@ -800,9 +800,9 @@ setuptools.setup(
+@@ -832,9 +832,9 @@ setuptools.setup(
      extras_require=setup_spec.extras,
      entry_points={
          "console_scripts": [
@@ -24,3 +24,6 @@ index 98f8272413..90b2a2d3a6 100644
          ]
      },
      package_data={
+-- 
+2.43.0
+

…arnings-in-event.cc-and-logging.cc.patch …arnings-in-event.cc-and-logging.cc.patchrecipe/patches/0003-Ignore-warnings-in-event.cc-and-logging.cc.patch renamed to recipe/patches/0002-Ignore-warnings-in-event.cc-and-logging.cc.patch recipe/patches/0003-Ignore-warnings-in-event.cc-and-logging.cc.patch renamed to recipe/patches/0002-Ignore-warnings-in-event.cc-and-logging.cc.patch

@@ -1,23 +1,26 @@
-From a782a2fc6546115a4e1ec13c2fd76d0ff3ead066 Mon Sep 17 00:00:00 2001
+From 4d2046a891d75eb52f0837fe41065756dc2cf642 Mon Sep 17 00:00:00 2001
 From: Vasily Litvinov <vasilij.n.litvinov@intel.com>
-Date: Sun, 19 Jan 2025 22:56:08 +1100
-Subject: [PATCH 03/11] Ignore warnings in event.cc and logging.cc
+Date: Fri, 9 May 2025 13:12:32 +0300
+Subject: [PATCH 2/9] Ignore warnings in event.cc and logging.cc
 
 ---
  .bazelrc | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/.bazelrc b/.bazelrc
-index 68964ff59a..4e286d275c 100644
+index 13774dda7c..575538c5f1 100644
 --- a/.bazelrc
 +++ b/.bazelrc
-@@ -49,6 +49,9 @@ build:clang-cl --per_file_copt="-\\.(asm|S)$@-Werror"
+@@ -57,6 +57,9 @@ build:clang-cl --per_file_copt="-\\.(asm|S)$@-Werror"
  build:msvc-cl     --per_file_copt="-\\.(asm|S)$@-WX"
  # Ignore warnings for protobuf generated files and external projects.
  build --per_file_copt="\\.pb\\.cc$@-w"
 +# Ignore one specific warning
 +build --per_file_copt="event\\.cc$@-w"
 +build --per_file_copt="logging\\.cc$@-w"
  build:linux --per_file_copt="-\\.(asm|S)$,external/.*@-w,-Wno-error=implicit-function-declaration,-Wno-error=unused-function"
- build:macos --per_file_copt="-\\.(asm|S)$,external/.*@-w,-Wno-error=implicit-function-declaration,-Wno-error=unused-function"
+ build:macos --per_file_copt="-\\.(asm|S)$,external/.*@-w,-Wno-error=implicit-function-declaration,-Wno-error=unused-function,-Wno-missing-template-arg-list-after-template-kw"
  # Ignore warnings for host tools, which we generally can't control.
+-- 
+2.43.0
+

…e/patches/0004-remove-dependencies.patch …e/patches/0003-remove-dependencies.patchrecipe/patches/0004-remove-dependencies.patch renamed to recipe/patches/0003-remove-dependencies.patch recipe/patches/0004-remove-dependencies.patch renamed to recipe/patches/0003-remove-dependencies.patch

@@ -1,14 +1,14 @@
-From 8f7e18ac731a016a32f349c89bf224aeed7f158e Mon Sep 17 00:00:00 2001
+From 2595ec41a9d00d40b8b56442087f109307f403ec Mon Sep 17 00:00:00 2001
 From: mattip <matti.picus@gmail.com>
 Date: Fri, 28 Feb 2025 15:22:50 +0200
-Subject: [PATCH] remove dependencies
+Subject: [PATCH 3/9] remove dependencies
 
 ---
  python/setup.py | 159 +++++-------------------------------------------
  1 file changed, 14 insertions(+), 145 deletions(-)
 
 diff --git a/python/setup.py b/python/setup.py
-index 1cc4f42b90..32ce166330 100644
+index c287eb4cc1..25b08d3540 100644
 --- a/python/setup.py
 +++ b/python/setup.py
 @@ -225,132 +225,23 @@ ray_files += [
@@ -162,7 +162,7 @@ index 1cc4f42b90..32ce166330 100644
      setup_spec.extras["llm"] = list(
 -        set(
 -            [
--                "vllm>=0.7.2",
+-                "vllm>=0.8.5",
 -                "jsonref>=1.1.0",
 -                "jsonschema",
 -                "ninja",
@@ -176,7 +176,7 @@ index 1cc4f42b90..32ce166330 100644
      )
 
  # These are the main dependencies for users of ray. This list
-@@ -383,18 +263,7 @@ if setup_spec.type == SetupType.RAY:
+@@ -385,16 +263,7 @@ if setup_spec.type == SetupType.RAY:
  # install-core-prerelease-dependencies.sh so we can test
  # new releases candidates.
  if setup_spec.type == SetupType.RAY:
@@ -188,15 +188,13 @@ index 1cc4f42b90..32ce166330 100644
 -        "packaging",
 -        "protobuf >= 3.15.3, != 3.19.5",
 -        "pyyaml",
--        "aiosignal",
--        "frozenlist",
 -        "requests",
 -    ]
 +    setup_spec.install_requires = []
 
 
  def is_native_windows_or_msys():
-@@ -830,7 +697,7 @@ setuptools.setup(
+@@ -828,7 +697,7 @@ setuptools.setup(
      # The BinaryDistribution argument triggers build_ext.
      distclass=BinaryDistribution,
      install_requires=setup_spec.install_requires,

…pe/patches/0005-Vendor-grpc-1.67.1.patch …pe/patches/0004-Vendor-grpc-1.67.1.patchrecipe/patches/0005-Vendor-grpc-1.67.1.patch renamed to recipe/patches/0004-Vendor-grpc-1.67.1.patch recipe/patches/0005-Vendor-grpc-1.67.1.patch renamed to recipe/patches/0004-Vendor-grpc-1.67.1.patch

@@ -1,28 +1,23 @@
-From 5a734425222fd2c132601981bd6a4689e81a7154 Mon Sep 17 00:00:00 2001
+From 30d0a0ff43e5203485cdfeaae0d779f136b15aa1 Mon Sep 17 00:00:00 2001
 From: Austin Morton <austin.morton@aquatic.com>
-Date: Sun, 19 Jan 2025 22:15:00 +1100
-Subject: [PATCH 05/11] Vendor grpc-1.67.1.patch
+Date: Fri, 9 May 2025 13:46:55 +0300
+Subject: [PATCH 4/9] Vendor-grpc-1.67.1
 
 ---
- bazel/ray_deps_setup.bzl                      | 31 +++++++------------
+ bazel/ray_deps_setup.bzl                      | 29 ++++++++-----------
  .../task_event_buffer_export_event_test.cc    |  2 +-
  .../gcs_server/test/gcs_actor_manager_test.cc | 14 ++++-----
  src/ray/raylet_client/raylet_client.cc        |  2 +-
  src/ray/rpc/server_call.h                     |  2 +-
  src/ray/util/event.cc                         |  2 +-
- 6 files changed, 23 insertions(+), 30 deletions(-)
+ 6 files changed, 23 insertions(+), 41 deletions(-)
 
 diff --git a/bazel/ray_deps_setup.bzl b/bazel/ray_deps_setup.bzl
-index 04acf73beb..55805bc0f6 100644
+index 0db8ebee2d..ab1b57d226 100644
 --- a/bazel/ray_deps_setup.bzl
 +++ b/bazel/ray_deps_setup.bzl
-@@ -86,20 +86,13 @@ def auto_http_archive(
- def ray_deps_setup():
-     # Explicitly bring in protobuf dependency to work around
-     # https://github.com/ray-project/ray/issues/14117
--    # This is copied from grpc's bazel/grpc_deps.bzl
--    #
--    # Pinned grpc version: v23.4
+@@ -91,15 +91,11 @@ def ray_deps_setup():
+     # Pinned grpc version: v23.4
      http_archive(
          name = "com_google_protobuf",
 -        sha256 = "76a33e2136f23971ce46c72fd697cd94dc9f73d56ab23b753c3e16854c90ddfd",
@@ -31,16 +26,16 @@ index 04acf73beb..55805bc0f6 100644
 +        strip_prefix = "protobuf-28.2",
          urls = [
 -            "https://github.com/protocolbuffers/protobuf/archive/2c5fa078d8e86e5f4bd34e6f4c9ea9e8d7d4d44a.tar.gz",
--        ],
--        patches = [
--            "@com_github_grpc_grpc//third_party:protobuf.patch",
 +            "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v28.2.tar.gz",
          ],
+-        patches = [
+-            "@com_github_grpc_grpc//third_party:protobuf.patch",
+-        ],
 -        patch_args = ["-p1"],
      )
 
      # NOTE(lingxuan.zlx): 3rd party dependencies could be accessed, so it suggests
-@@ -223,10 +216,10 @@ def ray_deps_setup():
+@@ -229,10 +225,10 @@ def ray_deps_setup():
      # TODO(owner): Upgrade abseil to latest version after protobuf updated, which requires to upgrade `rules_cc` first.
      auto_http_archive(
          name = "com_google_absl",
@@ -54,7 +49,7 @@ index 04acf73beb..55805bc0f6 100644
          ],
      )
 
-@@ -246,8 +239,8 @@ def ray_deps_setup():
+@@ -253,7 +249,7 @@ def ray_deps_setup():
      auto_http_archive(
          name = "com_github_grpc_grpc",
          # NOTE: If you update this, also update @boringssl's hash.
@@ -65,7 +60,7 @@ index 04acf73beb..55805bc0f6 100644
          patches = [
              "@com_github_ray_project_ray//thirdparty/patches:grpc-cython-copts.patch",
          ],
-@@ -289,13 +282,13 @@ def ray_deps_setup():
+@@ -297,13 +292,13 @@ def ray_deps_setup():
      http_archive(
          # This rule is used by @com_github_grpc_grpc, and using a GitHub mirror
          # provides a deterministic archive hash for caching. Explanation here:
@@ -84,10 +79,10 @@ index 04acf73beb..55805bc0f6 100644
      )
 
 diff --git a/src/ray/core_worker/test/task_event_buffer_export_event_test.cc b/src/ray/core_worker/test/task_event_buffer_export_event_test.cc
-index aff5cc624f..8968f98576 100644
+index f3869be7ff..36873eda0f 100644
 --- a/src/ray/core_worker/test/task_event_buffer_export_event_test.cc
 +++ b/src/ray/core_worker/test/task_event_buffer_export_event_test.cc
-@@ -135,7 +135,7 @@ TEST_F(TaskEventTestWriteExport, TestWriteTaskExportEvents) {
+@@ -139,7 +139,7 @@ TEST_F(TaskEventTestWriteExport, TestWriteTaskExportEvents) {
    auto task_ids = GenTaskIDs(num_events);
    google::protobuf::util::JsonPrintOptions options;
    options.preserve_proto_field_names = true;
@@ -97,10 +92,10 @@ index aff5cc624f..8968f98576 100644
    std::vector<SourceTypeVariant> source_types = {
        rpc::ExportEvent_SourceType::ExportEvent_SourceType_EXPORT_TASK};
 diff --git a/src/ray/gcs/gcs_server/test/gcs_actor_manager_test.cc b/src/ray/gcs/gcs_server/test/gcs_actor_manager_test.cc
-index e4b3a663cc..2625555d3e 100644
+index 810f6c3c2c..e51317806c 100644
 --- a/src/ray/gcs/gcs_server/test/gcs_actor_manager_test.cc
 +++ b/src/ray/gcs/gcs_server/test/gcs_actor_manager_test.cc
-@@ -1284,7 +1284,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoFilters) {
+@@ -1288,7 +1288,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoFilters) {
      request.mutable_filters()->set_actor_id(actor->GetActorID().Binary());
 
      auto &reply =
@@ -109,7 +104,7 @@ index e4b3a663cc..2625555d3e 100644
      gcs_actor_manager_->HandleGetAllActorInfo(request, &reply, callback);
      ASSERT_EQ(reply.actor_table_data().size(), 1);
      ASSERT_EQ(reply.total(), 1 + num_other_actors);
-@@ -1297,7 +1297,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoFilters) {
+@@ -1301,7 +1301,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoFilters) {
      request.mutable_filters()->set_job_id(job_id.Binary());
 
      auto &reply =
@@ -118,7 +113,7 @@ index e4b3a663cc..2625555d3e 100644
      gcs_actor_manager_->HandleGetAllActorInfo(request, &reply, callback);
      ASSERT_EQ(reply.actor_table_data().size(), 1);
      ASSERT_EQ(reply.num_filtered(), num_other_actors);
-@@ -1309,7 +1309,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoFilters) {
+@@ -1313,7 +1313,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoFilters) {
      request.mutable_filters()->set_state(rpc::ActorTableData::ALIVE);
 
      auto &reply =
@@ -127,7 +122,7 @@ index e4b3a663cc..2625555d3e 100644
      gcs_actor_manager_->HandleGetAllActorInfo(request, &reply, callback);
      ASSERT_EQ(reply.actor_table_data().size(), 1);
      ASSERT_EQ(reply.num_filtered(), num_other_actors);
-@@ -1322,7 +1322,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoFilters) {
+@@ -1326,7 +1326,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoFilters) {
      request.mutable_filters()->set_job_id(job_id.Binary());
 
      auto &reply =
@@ -136,7 +131,7 @@ index e4b3a663cc..2625555d3e 100644
      gcs_actor_manager_->HandleGetAllActorInfo(request, &reply, callback);
      ASSERT_EQ(reply.actor_table_data().size(), 1);
      ASSERT_EQ(reply.num_filtered(), num_other_actors);
-@@ -1333,7 +1333,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoFilters) {
+@@ -1337,7 +1337,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoFilters) {
      request.mutable_filters()->set_job_id(job_id.Binary());
 
      auto &reply =
@@ -145,7 +140,7 @@ index e4b3a663cc..2625555d3e 100644
      gcs_actor_manager_->HandleGetAllActorInfo(request, &reply, callback);
      ASSERT_EQ(reply.num_filtered(), num_other_actors + 1);
      ASSERT_EQ(reply.actor_table_data().size(), 0);
-@@ -1358,7 +1358,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoLimit) {
+@@ -1362,7 +1362,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoLimit) {
    {
      rpc::GetAllActorInfoRequest request;
      auto &reply =
@@ -154,7 +149,7 @@ index e4b3a663cc..2625555d3e 100644
      auto callback = [](Status status,
                         std::function<void()> success,
                         std::function<void()> failure) {};
-@@ -1367,7 +1367,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoLimit) {
+@@ -1371,7 +1371,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoLimit) {
 
      request.set_limit(2);
      auto &reply_2 =
@@ -164,10 +159,10 @@ index e4b3a663cc..2625555d3e 100644
      ASSERT_EQ(reply_2.actor_table_data().size(), 2);
      ASSERT_EQ(reply_2.total(), 3);
 diff --git a/src/ray/raylet_client/raylet_client.cc b/src/ray/raylet_client/raylet_client.cc
-index c08c13ebe6..fbb68ca64b 100644
+index aeeb53ee77..c191f39e16 100644
 --- a/src/ray/raylet_client/raylet_client.cc
 +++ b/src/ray/raylet_client/raylet_client.cc
-@@ -253,7 +253,7 @@ void RayletClient::RequestWorkerLease(
+@@ -246,7 +246,7 @@ void RayletClient::RequestWorkerLease(
      const bool is_selected_based_on_locality) {
    google::protobuf::Arena arena;
    auto request =
@@ -177,7 +172,7 @@ index c08c13ebe6..fbb68ca64b 100644
    // task_spec is longer than request.
    // Request will be sent before the end of this call, and after that, it won't be
 diff --git a/src/ray/rpc/server_call.h b/src/ray/rpc/server_call.h
-index 659ee5841d..a806ded3b7 100644
+index 4ad1885ca6..fd0cb3fbd9 100644
 --- a/src/ray/rpc/server_call.h
 +++ b/src/ray/rpc/server_call.h
 @@ -193,7 +193,7 @@ class ServerCallImpl : public ServerCall {
@@ -190,10 +185,10 @@ index 659ee5841d..a806ded3b7 100644
      RAY_CHECK(!call_name_.empty()) << "Call name is empty";
      if (record_metrics_) {
 diff --git a/src/ray/util/event.cc b/src/ray/util/event.cc
-index 4de0e14ea4..6520d7449e 100644
+index 16c723e27c..e99df202c9 100644
 --- a/src/ray/util/event.cc
 +++ b/src/ray/util/event.cc
-@@ -136,7 +136,7 @@ std::string LogEventReporter::ExportEventToString(const rpc::ExportEvent &export
+@@ -140,7 +140,7 @@ std::string LogEventReporter::ExportEventToString(const rpc::ExportEvent &export
    google::protobuf::util::JsonPrintOptions options;
    options.preserve_proto_field_names = true;
    // Required so enum with value 0 is not omitted
@@ -202,3 +197,27 @@ index 4de0e14ea4..6520d7449e 100644
    if (export_event.has_task_event_data()) {
      RAY_CHECK(google::protobuf::util::MessageToJsonString(
                    export_event.task_event_data(), &event_data_as_string, options)
+diff --git a/thirdparty/patches/grpc-zlib-fdopen.patch
+b/thirdparty/patches/grpc-zlib-fdopen.patch
+index c48a35bc4e..dd434edf19 100644
+--- a/thirdparty/patches/grpc-zlib-fdopen.patch
++++ b/thirdparty/patches/grpc-zlib-fdopen.patch
+@@ -1,13 +1,13 @@
+ diff -u bazel/grpc_deps.bzl
+ --- bazel/grpc_deps.bzl
+ +++ bazel/grpc_deps.bzl
+-@@ -238,6 +238,9 @@
+-                 "https://storage.googleapis.com/grpc-bazel-mirror/github.com/madler/zlib/archive/04f42ceca40f73e2978b50e93806c2a18c1281fc.tar.gz",
+-                 "https://github.com/madler/zlib/archive/04f42ceca40f73e2978b50e93806c2a18c1281fc.tar.gz",
++@@ -53,6 +53,9 @@ def grpc_deps():
++                 "https://storage.googleapis.com/grpc-bazel-mirror/github.com/madler/zlib/archive/09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851.tar.gz",
++                 "https://github.com/madler/zlib/archive/09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851.tar.gz",
+              ],
+ +            patches = [
+ +                "@com_github_ray_project_ray//thirdparty/patches:zlib-fdopen.patch",
+-+            ]
+++            ],
+          )
+  
+     if "com_google_protobuf" not in native.existing_rules():
+