Update tensorflow to version 2.17.0.

PiperOrigin-RevId: 657740192
google-parfait · Aug 16, 2024 · d3cb6e7 · d3cb6e7
1 parent 8d158ec
commit d3cb6e7
Show file tree

Hide file tree

Showing 87 changed files with 3,154 additions and 377 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -149,4 +149,4 @@ build --cxxopt=-D_GLIBCXX_USE_CXX11_ABI=1
 # Default startup
 startup --host_jvm_args=-Dbazel.DigestFunction=SHA256
 
-build --define=build_with_onednn_v2=true
+build --copt=-DDENABLE_ONEDNN_V3
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -0,0 +1,34 @@
+load("@python//:defs.bzl", "compile_pip_requirements")
+load("@python_version_repo//:py_version.bzl", "REQUIREMENTS")
+load("@rules_license//rules:license.bzl", "license")  # copybara:strip
+
+license(
+    name = "package_license",
+    package_name = "tensorflow_federated",
+)
+
+licenses(["notice"])
+
+exports_files([
+    "copy.bara.sky",
+    "LICENSE",
+    "README.md",
+])
+
+filegroup(
+    name = "pyproject_toml",
+    srcs = ["pyproject.toml"],
+    visibility = ["//tensorflow_federated/tools/python_package:python_package_tool"],
+)
+
+compile_pip_requirements(
+    name = "requirements",
+    extra_args = [
+        "--allow-unsafe",
+        "--build-isolation",
+        "--rebuild",
+    ],
+    generate_hashes = True,
+    requirements_in = "requirements.in",
+    requirements_txt = REQUIREMENTS,
+)
diff --git a/RELEASE.md b/RELEASE.md
@@ -8,6 +8,10 @@ and this project adheres to
 
 ## Unreleased
 
+### Changes
+
+*   `tensorflow` version increased to 2.17.0.
+
 ### Added
 
 *   `tff.tensorflow.transform_args` and `tff.tnesorflow.transform_result`, these
@@ -42,7 +46,8 @@ and this project adheres to
     function in `dp_noise_mechanisms`.
 *   `DPGroupByFactory::CreateInternal`: when `delta` is not provided, check if
     the right norm bounds are provided to compute L1 sensitivity (for the
-    Laplace mech).
+    Laplace mech). <<<<<<< dest: d5040728512b - kengf: Creation of
+    ConstantImageIdFetcher
 *   CreateRemoteExecutorStack now allows the composing executor to be specified
     and assigns client values to leaf executors such that all leaf executors
     receive the same number of clients, except for potentially the last leaf

diff --git a/WORKSPACE b/WORKSPACE
@@ -18,64 +18,75 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "bazel_skylib",
-    url = "https://github.com/bazelbuild/bazel-skylib/archive/refs/tags/1.3.0.tar.gz",
     sha256 = "3b620033ca48fcd6f5ef2ac85e0f6ec5639605fa2f627968490e52fc91a9932f",
     strip_prefix = "bazel-skylib-1.3.0",
