Skip to content

Commit

Permalink
Update com_github_grpc_grpc to version 1.50.0 and add dependency …
Browse files Browse the repository at this point in the history
…on `grpc_security_base`.

Note that it looks like TFF is downgrading com_github_grpc_grpc from version 1.59.0 to 1.50.0, but in fact this is an upgrade from whatever version was being brought in by TF to 1.50.0.

PiperOrigin-RevId: 632572366
  • Loading branch information
michaelreneer authored and tensorflow-copybara committed May 10, 2024
1 parent 4a41b79 commit 1a40db7
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 14 deletions.
4 changes: 4 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Unreleased

## Breaking Changes

* Updated `com_github_grpc_grpc` to version `1.50.0`.

# Release 0.78.0

## Major Features and Improvements
Expand Down
31 changes: 17 additions & 14 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ git_repository(
tag = "1.3.0",
)

git_repository(
name = "com_github_grpc_grpc",
remote = "https://github.com/grpc/grpc.git",
tag = "v1.50.0",
)

git_repository(
name = "com_google_benchmark",
remote = "https://github.com/google/benchmark.git",
Expand Down Expand Up @@ -119,14 +125,22 @@ git_repository(
# Inlined transitive dependencies, grouped by direct dependency.
#

# Required by pybind11_abseil and pybind11_protobuf
# Required by pybind11_abseil and pybind11_protobuf.
new_git_repository(
name = "pybind11",
build_file = "@pybind11_bazel//:pybind11.BUILD",
remote = "https://github.com/pybind/pybind11.git",
tag = "v2.9.2",
)

# Required by com_github_grpc_grpc. This commit is determined by
# https://github.com/grpc/grpc/blob/v1.50.0/bazel/grpc_deps.bzl#L344.
git_repository(
name = "upb",
remote = "https://github.com/protocolbuffers/upb.git",
commit = "e4635f223e7d36dfbea3b722a4ca4807a7e882e2",
)

#
# Transitive dependencies, grouped by direct dependency.
#
Expand All @@ -151,19 +165,8 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")

protobuf_deps()

git_repository(
name = "com_github_grpc_grpc",
remote = "https://github.com/grpc/grpc.git",
tag = "v1.59.1",
)

# Unable to load the `grpc_extra_deps` from gRPC because they conflict with the
# dependencies required by TensorFlow.
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")

grpc_deps()

# TODO: b/260598663 - Temporarily disable the direct dependency on
# `grpc_extra_deps`, for now we pick this dependency up from the TensorFlow
# workspace.
# load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
#
# grpc_extra_deps()
1 change: 1 addition & 0 deletions tensorflow_federated/cc/core/impl/executors/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -674,6 +674,7 @@ cc_library(
"//tensorflow_federated/proto/v0:executor_cc_grpc_proto",
"//tensorflow_federated/proto/v0:executor_cc_proto",
"@com_github_grpc_grpc//:grpc++",
"@com_github_grpc_grpc//:grpc_security_base",
"@com_google_absl//absl/strings",
"@com_google_googletest//:gtest",
],
Expand Down

0 comments on commit 1a40db7

Please sign in to comment.