Skip to content

Commit

Permalink
NO_TICKET Pull ray absl fix for Mac ARM
Browse files Browse the repository at this point in the history
* Technically we only need `absl` because it was using deprecated C++
APIs that were throwing an error, but I decided to pull:
ray-project#31925
No functional changes, still debating whether we should increase
the suffix -- leaving as is for now
* Also update `spdlog`, for the same reason, based on this PR:
ray-project#40852
  • Loading branch information
Toad2186 committed Jan 23, 2024
1 parent 0ae4a0f commit eb21694
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 15 deletions.
30 changes: 16 additions & 14 deletions bazel/ray_deps_setup.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ def ray_deps_setup():
# This is copied from grpc's bazel/grpc_deps.bzl
http_archive(
name = "com_google_protobuf",
sha256 = "63c5539a8506dc6bccd352a857cea106e0a389ce047a3ff0a78fe3f8fede410d",
strip_prefix = "protobuf-24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb",
sha256 = "76a33e2136f23971ce46c72fd697cd94dc9f73d56ab23b753c3e16854c90ddfd",
strip_prefix = "protobuf-2c5fa078d8e86e5f4bd34e6f4c9ea9e8d7d4d44a",
urls = [
# https://github.com/protocolbuffers/protobuf/commits/v21.6
"https://github.com/protocolbuffers/protobuf/archive/24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb.tar.gz"
# https://github.com/protocolbuffers/protobuf/commits/v23.4
"https://github.com/protocolbuffers/protobuf/archive/2c5fa078d8e86e5f4bd34e6f4c9ea9e8d7d4d44a.tar.gz",
],
patches = [
"@com_github_grpc_grpc//third_party:protobuf.patch",
Expand Down Expand Up @@ -128,8 +128,8 @@ def ray_deps_setup():
auto_http_archive(
name = "com_github_spdlog",
build_file = "@com_github_ray_project_ray//bazel:BUILD.spdlog",
urls = ["https://github.com/gabime/spdlog/archive/v1.7.0.zip"],
sha256 = "c8f1e1103e0b148eb8832275d8e68036f2fdd3975a1199af0e844908c56f6ea5",
urls = ["https://github.com/gabime/spdlog/archive/v1.12.0.zip"],
sha256 = "6174bf8885287422a6c6a0312eb8a30e8d22bcfcee7c48a6d02d1835d7769232",
)

auto_http_archive(
Expand Down Expand Up @@ -220,8 +220,11 @@ def ray_deps_setup():
# This is how diamond dependencies are prevented.
auto_http_archive(
name = "com_google_absl",
url = "https://github.com/abseil/abseil-cpp/archive/refs/tags/20220623.1.tar.gz",
sha256 = "91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8",
sha256 = "5366d7e7fa7ba0d915014d387b66d0d002c03236448e1ba9ef98122c13b35c36",
strip_prefix = "abseil-cpp-20230125.3",
urls = [
"https://github.com/abseil/abseil-cpp/archive/20230125.3.tar.gz",
],
)

# OpenCensus depends on jupp0r/prometheus-cpp
Expand All @@ -240,8 +243,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.50.2.tar.gz",
sha256 = "e941752638a92f21e27566903e1eb9b4a6380d70ca5ce91116b4cff6cb8fe2f2",
url = "https://github.com/grpc/grpc/archive/refs/tags/v1.57.1.tar.gz",
sha256 = "0762f809b9de845e6a7c809cabccad6aa4143479fd43b396611fe5a086c0aeeb",
patches = [
"@com_github_ray_project_ray//thirdparty/patches:grpc-cython-copts.patch",
],
Expand Down Expand Up @@ -286,11 +289,10 @@ def ray_deps_setup():
# 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
name = "boringssl",
sha256 = "ad0b806b6c5cbd6cae121c608945d5fed468748e330632e8d53315089ad52c67",
strip_prefix = "boringssl-6195bf8242156c9a2fa75702eee058f91b86a88b",
sha256 = "0675a4f86ce5e959703425d6f9063eaadf6b61b7f3399e77a154c0e85bad46b1",
strip_prefix = "boringssl-342e805bc1f5dfdd650e3f031686d6c939b095d9",
urls = [
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/6195bf8242156c9a2fa75702eee058f91b86a88b.tar.gz",
"https://github.com/google/boringssl/archive/6195bf8242156c9a2fa75702eee058f91b86a88b.tar.gz",
"https://github.com/google/boringssl/archive/342e805bc1f5dfdd650e3f031686d6c939b095d9.tar.gz",
],
)

Expand Down
2 changes: 1 addition & 1 deletion python/ray/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def _configure_system():

# Replaced with the current commit when building the wheels.
__commit__ = "{{RAY_COMMIT_SHA}}"
__version__ = "2.8.0.post1"
__version__ = "2.8.0.post2"

import ray._raylet # noqa: E402

Expand Down
2 changes: 2 additions & 0 deletions thirdparty/patches/grpc-cython-copts.patch
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ diff --git bazel/cython_library.bzl bazel/cython_library.bzl
+ srcs = [stem + ".cpp"] + cc_kwargs.pop("srcs", []),
- deps = deps + ["@local_config_python//:python_headers"],
+ deps = deps + ["@local_config_python//:python_headers"] + cc_kwargs.pop("deps", []),
- defines = defines,
+ defines = defines,
- linkshared = 1,
+ linkshared = cc_kwargs.pop("linkshared", 1),
+ **cc_kwargs
Expand Down

0 comments on commit eb21694

Please sign in to comment.