From ea03b1fb892ece3b746cebfa70ae78732009155d Mon Sep 17 00:00:00 2001 From: Michael Reneer Date: Wed, 29 May 2024 11:10:41 -0700 Subject: [PATCH] Update `tensorflow` to version `2.16.1`. PiperOrigin-RevId: 638348186 --- RELEASE.md | 4 ++ WORKSPACE | 58 +++++++++++----- pyproject.toml | 2 +- requirements.txt | 2 +- .../cc/core/impl/aggregation/tensorflow/BUILD | 6 +- .../impl/aggregation/tensorflow/converters.cc | 2 +- .../tensorflow_checkpoint_builder_factory.cc | 2 +- .../tensorflow_checkpoint_parser_factory.cc | 2 +- .../cc/core/impl/executors/BUILD | 68 +++++++++---------- .../cc/core/impl/executors/array_test_utils.h | 2 +- .../core/impl/executors/tensorflow_utils.cc | 2 +- .../impl/executors/tensorflow_utils_test.cc | 2 +- .../cc/core/impl/executors/xla_executor.cc | 22 +++--- .../core/impl/executors/xla_executor_test.cc | 14 ++-- .../cc/core/impl/executors/xla_utils.cc | 8 +-- .../cc/core/impl/executors/xla_utils.h | 4 +- .../cc/core/impl/executors/xla_utils_test.cc | 16 ++--- .../tensorflow/internal_visibility.patch | 6 +- third_party/tensorflow/python_toolchain.patch | 34 +++++++--- .../tensorflow/tf2xla_visibility.patch | 4 +- 20 files changed, 150 insertions(+), 110 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 5821b6f1d6..41d166f7bb 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -8,6 +8,10 @@ and this project adheres to ## Unreleased +### Changed + +* Updated `tensorflow` to version `2.16.1`. + ## Release 0.81.0 ### Added diff --git a/WORKSPACE b/WORKSPACE index 541bb47dfa..d8dccd263c 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -23,12 +23,15 @@ http_archive( strip_prefix = "bazel-skylib-1.3.0", ) -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", -) +# TODO: b/347937669 - Temporarily disable the direct dependency on +# `com_github_grpc_grpc`, for now we pick this dependency up from the +# TensorFlow workspace. +# 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", +# ) http_archive( name = "com_google_benchmark", @@ -74,8 +77,8 @@ http_archive( strip_prefix = "protobuf-3.21.9", ) -# 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,14 +94,14 @@ 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", + url = "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.16.1.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 = "c729e56efc945c6df08efe5c9f5b8b89329c7c91b8f40ad2bb3e13900bd4876d", + strip_prefix = "tensorflow-2.16.1", ) # This commit is determined by @@ -140,6 +143,24 @@ http_archive( strip_prefix = "rules_python-0.31.0", ) +# 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. # @@ -153,14 +174,17 @@ http_archive( build_file = "@pybind11_bazel//:pybind11.BUILD", ) +# 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. diff --git a/pyproject.toml b/pyproject.toml index bcd14f72b9..c0bb397337 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,7 +46,7 @@ dependencies = [ 'scipy~=1.9.3', 'tensorflow-model-optimization==0.7.5', 'tensorflow-privacy==0.9.0', - 'tensorflow>=2.14.0,==2.14.*', + 'tensorflow~=2.16.1', 'tqdm~=4.64', 'typing-extensions>=4.5.0,==4.5.*', # TODO: b/315515548 - Required because current dependencies are pulling in diff --git a/requirements.txt b/requirements.txt index cc247f214d..f0594df768 100644 --- a/requirements.txt +++ b/requirements.txt @@ -44,7 +44,7 @@ typing-extensions>=4.5.0,==4.5.* # The version of this dependency should match the version in # https://github.com/google-parfait/tensorflow-federated/blob/main/WORKSPACE. -tensorflow>=2.14.0,==2.14.* +tensorflow~=2.16.1 # TODO: b/315515548 - Required because current dependencies are pulling in later # versions which are causing opaque failures. diff --git a/tensorflow_federated/cc/core/impl/aggregation/tensorflow/BUILD b/tensorflow_federated/cc/core/impl/aggregation/tensorflow/BUILD index d5b3eb12b4..cb271235a4 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/tensorflow/BUILD +++ b/tensorflow_federated/cc/core/impl/aggregation/tensorflow/BUILD @@ -29,10 +29,10 @@ cc_library( "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", + "@local_tsl//tsl/platform:refcount", "@org_tensorflow//tensorflow/core:framework", "@org_tensorflow//tensorflow/core:protos_all_cc", "@org_tensorflow//tensorflow/core/platform:tstring", - "@org_tensorflow//tensorflow/tsl/platform:refcount", ], ) @@ -130,8 +130,8 @@ cc_library( "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:cord", + "@local_tsl//tsl/platform:env", "@org_tensorflow//tensorflow/core/platform:env", - "@org_tensorflow//tensorflow/tsl/platform:env", ], ) @@ -165,8 +165,8 @@ cc_library( "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:cord", + "@local_tsl//tsl/platform:env", "@org_tensorflow//tensorflow/core/platform:env", - "@org_tensorflow//tensorflow/tsl/platform:env", ], ) diff --git a/tensorflow_federated/cc/core/impl/aggregation/tensorflow/converters.cc b/tensorflow_federated/cc/core/impl/aggregation/tensorflow/converters.cc index 3db0cab4f2..098bae0c5c 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/tensorflow/converters.cc +++ b/tensorflow_federated/cc/core/impl/aggregation/tensorflow/converters.cc @@ -29,7 +29,7 @@ #include "tensorflow/core/framework/tensor_shape.h" #include "tensorflow/core/framework/tensor_shape.pb.h" #include "tensorflow/core/platform/tstring.h" -#include "tensorflow/tsl/platform/refcount.h" +#include "tsl/platform/refcount.h" #include "tensorflow_federated/cc/core/impl/aggregation/base/monitoring.h" #include "tensorflow_federated/cc/core/impl/aggregation/core/datatype.h" #include "tensorflow_federated/cc/core/impl/aggregation/core/tensor.h" diff --git a/tensorflow_federated/cc/core/impl/aggregation/tensorflow/tensorflow_checkpoint_builder_factory.cc b/tensorflow_federated/cc/core/impl/aggregation/tensorflow/tensorflow_checkpoint_builder_factory.cc index 3903a74d36..1febef4025 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/tensorflow/tensorflow_checkpoint_builder_factory.cc +++ b/tensorflow_federated/cc/core/impl/aggregation/tensorflow/tensorflow_checkpoint_builder_factory.cc @@ -29,7 +29,7 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "tensorflow/core/platform/file_system.h" -#include "tensorflow/tsl/platform/env.h" +#include "tsl/platform/env.h" #include "tensorflow_federated/cc/core/impl/aggregation/base/monitoring.h" #include "tensorflow_federated/cc/core/impl/aggregation/core/tensor.h" #include "tensorflow_federated/cc/core/impl/aggregation/protocol/checkpoint_builder.h" diff --git a/tensorflow_federated/cc/core/impl/aggregation/tensorflow/tensorflow_checkpoint_parser_factory.cc b/tensorflow_federated/cc/core/impl/aggregation/tensorflow/tensorflow_checkpoint_parser_factory.cc index dd21957730..ce736d63bb 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/tensorflow/tensorflow_checkpoint_parser_factory.cc +++ b/tensorflow_federated/cc/core/impl/aggregation/tensorflow/tensorflow_checkpoint_parser_factory.cc @@ -29,7 +29,7 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "tensorflow/core/platform/file_system.h" -#include "tensorflow/tsl/platform/env.h" +#include "tsl/platform/env.h" #include "tensorflow_federated/cc/core/impl/aggregation/base/monitoring.h" #include "tensorflow_federated/cc/core/impl/aggregation/core/tensor.h" #include "tensorflow_federated/cc/core/impl/aggregation/protocol/checkpoint_parser.h" diff --git a/tensorflow_federated/cc/core/impl/executors/BUILD b/tensorflow_federated/cc/core/impl/executors/BUILD index b6e6c19cb0..8c18641cb4 100644 --- a/tensorflow_federated/cc/core/impl/executors/BUILD +++ b/tensorflow_federated/cc/core/impl/executors/BUILD @@ -342,7 +342,6 @@ pybind_extension( "@org_tensorflow//tensorflow/core:framework", "@org_tensorflow//tensorflow/core/platform:status", "@org_tensorflow//tensorflow/core/platform:strcat", - "@org_tensorflow//tensorflow/python/lib/core:ndarray_tensor_headers", "@pybind11_abseil//pybind11_abseil:absl_casters", "@pybind11_abseil//pybind11_abseil:status_casters", "@pybind11_protobuf//pybind11_protobuf:native_proto_caster", @@ -551,7 +550,6 @@ 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", ], @@ -1114,20 +1112,20 @@ cc_library( "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", "@com_google_absl//absl/types:span", + "@local_xla//xla:literal", + "@local_xla//xla:shape_util", + "@local_xla//xla:xla_data_proto_cc", + "@local_xla//xla:xla_proto_cc", + "@local_xla//xla/client", + "@local_xla//xla/client:client_library", + "@local_xla//xla/client:global_data", + "@local_xla//xla/client:xla_computation", + "@local_xla//xla/service:hlo_proto_cc", + "@local_xla//xla/stream_executor", + "@local_xla//xla/stream_executor:multi_platform_manager", + "@local_xla//xla/stream_executor/host:host_platform", # buildcleaner: keep # Linking in the host platform here ensures that the stream executor can execute on CPU. "@org_tensorflow//tensorflow/compiler/jit:xla_cpu_jit", # buildcleaner: keep # Linking in this dependency ensures that XLA can compile its code for the CPU host. "@org_tensorflow//tensorflow/compiler/tf2xla:common", - "@org_tensorflow//tensorflow/compiler/xla:literal", - "@org_tensorflow//tensorflow/compiler/xla:shape_util", - "@org_tensorflow//tensorflow/compiler/xla:xla_data_proto_cc", - "@org_tensorflow//tensorflow/compiler/xla:xla_proto_cc", - "@org_tensorflow//tensorflow/compiler/xla/client", - "@org_tensorflow//tensorflow/compiler/xla/client:client_library", - "@org_tensorflow//tensorflow/compiler/xla/client:global_data", - "@org_tensorflow//tensorflow/compiler/xla/client:xla_computation", - "@org_tensorflow//tensorflow/compiler/xla/service:hlo_proto_cc", - "@org_tensorflow//tensorflow/compiler/xla/stream_executor", - "@org_tensorflow//tensorflow/compiler/xla/stream_executor:multi_platform_manager", - "@org_tensorflow//tensorflow/compiler/xla/stream_executor/host:host_platform", # buildcleaner: keep # Linking in the host platform here ensures that the stream executor can execute on CPU. "@org_tensorflow//tensorflow/core:framework", "@org_tensorflow//tensorflow/core:protos_all_cc", ], @@ -1156,13 +1154,13 @@ tff_cc_cpu_gpu_test( "@com_google_absl//absl/log:check", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", + "@local_xla//xla:shape_util", + "@local_xla//xla:xla_data_proto_cc", + "@local_xla//xla/client:xla_builder", + "@local_xla//xla/client:xla_computation", + "@local_xla//xla/service:platform_util", + "@local_xla//xla/stream_executor", "@org_tensorflow//tensorflow/compiler/tf2xla:common", - "@org_tensorflow//tensorflow/compiler/xla:shape_util", - "@org_tensorflow//tensorflow/compiler/xla:xla_data_proto_cc", - "@org_tensorflow//tensorflow/compiler/xla/client:xla_builder", - "@org_tensorflow//tensorflow/compiler/xla/client:xla_computation", - "@org_tensorflow//tensorflow/compiler/xla/service:platform_util", - "@org_tensorflow//tensorflow/compiler/xla/stream_executor", "@org_tensorflow//tensorflow/core:framework", "@org_tensorflow//tensorflow/core:protos_all_cc", "@org_tensorflow//tensorflow/core/platform:statusor", @@ -1193,15 +1191,15 @@ cc_test( "@com_google_absl//absl/log:check", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", + "@local_xla//xla:shape_util", + "@local_xla//xla:xla_data_proto_cc", + "@local_xla//xla/client:xla_builder", + "@local_xla//xla/client:xla_computation", + "@local_xla//xla/service:platform_util", + "@local_xla//xla/stream_executor", + "@local_xla//xla/stream_executor/cuda:cuda_platform", # buildcleaner: keep # Linking in the host platform here ensures that the stream executor can execute on GPU. "@org_tensorflow//tensorflow/compiler/jit:xla_gpu_jit", # buildcleaner: keep # Linking in this dependency ensures that XLA can compile its code for the GPU. "@org_tensorflow//tensorflow/compiler/tf2xla:common", - "@org_tensorflow//tensorflow/compiler/xla:shape_util", - "@org_tensorflow//tensorflow/compiler/xla:xla_data_proto_cc", - "@org_tensorflow//tensorflow/compiler/xla/client:xla_builder", - "@org_tensorflow//tensorflow/compiler/xla/client:xla_computation", - "@org_tensorflow//tensorflow/compiler/xla/service:platform_util", - "@org_tensorflow//tensorflow/compiler/xla/stream_executor", - "@org_tensorflow//tensorflow/compiler/xla/stream_executor/cuda:cuda_platform", # buildcleaner: keep # Linking in the host platform here ensures that the stream executor can execute on GPU. "@org_tensorflow//tensorflow/core:framework", "@org_tensorflow//tensorflow/core:protos_all_cc", "@org_tensorflow//tensorflow/core/platform:statusor", @@ -1220,9 +1218,9 @@ cc_library( "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", - "@org_tensorflow//tensorflow/compiler/xla:literal", - "@org_tensorflow//tensorflow/compiler/xla:shape_util", - "@org_tensorflow//tensorflow/compiler/xla:types", + "@local_xla//xla:literal", + "@local_xla//xla:shape_util", + "@local_xla//xla:types", ], ) @@ -1241,10 +1239,10 @@ cc_test( "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@eigen_archive//:eigen3", - "@org_tensorflow//tensorflow/compiler/xla:literal", - "@org_tensorflow//tensorflow/compiler/xla:literal_util", - "@org_tensorflow//tensorflow/compiler/xla:shape_util", - "@org_tensorflow//tensorflow/compiler/xla:types", - "@org_tensorflow//tensorflow/compiler/xla:xla_data_proto_cc", + "@local_xla//xla:literal", + "@local_xla//xla:literal_util", + "@local_xla//xla:shape_util", + "@local_xla//xla:types", + "@local_xla//xla:xla_data_proto_cc", ], ) diff --git a/tensorflow_federated/cc/core/impl/executors/array_test_utils.h b/tensorflow_federated/cc/core/impl/executors/array_test_utils.h index 52bdf987d5..c018c2332a 100644 --- a/tensorflow_federated/cc/core/impl/executors/array_test_utils.h +++ b/tensorflow_federated/cc/core/impl/executors/array_test_utils.h @@ -23,7 +23,7 @@ limitations under the License #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" -#include "third_party/eigen3/Eigen/Core" +#include "Eigen/Core" #include "tensorflow_federated/proto/v0/array.pb.h" #include "tensorflow_federated/proto/v0/data_type.pb.h" diff --git a/tensorflow_federated/cc/core/impl/executors/tensorflow_utils.cc b/tensorflow_federated/cc/core/impl/executors/tensorflow_utils.cc index d2f10a7fea..0b128f789d 100644 --- a/tensorflow_federated/cc/core/impl/executors/tensorflow_utils.cc +++ b/tensorflow_federated/cc/core/impl/executors/tensorflow_utils.cc @@ -24,7 +24,7 @@ limitations under the License #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" -#include "third_party/eigen3/Eigen/Core" +#include "Eigen/Core" #include "tensorflow/core/framework/attr_value.pb.h" #include "tensorflow/core/framework/graph.pb.h" #include "tensorflow/core/framework/node_def.pb.h" diff --git a/tensorflow_federated/cc/core/impl/executors/tensorflow_utils_test.cc b/tensorflow_federated/cc/core/impl/executors/tensorflow_utils_test.cc index 73d44bdcff..fd2e0b8465 100644 --- a/tensorflow_federated/cc/core/impl/executors/tensorflow_utils_test.cc +++ b/tensorflow_federated/cc/core/impl/executors/tensorflow_utils_test.cc @@ -22,7 +22,7 @@ limitations under the License #include "googletest/include/gtest/gtest.h" #include "absl/status/status.h" #include "absl/status/statusor.h" -#include "third_party/eigen3/Eigen/Core" +#include "Eigen/Core" #include "tensorflow/core/framework/numeric_types.h" #include "tensorflow/core/framework/tensor_shape.h" #include "tensorflow/core/framework/tensor_testutil.h" diff --git a/tensorflow_federated/cc/core/impl/executors/xla_executor.cc b/tensorflow_federated/cc/core/impl/executors/xla_executor.cc index 077e40fc2f..7850b8ccd2 100644 --- a/tensorflow_federated/cc/core/impl/executors/xla_executor.cc +++ b/tensorflow_federated/cc/core/impl/executors/xla_executor.cc @@ -33,16 +33,16 @@ limitations under the License #include "absl/types/span.h" #include "tensorflow/compiler/tf2xla/literal_util.h" #include "tensorflow/compiler/tf2xla/type_util.h" -#include "tensorflow/compiler/xla/client/client.h" -#include "tensorflow/compiler/xla/client/client_library.h" -#include "tensorflow/compiler/xla/client/global_data.h" -#include "tensorflow/compiler/xla/client/xla_computation.h" -#include "tensorflow/compiler/xla/literal.h" -#include "tensorflow/compiler/xla/service/hlo.pb.h" -#include "tensorflow/compiler/xla/shape.h" -#include "tensorflow/compiler/xla/stream_executor/platform.h" -#include "tensorflow/compiler/xla/xla.pb.h" -#include "tensorflow/compiler/xla/xla_data.pb.h" +#include "xla/client/client.h" +#include "xla/client/client_library.h" +#include "xla/client/global_data.h" +#include "xla/client/xla_computation.h" +#include "xla/literal.h" +#include "xla/service/hlo.pb.h" +#include "xla/shape.h" +#include "xla/stream_executor/platform.h" +#include "xla/xla.pb.h" +#include "xla/xla_data.pb.h" #include "tensorflow/core/framework/tensor.h" #include "tensorflow/core/framework/tensor.pb.h" #include "tensorflow/core/framework/tensor_shape.h" @@ -58,7 +58,7 @@ limitations under the License // clang-format off // In TF 2.17 MultiPlatformManager was renamed to PlatformManager. Remove // this code when the OSS build gets updated to TF 2.17+. -#include "tensorflow/compiler/xla/stream_executor/multi_platform_manager.h" +#include "xla/stream_executor/multi_platform_manager.h" namespace stream_executor { using PlatformManager = MultiPlatformManager; } // namespace stream_executor diff --git a/tensorflow_federated/cc/core/impl/executors/xla_executor_test.cc b/tensorflow_federated/cc/core/impl/executors/xla_executor_test.cc index 0530d24869..4cfecc3671 100644 --- a/tensorflow_federated/cc/core/impl/executors/xla_executor_test.cc +++ b/tensorflow_federated/cc/core/impl/executors/xla_executor_test.cc @@ -32,13 +32,13 @@ limitations under the License #include "absl/status/statusor.h" #include "tensorflow/compiler/tf2xla/shape_util.h" #include "tensorflow/compiler/tf2xla/type_util.h" -#include "tensorflow/compiler/xla/client/xla_builder.h" -#include "tensorflow/compiler/xla/client/xla_computation.h" -#include "tensorflow/compiler/xla/service/platform_util.h" -#include "tensorflow/compiler/xla/shape.h" -#include "tensorflow/compiler/xla/shape_util.h" -#include "tensorflow/compiler/xla/stream_executor/platform.h" -#include "tensorflow/compiler/xla/xla_data.pb.h" +#include "xla/client/xla_builder.h" +#include "xla/client/xla_computation.h" +#include "xla/service/platform_util.h" +#include "xla/shape.h" +#include "xla/shape_util.h" +#include "xla/stream_executor/platform.h" +#include "xla/xla_data.pb.h" #include "tensorflow/core/framework/tensor_shape.h" #include "tensorflow/core/framework/types.pb.h" #include "tensorflow/core/platform/statusor.h" diff --git a/tensorflow_federated/cc/core/impl/executors/xla_utils.cc b/tensorflow_federated/cc/core/impl/executors/xla_utils.cc index ab94b79db9..c421f72bb7 100644 --- a/tensorflow_federated/cc/core/impl/executors/xla_utils.cc +++ b/tensorflow_federated/cc/core/impl/executors/xla_utils.cc @@ -22,10 +22,10 @@ limitations under the License #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" -#include "tensorflow/compiler/xla/literal.h" -#include "tensorflow/compiler/xla/shape.h" -#include "tensorflow/compiler/xla/shape_util.h" -#include "tensorflow/compiler/xla/types.h" +#include "xla/literal.h" +#include "xla/shape.h" +#include "xla/shape_util.h" +#include "xla/types.h" #include "tensorflow_federated/cc/core/impl/executors/status_macros.h" #include "tensorflow_federated/proto/v0/array.pb.h" #include "tensorflow_federated/proto/v0/computation.pb.h" diff --git a/tensorflow_federated/cc/core/impl/executors/xla_utils.h b/tensorflow_federated/cc/core/impl/executors/xla_utils.h index 7a77b90059..80ea387a62 100644 --- a/tensorflow_federated/cc/core/impl/executors/xla_utils.h +++ b/tensorflow_federated/cc/core/impl/executors/xla_utils.h @@ -17,8 +17,8 @@ limitations under the License #define THIRD_PARTY_TENSORFLOW_FEDERATED_CC_CORE_IMPL_EXECUTORS_XLA_UTILS_H_ #include "absl/status/statusor.h" -#include "tensorflow/compiler/xla/literal.h" -#include "tensorflow/compiler/xla/shape.h" +#include "xla/literal.h" +#include "xla/shape.h" #include "tensorflow_federated/proto/v0/array.pb.h" #include "tensorflow_federated/proto/v0/computation.pb.h" #include "tensorflow_federated/proto/v0/data_type.pb.h" diff --git a/tensorflow_federated/cc/core/impl/executors/xla_utils_test.cc b/tensorflow_federated/cc/core/impl/executors/xla_utils_test.cc index bab406f0e8..98c3befc04 100644 --- a/tensorflow_federated/cc/core/impl/executors/xla_utils_test.cc +++ b/tensorflow_federated/cc/core/impl/executors/xla_utils_test.cc @@ -21,14 +21,14 @@ limitations under the License #include "googletest/include/gtest/gtest.h" #include "absl/status/status.h" #include "absl/status/statusor.h" -#include "third_party/eigen3/Eigen/Core" -#include "tensorflow/compiler/xla/literal.h" -#include "tensorflow/compiler/xla/literal_util.h" -#include "tensorflow/compiler/xla/primitive_util.h" -#include "tensorflow/compiler/xla/shape.h" -#include "tensorflow/compiler/xla/shape_util.h" -#include "tensorflow/compiler/xla/types.h" -#include "tensorflow/compiler/xla/xla_data.pb.h" +#include "Eigen/Core" +#include "xla/literal.h" +#include "xla/literal_util.h" +#include "xla/primitive_util.h" +#include "xla/shape.h" +#include "xla/shape_util.h" +#include "xla/types.h" +#include "xla/xla_data.pb.h" #include "tensorflow_federated/cc/core/impl/executors/array_shape_test_utils.h" #include "tensorflow_federated/cc/core/impl/executors/array_test_utils.h" #include "tensorflow_federated/cc/testing/status_matchers.h" diff --git a/third_party/tensorflow/internal_visibility.patch b/third_party/tensorflow/internal_visibility.patch index 7703001ef6..a1cea88be3 100644 --- a/third_party/tensorflow/internal_visibility.patch +++ b/third_party/tensorflow/internal_visibility.patch @@ -1,13 +1,13 @@ diff --git tensorflow/BUILD tensorflow/BUILD -index 202553cd531..171eb04665c 100644 +index 5018c6e642e..cf3a1ca0760 100644 --- tensorflow/BUILD +++ tensorflow/BUILD -@@ -1039,7 +1039,7 @@ package_group( +@@ -1057,7 +1057,7 @@ package_group( "//smartass/brain/configure/...", "//tensorflow/...", "//tensorflow_decision_forests/...", - "//tensorflow_federated/...", + "public", + "//tensorflow_models/google/recml/...", "//third_party/cloud_tpu/convergence_tools/sdc_monitoring/...", "//third_party/cloud_tpu/inference_converter/...", - "//third_party/py/cloud_ml_autoflow/...", diff --git a/third_party/tensorflow/python_toolchain.patch b/third_party/tensorflow/python_toolchain.patch index 4d732d447d..a2d60d1b4a 100644 --- a/third_party/tensorflow/python_toolchain.patch +++ b/third_party/tensorflow/python_toolchain.patch @@ -1,5 +1,5 @@ diff --git tensorflow/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl tensorflow/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl -index a2bdd6a7eed..ec25c23d8d4 100644 +index 9261a652f9c..0557e345ab1 100644 --- tensorflow/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl +++ tensorflow/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl @@ -2,7 +2,7 @@ @@ -24,23 +24,23 @@ index 9f71a414bf7..57f70752323 100644 load("//third_party/nccl:nccl_configure.bzl", "remote_nccl_configure") load("//third_party/gpus:rocm_configure.bzl", "remote_rocm_configure") diff --git tensorflow/workspace2.bzl tensorflow/workspace2.bzl -index 7e9faa558a4..5b18cb0969a 100644 +index 9e15c75c183..facc1de3d73 100644 --- tensorflow/workspace2.bzl +++ tensorflow/workspace2.bzl -@@ -8,7 +8,7 @@ load("//third_party/gpus:rocm_configure.bzl", "rocm_configure") - load("//third_party/tensorrt:tensorrt_configure.bzl", "tensorrt_configure") +@@ -37,7 +37,7 @@ load("//third_party/nasm:workspace.bzl", nasm = "repo") load("//third_party/nccl:nccl_configure.bzl", "nccl_configure") - load("//third_party/git:git_configure.bzl", "git_configure") + load("//third_party/opencl_headers:workspace.bzl", opencl_headers = "repo") + load("//third_party/pasta:workspace.bzl", pasta = "repo") -load("//third_party/py:python_configure.bzl", "python_configure") +load("//third_party/py/non_hermetic:python_configure.bzl", "python_configure") - load("//third_party/systemlibs:syslibs_configure.bzl", "syslibs_configure") - load("//tensorflow/tools/toolchains:cpus/aarch64/aarch64_compiler_configure.bzl", "aarch64_compiler_configure") - load("//tensorflow/tools/toolchains:cpus/arm/arm_compiler_configure.bzl", "arm_compiler_configure") + load("//third_party/py/ml_dtypes:workspace.bzl", ml_dtypes = "repo") + load("//third_party/pybind11_abseil:workspace.bzl", pybind11_abseil = "repo") + load("//third_party/pybind11_bazel:workspace.bzl", pybind11_bazel = "repo") diff --git third_party/py/non_hermetic/python_configure.bzl third_party/py/non_hermetic/python_configure.bzl -index 300cbfb6c71..09d98505dd9 100644 +index 89732c3e33d..4ac1c8f5c04 100644 --- third_party/py/non_hermetic/python_configure.bzl +++ third_party/py/non_hermetic/python_configure.bzl -@@ -206,7 +206,7 @@ def _create_local_python_repository(repository_ctx): +@@ -203,7 +203,7 @@ def _create_local_python_repository(repository_ctx): # Resolve all labels before doing any real work. Resolving causes the # function to be restarted with all previous state being lost. This # can easily lead to a O(n^2) runtime in the number of labels. @@ -72,3 +72,17 @@ index 97c7907fc38..c80cc5287bc 100644 ) genrule( +diff --git third_party/py/python_configure.bzl third_party/py/python_configure.bzl +index 3728a91b931..ecb0ecb60e8 100644 +--- third_party/py/python_configure.bzl ++++ third_party/py/python_configure.bzl +@@ -14,7 +14,7 @@ def _create_local_python_repository(repository_ctx): + # Resolve all labels before doing any real work. Resolving causes the + # function to be restarted with all previous state being lost. This + # can easily lead to a O(n^2) runtime in the number of labels. +- build_tpl = repository_ctx.path(Label("//third_party/py:BUILD.tpl")) ++ build_tpl = repository_ctx.path(Label("//third_party/py/non_hermetic:BUILD.tpl")) + platform_constraint = "" + if repository_ctx.attr.platform_constraint: + platform_constraint = "\"%s\"" % repository_ctx.attr.platform_constraint +(END) diff --git a/third_party/tensorflow/tf2xla_visibility.patch b/third_party/tensorflow/tf2xla_visibility.patch index 84b7cdcab3..51f6fdf219 100644 --- a/third_party/tensorflow/tf2xla_visibility.patch +++ b/third_party/tensorflow/tf2xla_visibility.patch @@ -1,8 +1,8 @@ diff --git tensorflow/compiler/tf2xla/BUILD tensorflow/compiler/tf2xla/BUILD -index 22d9877bed9..3f6b421465d 100644 +index c1a2243de20..f4e24260aea 100644 --- tensorflow/compiler/tf2xla/BUILD +++ tensorflow/compiler/tf2xla/BUILD -@@ -46,7 +46,7 @@ package_group( +@@ -47,7 +47,7 @@ package_group( packages = [ "//platforms/performance/automl/...", "//tensorflow/...",