diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index 3d3bba0d..479226cb 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index c9325129..cc74c44e 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml index d1f121cb..9006715d 100644 --- a/.ci_support/linux_64_python3.12.____cpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index df2d8444..ab6f256f 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: diff --git a/.ci_support/migrations/absl_grpc_proto.yaml b/.ci_support/migrations/absl_grpc_proto.yaml new file mode 100644 index 00000000..058ccee2 --- /dev/null +++ b/.ci_support/migrations/absl_grpc_proto.yaml @@ -0,0 +1,21 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libabseil 20250127, libgrpc 1.71 & libprotobuf 5.29.3 + kind: version + migration_number: 1 + exclude: + - abseil-cpp + - grpc-cpp + - libprotobuf + - protobuf + - re2 +libabseil: +- 20250127 +libgrpc: +- "1.71" +libprotobuf: +- 5.29.3 +# see https://github.com/grpc/grpc/commit/14ac94d923b80650e0df55bed17be5efa0e4becd +c_stdlib_version: # [osx and x86_64] + - 10.14 # [osx and x86_64] +migrator_ts: 1741118046.5882597 diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 2e59ab64..2fbf9230 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -25,22 +25,22 @@ jobs: UPLOAD_PACKAGES: True os: ubuntu runs_on: ['cirun-openstack-cpu-4xlarge--${{ github.run_id }}-linux_64_python3.10.____cpython', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_64_python3.11.____cpython UPLOAD_PACKAGES: True os: ubuntu runs_on: ['cirun-openstack-cpu-4xlarge--${{ github.run_id }}-linux_64_python3.11.____cpython', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_64_python3.12.____cpython UPLOAD_PACKAGES: True os: ubuntu runs_on: ['cirun-openstack-cpu-4xlarge--${{ github.run_id }}-linux_64_python3.12.____cpython', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_64_python3.9.____cpython UPLOAD_PACKAGES: True os: ubuntu runs_on: ['cirun-openstack-cpu-4xlarge--${{ github.run_id }}-linux_64_python3.9.____cpython', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 steps: - name: Checkout code diff --git a/recipe/build-core.sh b/recipe/build-core.sh index 3a8039fe..98fa67c4 100644 --- a/recipe/build-core.sh +++ b/recipe/build-core.sh @@ -16,17 +16,13 @@ if [[ "$target_platform" == osx* ]]; then sed -i"''" -e'/stdlib=libc/d' $CONDA_PREFIX/share/bazel_toolchain/CROSSTOOL.template source gen-bazel-toolchain cat >> .bazelrc < Date: Tue, 10 Nov 2020 23:26:35 +0300 -Subject: [PATCH 1/9] Disable making entry scripts +Subject: [PATCH 1/8] Disable making entry scripts --- python/setup.py | 6 +++--- @@ -24,6 +24,3 @@ index 838f3aa744..c287eb4cc1 100644 ] }, package_data={ --- -2.43.0 - diff --git a/recipe/patches/0002-Ignore-warnings-in-event.cc-and-logging.cc.patch b/recipe/patches/0002-Ignore-warnings-in-event.cc-and-logging.cc.patch index 31ec02f0..a864fba5 100644 --- a/recipe/patches/0002-Ignore-warnings-in-event.cc-and-logging.cc.patch +++ b/recipe/patches/0002-Ignore-warnings-in-event.cc-and-logging.cc.patch @@ -1,14 +1,14 @@ -From 4d2046a891d75eb52f0837fe41065756dc2cf642 Mon Sep 17 00:00:00 2001 +From 9c56c8b45e86273f7ffe9e2e5bbf9b8321599048 Mon Sep 17 00:00:00 2001 From: Vasily Litvinov -Date: Fri, 9 May 2025 13:12:32 +0300 -Subject: [PATCH 2/9] Ignore warnings in event.cc and logging.cc +Date: Sun, 19 Jan 2025 22:56:08 +1100 +Subject: [PATCH 2/8] Ignore warnings in event.cc and logging.cc --- .bazelrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.bazelrc b/.bazelrc -index 13774dda7c..575538c5f1 100644 +index 13774dda7c..7db790a4bf 100644 --- a/.bazelrc +++ b/.bazelrc @@ -57,6 +57,9 @@ build:clang-cl --per_file_copt="-\\.(asm|S)$@-Werror" @@ -21,6 +21,3 @@ index 13774dda7c..575538c5f1 100644 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,-Wno-missing-template-arg-list-after-template-kw" # Ignore warnings for host tools, which we generally can't control. --- -2.43.0 - diff --git a/recipe/patches/0003-remove-dependencies.patch b/recipe/patches/0003-remove-dependencies.patch index 636829c4..2e2ec1d4 100644 --- a/recipe/patches/0003-remove-dependencies.patch +++ b/recipe/patches/0003-remove-dependencies.patch @@ -1,7 +1,7 @@ -From 2595ec41a9d00d40b8b56442087f109307f403ec Mon Sep 17 00:00:00 2001 +From 1b737bc4a1a98662566759c6b3f73ecfe2fabb0c Mon Sep 17 00:00:00 2001 From: mattip Date: Fri, 28 Feb 2025 15:22:50 +0200 -Subject: [PATCH 3/9] remove dependencies +Subject: [PATCH 3/8] remove dependencies --- python/setup.py | 159 +++++------------------------------------------- @@ -203,6 +203,3 @@ index c287eb4cc1..25b08d3540 100644 extras_require=setup_spec.extras, entry_points={ "console_scripts": [ --- -2.43.0 - diff --git a/recipe/patches/0004-Vendor-grpc-1.67.1.patch b/recipe/patches/0004-Vendor-grpc-1.71.0.patch similarity index 64% rename from recipe/patches/0004-Vendor-grpc-1.67.1.patch rename to recipe/patches/0004-Vendor-grpc-1.71.0.patch index 1cd0e8f8..688e7e61 100644 --- a/recipe/patches/0004-Vendor-grpc-1.67.1.patch +++ b/recipe/patches/0004-Vendor-grpc-1.71.0.patch @@ -1,32 +1,145 @@ -From 30d0a0ff43e5203485cdfeaae0d779f136b15aa1 Mon Sep 17 00:00:00 2001 +From 33595f15768c853eed73513fd82c85efcaf056ce Mon Sep 17 00:00:00 2001 From: Austin Morton -Date: Fri, 9 May 2025 13:46:55 +0300 -Subject: [PATCH 4/9] Vendor-grpc-1.67.1 +Date: Wed, 26 Mar 2025 12:43:17 -0500 +Subject: [PATCH 4/8] Vendor grpc-1.71.0 --- - bazel/ray_deps_setup.bzl | 29 ++++++++----------- + BUILD.bazel | 39 ------------------- + WORKSPACE | 35 ----------------- + bazel/ray_deps_setup.bzl | 31 ++++++--------- .../task_event_buffer_export_event_test.cc | 2 +- - .../gcs_server/test/gcs_actor_manager_test.cc | 14 ++++----- + .../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(+), 41 deletions(-) + 8 files changed, 23 insertions(+), 104 deletions(-) +diff --git a/BUILD.bazel b/BUILD.bazel +index 1760705429..c1e4849ecf 100644 +--- a/BUILD.bazel ++++ b/BUILD.bazel +@@ -11,53 +11,14 @@ load("@com_github_google_flatbuffers//:build_defs.bzl", "flatbuffer_cc_library") + load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library") + load("@com_github_grpc_grpc//bazel:cython_library.bzl", "pyx_library") + load("@hedron_compile_commands//:refresh_compile_commands.bzl", "refresh_compile_commands") +-load("@python3_9//:defs.bzl", python39 = "interpreter") + load("@rules_cc//cc:defs.bzl", "cc_proto_library") + load("@rules_proto//proto:defs.bzl", "proto_library") +-load("@rules_python//python:defs.bzl", "py_library", "py_runtime", "py_runtime_pair") + load("//bazel:ray.bzl", "COPTS", "FLATC_ARGS", "PYX_COPTS", "PYX_SRCS", "copy_to_workspace", "ray_cc_binary", "ray_cc_library", "ray_cc_test") + + package( + default_visibility = ["//visibility:public"], + ) + +-# Hermetic python environment, currently only used for CI infra and scripts. +- +-py_runtime( +- name = "python3_runtime", +- interpreter = python39, +- python_version = "PY3", +- visibility = ["//visibility:private"], +-) +- +-py_runtime_pair( +- name = "python_runtime_pair", +- py2_runtime = None, +- py3_runtime = ":python3_runtime", +- visibility = ["//visibility:private"], +-) +- +-constraint_setting(name = "hermetic") +- +-constraint_value( +- name = "hermetic_python", +- constraint_setting = ":hermetic", +-) +- +-toolchain( +- name = "python_toolchain", +- exec_compatible_with = [":hermetic_python"], +- toolchain = ":python_runtime_pair", +- toolchain_type = "@bazel_tools//tools/python:toolchain_type", +-) +- +-platform( +- name = "hermetic_python_platform", +- constraint_values = [":hermetic_python"], +- parents = ["@local_config_platform//:host"], +- visibility = ["//visibility:private"], +-) +- + # C/C++ toolchain constraint configs. + + config_setting( +diff --git a/WORKSPACE b/WORKSPACE +index 590d4cb0b6..0667f90f6a 100644 +--- a/WORKSPACE ++++ b/WORKSPACE +@@ -37,43 +37,8 @@ load("@hedron_compile_commands//:workspace_setup.bzl", "hedron_compile_commands_ + + hedron_compile_commands_setup() + +-http_archive( +- name = "rules_python", +- sha256 = "c68bdc4fbec25de5b5493b8819cfc877c4ea299c0dcb15c244c5a00208cde311", +- strip_prefix = "rules_python-0.31.0", +- url = "https://github.com/bazelbuild/rules_python/releases/download/0.31.0/rules_python-0.31.0.tar.gz", +-) +- +-load("@rules_python//python:repositories.bzl", "python_register_toolchains") +- +-python_register_toolchains( +- name = "python3_9", +- python_version = "3.9", +- register_toolchains = False, +-) +- +-load("@python3_9//:defs.bzl", python39 = "interpreter") +-load("@rules_python//python/pip_install:repositories.bzl", "pip_install_dependencies") +- +-pip_install_dependencies() +- +-load("@rules_python//python:pip.bzl", "pip_parse") +- +-pip_parse( +- name = "py_deps_buildkite", +- python_interpreter_target = python39, +- requirements_lock = "//release:requirements_buildkite.txt", +-) +- +-load("@py_deps_buildkite//:requirements.bzl", install_py_deps_buildkite = "install_deps") +- +-install_py_deps_buildkite() +- +-register_toolchains("//:python_toolchain") +- + register_execution_platforms( + "@local_config_platform//:host", +- "//:hermetic_python_platform", + ) + + http_archive( diff --git a/bazel/ray_deps_setup.bzl b/bazel/ray_deps_setup.bzl -index 0db8ebee2d..ab1b57d226 100644 +index 0db8ebee2d..0febc47491 100644 --- a/bazel/ray_deps_setup.bzl +++ b/bazel/ray_deps_setup.bzl -@@ -91,15 +91,11 @@ def ray_deps_setup(): - # Pinned grpc version: v23.4 +@@ -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 http_archive( name = "com_google_protobuf", - sha256 = "76a33e2136f23971ce46c72fd697cd94dc9f73d56ab23b753c3e16854c90ddfd", - strip_prefix = "protobuf-2c5fa078d8e86e5f4bd34e6f4c9ea9e8d7d4d44a", -+ sha256 = "b2340aa47faf7ef10a0328190319d3f3bee1b24f426d4ce8f4253b6f27ce16db", -+ strip_prefix = "protobuf-28.2", ++ sha256 = "008a11cc56f9b96679b4c285fd05f46d317d685be3ab524b2a310be0fbad987e", ++ strip_prefix = "protobuf-29.3", urls = [ - "https://github.com/protocolbuffers/protobuf/archive/2c5fa078d8e86e5f4bd34e6f4c9ea9e8d7d4d44a.tar.gz", -+ "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v28.2.tar.gz", ++ "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v29.3.tar.gz", ], - patches = [ - "@com_github_grpc_grpc//third_party:protobuf.patch", @@ -35,46 +148,46 @@ index 0db8ebee2d..ab1b57d226 100644 ) # NOTE(lingxuan.zlx): 3rd party dependencies could be accessed, so it suggests -@@ -229,10 +225,10 @@ def ray_deps_setup(): +@@ -229,10 +222,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", - sha256 = "987ce98f02eefbaf930d6e38ab16aa05737234d7afbab2d5c4ea7adbe50c28ed", - strip_prefix = "abseil-cpp-20230802.1", -+ sha256 = "f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3", -+ strip_prefix = "abseil-cpp-20240722.0", ++ sha256 = "b396401fd29e2e679cace77867481d388c807671dc2acc602a0259eeb79b7811", ++ strip_prefix = "abseil-cpp-20250127.1", urls = [ - "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.1.tar.gz", -+ "https://github.com/abseil/abseil-cpp/archive/refs/tags/20240722.0.tar.gz", ++ "https://github.com/abseil/abseil-cpp/archive/refs/tags/20250127.1.tar.gz", ], ) -@@ -253,7 +249,7 @@ def ray_deps_setup(): +@@ -253,8 +246,8 @@ def ray_deps_setup(): auto_http_archive( name = "com_github_grpc_grpc", # NOTE: If you update this, also update @boringssl's hash. - url = "https://github.com/grpc/grpc/archive/refs/tags/v1.57.1.tar.gz", - sha256 = "0762f809b9de845e6a7c809cabccad6aa4143479fd43b396611fe5a086c0aeeb", -+ url = "https://github.com/grpc/grpc/archive/refs/tags/v1.67.1.tar.gz", -+ sha256 = "d74f8e99a433982a12d7899f6773e285c9824e1d9a173ea1d1fb26c9bd089299", ++ url = "https://github.com/grpc/grpc/archive/refs/tags/v1.71.0.tar.gz", ++ sha256 = "0d631419e54ec5b29def798623ee3bf5520dac77abeab3284ef7027ec2363f91", patches = [ "@com_github_ray_project_ray//thirdparty/patches:grpc-cython-copts.patch", - ], -@@ -297,13 +292,13 @@ def ray_deps_setup(): + "@com_github_ray_project_ray//thirdparty/patches:grpc-zlib-fdopen.patch", +@@ -297,13 +290,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: - # https://github.com/grpc/grpc/blob/1ff1feaa83e071d87c07827b0a317ffac673794f/bazel/grpc_deps.bzl#L189 # Ensure this rule matches the rule used by grpc's bazel/grpc_deps.bzl -+ # https://github.com/grpc/grpc/blob/v1.67.1/bazel/grpc_deps.bzl#L33 ++ # https://github.com/grpc/grpc/blob/v1.71.0/bazel/grpc_deps.bzl#L33 name = "boringssl", - sha256 = "0675a4f86ce5e959703425d6f9063eaadf6b61b7f3399e77a154c0e85bad46b1", - strip_prefix = "boringssl-342e805bc1f5dfdd650e3f031686d6c939b095d9", -+ sha256 = "c70d519e4ee709b7a74410a5e3a937428b8198d793a3d771be3dd2086ae167c8", -+ strip_prefix = "boringssl-b8b3e6e11166719a8ebfa43c0cde9ad7d57a84f6", ++ sha256 = "cea4c77cd69279585ea53efa2bb2ae6eb5f31fb39c214213c5b7cdf3c44d7b52", ++ strip_prefix = "boringssl-c64b8fefbba9a9dadda73138062fc449bdf11e2a", urls = [ - "https://github.com/google/boringssl/archive/342e805bc1f5dfdd650e3f031686d6c939b095d9.tar.gz", -+ "https://github.com/google/boringssl/archive/b8b3e6e11166719a8ebfa43c0cde9ad7d57a84f6.tar.gz", ++ "https://github.com/google/boringssl/archive/c64b8fefbba9a9dadda73138062fc449bdf11e2a.tar.gz", ], ) @@ -197,27 +310,3 @@ index 16c723e27c..e99df202c9 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(): - diff --git a/recipe/patches/0005-remove-stdlib-libc-from-.bazelrc.patch b/recipe/patches/0005-remove-stdlib-libc-from-.bazelrc.patch index 753439ae..4ddd6f6f 100644 --- a/recipe/patches/0005-remove-stdlib-libc-from-.bazelrc.patch +++ b/recipe/patches/0005-remove-stdlib-libc-from-.bazelrc.patch @@ -1,14 +1,14 @@ -From a043bfba8d99a0afaed2a8094e98ce6e5807cb39 Mon Sep 17 00:00:00 2001 +From 94162bf16702514ebf9edbe57800487ffd9357eb Mon Sep 17 00:00:00 2001 From: Matti Picus Date: Thu, 9 May 2024 05:13:50 +1000 -Subject: [PATCH 5/9] remove stdlib=libc++ from .bazelrc +Subject: [PATCH 5/8] remove stdlib=libc++ from .bazelrc --- .bazelrc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.bazelrc b/.bazelrc -index 575538c5f1..985fa85a8c 100644 +index 7db790a4bf..1e261f8e23 100644 --- a/.bazelrc +++ b/.bazelrc @@ -105,9 +105,9 @@ build:windows-debug --cxxopt="-D_ITERATOR_DEBUG_LEVEL=2" @@ -24,6 +24,3 @@ index 575538c5f1..985fa85a8c 100644 build:llvm --action_env=BAZEL_LINKLIBS=-l%:libc++.a:-l%:libc++abi.a build:llvm --action_env=BAZEL_LINKOPTS=-lm:-pthread build:llvm --define force_libcpp=enabled --- -2.43.0 - diff --git a/recipe/patches/0006-patch-protobuf-use-of-nan-on-windows.patch b/recipe/patches/0006-patch-protobuf-use-of-nan-on-windows.patch deleted file mode 100644 index a9ad0dbf..00000000 --- a/recipe/patches/0006-patch-protobuf-use-of-nan-on-windows.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 257da6adc78782ae7cc94a50b86dcad8647532b1 Mon Sep 17 00:00:00 2001 -From: Matti Picus -Date: Wed, 5 Feb 2025 22:39:59 +1100 -Subject: [PATCH 6/9] patch protobuf use of nan on windows - ---- - bazel/ray_deps_setup.bzl | 4 +++ - .../patches/protobuf-windows-const-nan.patch | 32 +++++++++++++++++++ - 2 files changed, 36 insertions(+) - create mode 100644 thirdparty/patches/protobuf-windows-const-nan.patch - -diff --git a/bazel/ray_deps_setup.bzl b/bazel/ray_deps_setup.bzl -index ab1b57d226..a4117d0ca2 100644 ---- a/bazel/ray_deps_setup.bzl -+++ b/bazel/ray_deps_setup.bzl -@@ -96,6 +96,10 @@ def ray_deps_setup(): - urls = [ - "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v28.2.tar.gz", - ], -+ patches = [ -+ "@com_github_ray_project_ray//thirdparty/patches:protobuf-windows-const-nan.patch", -+ -+ ], - ) - - # NOTE(lingxuan.zlx): 3rd party dependencies could be accessed, so it suggests -diff --git a/thirdparty/patches/protobuf-windows-const-nan.patch b/thirdparty/patches/protobuf-windows-const-nan.patch -new file mode 100644 -index 0000000000..4c4cab48f4 ---- /dev/null -+++ b/thirdparty/patches/protobuf-windows-const-nan.patch -@@ -0,0 +1,32 @@ -+diff -u upb/message/internal/message.c /tmp/message.c -+--- upb/message/internal/message.c -++++ upb/message/internal/message.c -+@@ -19,7 +19,27 @@ -+ -+ const float kUpb_FltInfinity = INFINITY; -+ const double kUpb_Infinity = INFINITY; -+-const double kUpb_NaN = NAN; -++ -++// The latest win32 SDKs have an invalid definition of NAN. -++// https://developercommunity.visualstudio.com/t/NAN-is-no-longer-compile-time-constant-i/10688907 -++// -++// Unfortunately, the `0.0 / 0.0` workaround doesn't work in Clang under C23, so -++// try __builtin_nan first, if that exists. -++#ifdef _WIN32 -++#ifdef __has_builtin -++#if __has_builtin(__builtin_nan) -++#define UPB_NAN __builtin_nan("0") -++#endif -++#endif -++#ifndef UPB_NAN -++#define UPB_NAN 0.0 / 0.0 -++#endif -++#else -++// For !_WIN32, assume math.h works. -++#define UPB_NAN NAN -++#endif -++const double kUpb_NaN = UPB_NAN; -++ -+ -+ bool UPB_PRIVATE(_upb_Message_Realloc)(struct upb_Message* msg, size_t need, -+ upb_Arena* a) { --- -2.43.0 - diff --git a/recipe/patches/0007-patch-zlib-in-prometheus-cpp-and-boost.patch b/recipe/patches/0006-patch-zlib-in-prometheus-cpp-and-boost.patch similarity index 88% rename from recipe/patches/0007-patch-zlib-in-prometheus-cpp-and-boost.patch rename to recipe/patches/0006-patch-zlib-in-prometheus-cpp-and-boost.patch index 75fc7eea..b95483bb 100644 --- a/recipe/patches/0007-patch-zlib-in-prometheus-cpp-and-boost.patch +++ b/recipe/patches/0006-patch-zlib-in-prometheus-cpp-and-boost.patch @@ -1,7 +1,7 @@ -From aa78d2977d03c61f5bf6e0fad847ab53ac02e2a9 Mon Sep 17 00:00:00 2001 +From 720d344df4c999a94a6345e759fac937ae4412f4 Mon Sep 17 00:00:00 2001 From: mattip Date: Fri, 9 May 2025 13:54:01 +0300 -Subject: [PATCH 7/9] patch zlib in prometheus-cpp and boost +Subject: [PATCH 6/8] patch zlib in prometheus-cpp and boost --- bazel/ray_deps_setup.bzl | 3 +++ @@ -10,10 +10,10 @@ Subject: [PATCH 7/9] patch zlib in prometheus-cpp and boost create mode 100644 thirdparty/patches/boost-zlib-fdopen.patch diff --git a/bazel/ray_deps_setup.bzl b/bazel/ray_deps_setup.bzl -index a4117d0ca2..3e4569f8f1 100644 +index 0febc47491..495479f67d 100644 --- a/bazel/ray_deps_setup.bzl +++ b/bazel/ray_deps_setup.bzl -@@ -172,6 +172,9 @@ def ray_deps_setup(): +@@ -165,6 +165,9 @@ def ray_deps_setup(): # If you update the Boost version, remember to update the 'boost' rule. url = "https://github.com/nelhage/rules_boost/archive/57c99395e15720e287471d79178d36a85b64d6f6.tar.gz", sha256 = "490d11425393eed068966a4990ead1ff07c658f823fd982fddac67006ccc44ab", @@ -44,6 +44,3 @@ index 0000000000..026703b3b0 + maybe( + + --- -2.43.0 - diff --git a/recipe/patches/0008-add-missing-include.patch b/recipe/patches/0007-add-missing-include.patch similarity index 84% rename from recipe/patches/0008-add-missing-include.patch rename to recipe/patches/0007-add-missing-include.patch index 479a5cf1..1aa96bef 100644 --- a/recipe/patches/0008-add-missing-include.patch +++ b/recipe/patches/0007-add-missing-include.patch @@ -1,7 +1,7 @@ -From 8d3d2d6d1ea3ab789607917526fc9c7b7f0db3ed Mon Sep 17 00:00:00 2001 +From d1b03b28b8a2bb9c359a90080591d9ff5115cd53 Mon Sep 17 00:00:00 2001 From: mattip Date: Fri, 28 Feb 2025 15:29:57 +0200 -Subject: [PATCH 8/9] add-missing-include +Subject: [PATCH 7/8] add-missing-include --- src/ray/util/pipe_logger.cc | 1 + @@ -19,6 +19,3 @@ index 495ff3462a..a81a64f5dd 100644 #include "spdlog/sinks/basic_file_sink.h" #include "spdlog/sinks/rotating_file_sink.h" #include "spdlog/sinks/stdout_color_sinks.h" --- -2.43.0 - diff --git a/recipe/patches/0009-patch-bundled-fmt-in-spdlog-for-invalid-char8_type.patch b/recipe/patches/0008-patch-bundled-fmt-in-spdlog-for-invalid-char8_type.patch similarity index 91% rename from recipe/patches/0009-patch-bundled-fmt-in-spdlog-for-invalid-char8_type.patch rename to recipe/patches/0008-patch-bundled-fmt-in-spdlog-for-invalid-char8_type.patch index f8aead0a..df9de70c 100644 --- a/recipe/patches/0009-patch-bundled-fmt-in-spdlog-for-invalid-char8_type.patch +++ b/recipe/patches/0008-patch-bundled-fmt-in-spdlog-for-invalid-char8_type.patch @@ -1,7 +1,7 @@ -From f41db7dfb2133ced69ff7efb337c992ac14a3aef Mon Sep 17 00:00:00 2001 +From 52e7acdf0fa5af74ae90becd62b0badb3d3c92cd Mon Sep 17 00:00:00 2001 From: Matti Picus Date: Sun, 19 Jan 2025 23:17:01 +1100 -Subject: [PATCH 9/9] patch bundled fmt in spdlog for invalid char8_type +Subject: [PATCH 8/8] patch bundled fmt in spdlog for invalid char8_type --- bazel/ray_deps_setup.bzl | 1 + @@ -10,10 +10,10 @@ Subject: [PATCH 9/9] patch bundled fmt in spdlog for invalid char8_type create mode 100644 thirdparty/patches/spdlog-fmt-no-char8_type.patch diff --git a/bazel/ray_deps_setup.bzl b/bazel/ray_deps_setup.bzl -index 3e4569f8f1..d04ec3442b 100644 +index 495479f67d..a96f0d10db 100644 --- a/bazel/ray_deps_setup.bzl +++ b/bazel/ray_deps_setup.bzl -@@ -134,6 +134,7 @@ def ray_deps_setup(): +@@ -127,6 +127,7 @@ def ray_deps_setup(): # spdlog rotation filename format conflict with ray, update the format. patches = [ "@com_github_ray_project_ray//thirdparty/patches:spdlog-rotation-file-format.patch", @@ -68,6 +68,3 @@ index 0000000000..fdcbba413d + #ifndef FMT_USE_FLOAT128 + # ifdef __SIZEOF_FLOAT128__ + # define FMT_USE_FLOAT128 1 --- -2.43.0 - diff --git a/recipe/patches/0009-remove-zlib-patching-for-fdopen-on-macos.patch b/recipe/patches/0009-remove-zlib-patching-for-fdopen-on-macos.patch new file mode 100644 index 00000000..e846cc01 --- /dev/null +++ b/recipe/patches/0009-remove-zlib-patching-for-fdopen-on-macos.patch @@ -0,0 +1,26 @@ +From cba149286e38c0deadf2649751b43e3732a1dba3 Mon Sep 17 00:00:00 2001 +From: mattip +Date: Wed, 14 May 2025 09:22:27 +0300 +Subject: [PATCH] remove zlib patching for fdopen on macos + +--- + bazel/ray_deps_setup.bzl | 1 - + thirdparty/patches/grpc-zlib-fdopen.patch | 13 ------------- + thirdparty/patches/zlib-fdopen.patch | 19 ------------------- + 3 files changed, 33 deletions(-) + delete mode 100644 thirdparty/patches/grpc-zlib-fdopen.patch + delete mode 100644 thirdparty/patches/zlib-fdopen.patch + +diff --git a/bazel/ray_deps_setup.bzl b/bazel/ray_deps_setup.bzl +index 0db8ebee2d..5607bba9d2 100644 +--- a/bazel/ray_deps_setup.bzl ++++ b/bazel/ray_deps_setup.bzl +@@ -254,7 +254,6 @@ def ray_deps_setup(): + sha256 = "0762f809b9de845e6a7c809cabccad6aa4143479fd43b396611fe5a086c0aeeb", + patches = [ + "@com_github_ray_project_ray//thirdparty/patches:grpc-cython-copts.patch", +- "@com_github_ray_project_ray//thirdparty/patches:grpc-zlib-fdopen.patch", + ], + ) + +