+    url = "https://github.com/bazelbuild/bazel-skylib/archive/refs/tags/1.3.0.tar.gz",
 )
 
 http_archive(
     name = "com_github_grpc_grpc",
-    url = "https://github.com/grpc/grpc/archive/refs/tags/v1.50.0.tar.gz",
-    sha256 = "76900ab068da86378395a8e125b5cc43dfae671e09ff6462ddfef18676e2165a",
-    strip_prefix = "grpc-1.50.0",
+    patches = [
+        "//third_party/grpc:register_go_toolchain.patch",
+        "//third_party/grpc:grpc_noexcept.patch",
+    ],
+    sha256 = "0343e6dbde66e9a31c691f2f61e98d79f3584e03a11511fad3f10e3667832a45",
+    strip_prefix = "grpc-1.29.1",
+    url = "https://github.com/grpc/grpc/archive/refs/tags/v1.29.1.tar.gz",
+)
+
+http_archive(
+    name = "pybind11_protobuf",
+    sha256 = "ba2c54a8b4d1dd0a68c58159e37b1f863c0d9d1dc815558288195493bcc31682",
+    strip_prefix = "pybind11_protobuf-80f3440cd8fee124e077e2e47a8a17b78b451363",
+    url = "https://github.com/pybind/pybind11_protobuf/archive/80f3440cd8fee124e077e2e47a8a17b78b451363.tar.gz",
 )
 
 http_archive(
     name = "com_google_benchmark",
-    url = "https://github.com/google/benchmark/archive/refs/tags/v1.8.3.tar.gz",
     sha256 = "6bc180a57d23d4d9515519f92b0c83d61b05b5bab188961f36ac7b06b0d9e9ce",
     strip_prefix = "benchmark-1.8.3",
+    url = "https://github.com/google/benchmark/archive/refs/tags/v1.8.3.tar.gz",
 )
 
 http_archive(
-  name = "com_google_cc_differential_privacy",
-  url = "https://github.com/google/differential-privacy/archive/refs/tags/v3.0.0.tar.gz",
-  sha256 = "6e6e1cd7a819695caae408f4fa938129ab7a86e83fe2410137c85e50131abbe0",
-  strip_prefix = "differential-privacy-3.0.0/cc",
+    name = "com_google_cc_differential_privacy",
+    sha256 = "6e6e1cd7a819695caae408f4fa938129ab7a86e83fe2410137c85e50131abbe0",
+    strip_prefix = "differential-privacy-3.0.0/cc",
+    url = "https://github.com/google/differential-privacy/archive/refs/tags/v3.0.0.tar.gz",
 )
 
 http_archive(
-  name = "com_google_differential_privacy",
-  url = "https://github.com/google/differential-privacy/archive/refs/tags/v3.0.0.tar.gz",
-  sha256 = "6e6e1cd7a819695caae408f4fa938129ab7a86e83fe2410137c85e50131abbe0",
-  strip_prefix = "differential-privacy-3.0.0",
+    name = "com_google_differential_privacy",
+    sha256 = "6e6e1cd7a819695caae408f4fa938129ab7a86e83fe2410137c85e50131abbe0",
+    strip_prefix = "differential-privacy-3.0.0",
+    url = "https://github.com/google/differential-privacy/archive/refs/tags/v3.0.0.tar.gz",
 )
 
 # This commit is determined by
-# https://github.com/tensorflow/tensorflow/blob/v2.16.1/third_party/absl/workspace.bzl#L10.
+# https://github.com/tensorflow/tensorflow/blob/v2.17.0/third_party/absl/workspace.bzl#L10.
 http_archive(
     name = "com_google_absl",
-    url = "https://github.com/abseil/abseil-cpp/archive/fb3621f4f897824c0dbe0615fa94543df6192f30.tar.gz",
     sha256 = "0320586856674d16b0b7a4d4afb22151bdc798490bb7f295eddd8f6a62b46fea",
     strip_prefix = "abseil-cpp-fb3621f4f897824c0dbe0615fa94543df6192f30",
+    url = "https://github.com/abseil/abseil-cpp/archive/fb3621f4f897824c0dbe0615fa94543df6192f30.tar.gz",
 )
 
 http_archive(
     name = "com_google_googletest",
-    url = "https://github.com/google/googletest/archive/refs/tags/release-1.12.1.tar.gz",
     sha256 = "81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2",
     strip_prefix = "googletest-release-1.12.1",
+    url = "https://github.com/google/googletest/archive/refs/tags/release-1.12.1.tar.gz",
 )
 
 http_archive(
     name = "com_google_protobuf",
-    url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v3.21.9.tar.gz",
     sha256 = "1add10f9bd92775b91f326da259f243881e904dd509367d5031d4c782ba82810",
     strip_prefix = "protobuf-3.21.9",
+    url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v3.21.9.tar.gz",
 )
 
-# TODO: b/333391041 - Temporarily disable the direct dependency on
-# `eigen`, for now we pick this dependency up from the TensorFlow workspace.
+# TODO: b/333391041 - Temporarily disable the direct dependency on `eigen`, for
+# now we pick this dependency up from the TensorFlow workspace.
 # http_archive(
 #     name = "eigen",
 #     url = "https://gitlab.com/libeigen/eigen/archive/refs/tags/3.4.0.tar.gz",
@@ -91,76 +102,87 @@ http_archive(
 # https://github.com/google-parfait/tensorflow-federated/blob/main/requirements.txt.
 http_archive(
     name = "org_tensorflow",
-    url = "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.14.0.tar.gz",
     patches = [
         "//third_party/tensorflow:internal_visibility.patch",
-        "//third_party/tensorflow:python_toolchain.patch",
         "//third_party/tensorflow:tf2xla_visibility.patch",
     ],
-    sha256 = "ce357fd0728f0d1b0831d1653f475591662ec5bca736a94ff789e6b1944df19f",
-    strip_prefix = "tensorflow-2.14.0",
+    sha256 = "9cc4d5773b8ee910079baaecb4086d0c28939f024dd74b33fc5e64779b6533dc",
+    strip_prefix = "tensorflow-2.17.0",
+    url = "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.17.0.tar.gz",
 )
 
 # This commit is determined by
-# https://github.com/tensorflow/tensorflow/blob/v2.16.1/third_party/pybind11_abseil/workspace.bzl#L11.
+# https://github.com/tensorflow/tensorflow/blob/v2.17.0/third_party/pybind11_abseil/workspace.bzl#L11.
 http_archive(
     name = "pybind11_abseil",
-    url = "https://github.com/pybind/pybind11_abseil/archive/2c4932ed6f6204f1656e245838f4f5eae69d2e29.tar.gz",
     sha256 = "0223b647b8cc817336a51e787980ebc299c8d5e64c069829bf34b69d72337449",
     strip_prefix = "pybind11_abseil-2c4932ed6f6204f1656e245838f4f5eae69d2e29",
+    url = "https://github.com/pybind/pybind11_abseil/archive/2c4932ed6f6204f1656e245838f4f5eae69d2e29.tar.gz",
 )
 
 http_archive(
     name = "pybind11_bazel",
-    url = "https://github.com/pybind/pybind11_bazel/archive/refs/tags/v2.11.1.tar.gz",
     sha256 = "e8355ee56c2ff772334b4bfa22be17c709e5573f6d1d561c7176312156c27bd4",
     strip_prefix = "pybind11_bazel-2.11.1",
-)
-
-# This commit is determined by
-# https://github.com/tensorflow/tensorflow/blob/v2.16.1/tensorflow/workspace2.bzl#L788.
-http_archive(
-    name = "pybind11_protobuf",
-    url = "https://github.com/pybind/pybind11_protobuf/archive/80f3440cd8fee124e077e2e47a8a17b78b451363.tar.gz",
-    sha256 = "ba2c54a8b4d1dd0a68c58159e37b1f863c0d9d1dc815558288195493bcc31682",
-    strip_prefix = "pybind11_protobuf-80f3440cd8fee124e077e2e47a8a17b78b451363",
+    url = "https://github.com/pybind/pybind11_bazel/archive/refs/tags/v2.11.1.tar.gz",
 )
 
 http_archive(
     name = "rules_license",
-    url = "https://github.com/bazelbuild/rules_license/archive/refs/tags/0.0.8.tar.gz",
     sha256 = "8c1155797cb5f5697ea8c6eac6c154cf51aa020e368813d9d9b949558c84f2da",
     strip_prefix = "rules_license-0.0.8",
+    url = "https://github.com/bazelbuild/rules_license/archive/refs/tags/0.0.8.tar.gz",
 )
 
 http_archive(
     name = "rules_python",
-    url = "https://github.com/bazelbuild/rules_python/archive/refs/tags/0.31.0.tar.gz",
-    sha256 = "c68bdc4fbec25de5b5493b8819cfc877c4ea299c0dcb15c244c5a00208cde311",
-    strip_prefix = "rules_python-0.31.0",
+    sha256 = "778aaeab3e6cfd56d681c89f5c10d7ad6bf8d2f1a72de9de55b23081b2d31618",
+    strip_prefix = "rules_python-0.34.0",
+    url = "https://github.com/bazelbuild/rules_python/archive/refs/tags/0.34.0.tar.gz",
 )
 
+# TODO: b/347940678 - Temporarily disable the direct dependency on `tsl`, for
+# now we pick this dependency up from the TensorFlow workspace.
+# http_archive(
+#     name = "tsl",
+#     url = "https://github.com/google/tsl/archive/5fdb99d897eadddd136c41156fbda82c6244d60a.tar.gz",
+#     sha256 = "414f9929d6a631aa225093e24e657e1a28c5e84da8e280f1636db65fe24e4b83",
+#     strip_prefix = "tsl-5fdb99d897eadddd136c41156fbda82c6244d60a",
+# )
+
+# TODO: b/347937714 - Temporarily disable the direct dependency on `xla`, for
+# now we pick this dependency up from the TensorFlow workspace.
+# http_archive(
+#     name = "xla",
+#     url = "https://github.com/openxla/xla/archive/940e3a27542b7ce76666173e7b287aa2a9263916.tar.gz",
+#     sha256 = "bcdc778e5a456839869dea796117b723bdea488075bd9555fe118fd8d6fcf25e",
+#     strip_prefix = "xla-940e3a27542b7ce76666173e7b287aa2a9263916",
+# )
+
 #
 # Inlined transitive dependencies, grouped by direct dependency.
 #
 
 # Required by pybind11_abseil and pybind11_protobuf.
 http_archive(
     name = "pybind11",
-    url = "https://github.com/pybind/pybind11/archive/refs/tags/v2.9.2.tar.gz",
+    build_file = "@pybind11_bazel//:pybind11.BUILD",
     sha256 = "6bd528c4dbe2276635dc787b6b1f2e5316cf6b49ee3e150264e455a0d68d19c1",
     strip_prefix = "pybind11-2.9.2",
-    build_file = "@pybind11_bazel//:pybind11.BUILD",
+    url = "https://github.com/pybind/pybind11/archive/refs/tags/v2.9.2.tar.gz",
 )
 
+# TODO: b/347937669 - Temporarily disable the direct dependency on
+# `com_github_grpc_grpc`, for now we pick this dependency up from the
+# TensorFlow workspace.
 # 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.
-http_archive(
-    name = "upb",
-    url = "https://github.com/protocolbuffers/upb/archive/e4635f223e7d36dfbea3b722a4ca4807a7e882e2.tar.gz",
-    sha256 = "017a7e8e4e842d01dba5dc8aa316323eee080cd1b75986a7d1f94d87220e6502",
-    strip_prefix = "upb-e4635f223e7d36dfbea3b722a4ca4807a7e882e2",
-)
+# http_archive(
+#     name = "upb",
+#     url = "https://github.com/protocolbuffers/upb/archive/e4635f223e7d36dfbea3b722a4ca4807a7e882e2.tar.gz",
+#     sha256 = "017a7e8e4e842d01dba5dc8aa316323eee080cd1b75986a7d1f94d87220e6502",
+#     strip_prefix = "upb-e4635f223e7d36dfbea3b722a4ca4807a7e882e2",
+# )
 
 #
 # Transitive dependencies, grouped by direct dependency.
@@ -170,6 +192,27 @@ load("@rules_python//python:repositories.bzl", "py_repositories")
 
 py_repositories()
 
+# Initialize hermetic Python
+load("@org_tensorflow//third_party/py:python_init_rules.bzl", "python_init_rules")
+
+python_init_rules()
+
+load("@org_tensorflow//third_party/py:python_init_repositories.bzl", "python_init_repositories")
+
+python_init_repositories(requirements = {"3.11": "//:requirements_lock_3_11.txt"})
+
+load("@org_tensorflow//third_party/py:python_init_toolchains.bzl", "python_init_toolchains")
+
+python_init_toolchains()
+
+load("@org_tensorflow//third_party/py:python_init_pip.bzl", "python_init_pip")
+
+python_init_pip()
+
+load("@pypi//:requirements.bzl", "install_deps")
+
+install_deps()
+
 load("@org_tensorflow//tensorflow:workspace3.bzl", "tf_workspace3")
 
 tf_workspace3()

diff --git a/examples/custom_data_backend/BUILD b/examples/custom_data_backend/BUILD
@@ -1,6 +1,8 @@
+load("//tools:build_defs.bzl", "tff_cc_library")
+
 licenses(["notice"])
 
-cc_library(
+tff_cc_library(
     name = "data_backend_example_cc",
     srcs = ["data_backend_example.cc"],
     hdrs = ["data_backend_example.h"],

diff --git a/examples/datasets/BUILD b/examples/datasets/BUILD
@@ -10,5 +10,8 @@ licenses(["notice"])
 py_binary(
     name = "load_flair",
     srcs = ["load_flair.py"],
-    deps = ["//tensorflow_federated"],
+    deps = [
+        "//tensorflow_federated",
+        "@pypi_absl_py//:pkg",
+    ],
 )
diff --git a/examples/learning/federated_program/vizier/BUILD b/examples/learning/federated_program/vizier/BUILD
@@ -3,13 +3,19 @@ load("@rules_python//python:defs.bzl", "py_binary", "py_library", "py_test")
 py_library(
     name = "data_sources",
     srcs = ["data_sources.py"],
-    deps = ["//tensorflow_federated"],
+    deps = [
+        "//tensorflow_federated",
+        "@pypi_tensorflow//:pkg",
+    ],
 )
 
 py_library(
     name = "learning_process",
     srcs = ["learning_process.py"],
-    deps = ["//tensorflow_federated"],
+    deps = [
+        "//tensorflow_federated",
+        "@pypi_tensorflow//:pkg",
+    ],
 )
 
 py_binary(
@@ -23,12 +29,15 @@ py_binary(
         ":learning_process",
         ":vizier_service",
         "//tensorflow_federated",
+        "@pypi_absl_py//:pkg",
+        "@pypi_google_vizier//:pkg",
     ],
 )
 
 py_library(
     name = "vizier_service",
     srcs = ["vizier_service.py"],
+    deps = ["@pypi_tensorflow//:pkg"],
 )
 
 py_test(
@@ -37,5 +46,8 @@ py_test(
     data = [
         ":study_spec.textproto",
     ],
-    deps = [":vizier_service"],
+    deps = [
+        ":vizier_service",
+        "@pypi_absl_py//:pkg",
+    ],
 )
diff --git a/examples/personalization/BUILD b/examples/personalization/BUILD
@@ -10,7 +10,10 @@ licenses(["notice"])
 py_library(
     name = "p13n_utils",
     srcs = ["p13n_utils.py"],
-    deps = ["//tensorflow_federated"],
+    deps = [
+        "//tensorflow_federated",
+        "@pypi_tensorflow//:pkg",
+    ],
 )
 
 py_test(
@@ -19,6 +22,8 @@ py_test(
     deps = [
         ":p13n_utils",
         "//tensorflow_federated",
+        "@pypi_numpy//:pkg",
+        "@pypi_tensorflow//:pkg",
     ],
 )
 
@@ -28,5 +33,8 @@ py_binary(
     deps = [
         ":p13n_utils",
         "//tensorflow_federated",
+        "@pypi_absl_py//:pkg",
+        "@pypi_numpy//:pkg",
+        "@pypi_tensorflow//:pkg",
     ],
 )