From 576d1d395d01a24483a9ebf66ba704ba38043e63 Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Fri, 14 Aug 2020 13:32:24 -0700 Subject: [PATCH] Move bfloat16 header to tensorflow/core/platform. PiperOrigin-RevId: 326719878 Change-Id: Iecfa85626e8611b5fe521efdb47047904b970f7a --- .../saved_model/core/test_utils.cc | 2 +- tensorflow/c/kernels/histogram_summary_op.cc | 2 +- tensorflow/c/kernels/summary_op.cc | 2 +- .../mlir/tensorflow/utils/convert_tensor.cc | 2 +- tensorflow/compiler/mlir/xla/BUILD | 2 +- tensorflow/compiler/mlir/xla/hlo_utils.cc | 2 +- .../mlir/xla/transforms/legalize_tf.cc | 2 +- tensorflow/compiler/tests/randomized_tests.cc | 2 +- tensorflow/compiler/xla/bit_cast.h | 2 +- tensorflow/compiler/xla/client/lib/quantize.h | 2 +- tensorflow/compiler/xla/python/BUILD | 2 +- tensorflow/compiler/xla/python/bfloat16.cc | 2 +- tensorflow/compiler/xla/util.cc | 2 +- tensorflow/core/BUILD | 12 +----- tensorflow/core/framework/BUILD | 1 - tensorflow/core/framework/numeric_types.h | 1 - tensorflow/core/grappler/utils_test.cc | 2 +- tensorflow/core/kernels/check_numerics_op.cc | 2 +- tensorflow/core/kernels/cwise_ops_common.h | 2 +- .../core/kernels/data/dataset_test_base.cc | 2 +- tensorflow/core/kernels/debug_ops.h | 2 +- tensorflow/core/kernels/dequantize_op.cc | 2 +- .../kernels/ragged_tensor_to_tensor_op.cc | 2 +- tensorflow/core/kernels/softmax_op_gpu.cu.cc | 2 +- tensorflow/core/kernels/softplus_op.h | 2 +- .../kernels/sparse_tensor_dense_matmul_op.cc | 2 +- tensorflow/core/kernels/training_ops.cc | 2 +- tensorflow/core/kernels/unique_op.cc | 2 +- tensorflow/core/lib/bfloat16/BUILD | 41 +++++++++---------- tensorflow/core/lib/bfloat16/bfloat16.h | 9 +--- tensorflow/core/lib/random/BUILD | 1 - .../core/lib/random/random_distributions.h | 5 +-- tensorflow/core/platform/BUILD | 18 ++++++++ tensorflow/core/platform/bfloat16.h | 28 +++++++++++++ tensorflow/core/platform/types.h | 1 + .../core/util/tensor_bundle/tensor_bundle.cc | 2 +- 36 files changed, 98 insertions(+), 71 deletions(-) create mode 100644 tensorflow/core/platform/bfloat16.h diff --git a/tensorflow/c/experimental/saved_model/core/test_utils.cc b/tensorflow/c/experimental/saved_model/core/test_utils.cc index b803d129b90..d551919ea94 100644 --- a/tensorflow/c/experimental/saved_model/core/test_utils.cc +++ b/tensorflow/c/experimental/saved_model/core/test_utils.cc @@ -28,7 +28,7 @@ limitations under the License. #include "tensorflow/core/framework/tensor.h" #include "tensorflow/core/framework/types.h" #include "tensorflow/core/framework/types.pb.h" -#include "tensorflow/core/lib/bfloat16/bfloat16.h" +#include "tensorflow/core/platform/bfloat16.h" #include "tensorflow/core/platform/logging.h" #include "tensorflow/core/platform/test.h" #include "tensorflow/core/platform/types.h" diff --git a/tensorflow/c/kernels/histogram_summary_op.cc b/tensorflow/c/kernels/histogram_summary_op.cc index ada1bd3c630..5de52703f5d 100644 --- a/tensorflow/c/kernels/histogram_summary_op.cc +++ b/tensorflow/c/kernels/histogram_summary_op.cc @@ -20,8 +20,8 @@ limitations under the License. #include "tensorflow/core/framework/selective_registration.h" #include "tensorflow/core/framework/summary.pb.h" #include "tensorflow/core/framework/types.h" -#include "tensorflow/core/lib/bfloat16/bfloat16.h" #include "tensorflow/core/lib/histogram/histogram.h" +#include "tensorflow/core/platform/bfloat16.h" #include "tensorflow/core/platform/logging.h" #include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/protobuf.h" diff --git a/tensorflow/c/kernels/summary_op.cc b/tensorflow/c/kernels/summary_op.cc index bd528da4165..ac7eced0ae7 100644 --- a/tensorflow/c/kernels/summary_op.cc +++ b/tensorflow/c/kernels/summary_op.cc @@ -25,7 +25,7 @@ limitations under the License. #include "tensorflow/core/framework/selective_registration.h" #include "tensorflow/core/framework/summary.pb.h" #include "tensorflow/core/framework/types.h" -#include "tensorflow/core/lib/bfloat16/bfloat16.h" +#include "tensorflow/core/platform/bfloat16.h" #include "tensorflow/core/platform/logging.h" #include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/protobuf.h" diff --git a/tensorflow/compiler/mlir/tensorflow/utils/convert_tensor.cc b/tensorflow/compiler/mlir/tensorflow/utils/convert_tensor.cc index 359314a64b0..270ef2d56f9 100644 --- a/tensorflow/compiler/mlir/tensorflow/utils/convert_tensor.cc +++ b/tensorflow/compiler/mlir/tensorflow/utils/convert_tensor.cc @@ -36,8 +36,8 @@ limitations under the License. #include "tensorflow/core/framework/tensor.pb.h" #include "tensorflow/core/framework/tensor_shape.pb.h" #include "tensorflow/core/framework/types.pb.h" -#include "tensorflow/core/lib/bfloat16/bfloat16.h" #include "tensorflow/core/lib/core/errors.h" +#include "tensorflow/core/platform/bfloat16.h" #include "tensorflow/core/platform/errors.h" #include "tensorflow/core/platform/protobuf.h" #include "tensorflow/core/platform/tstring.h" diff --git a/tensorflow/compiler/mlir/xla/BUILD b/tensorflow/compiler/mlir/xla/BUILD index 71e18af498b..4ce6847c04d 100644 --- a/tensorflow/compiler/mlir/xla/BUILD +++ b/tensorflow/compiler/mlir/xla/BUILD @@ -69,7 +69,7 @@ cc_library( "//tensorflow/compiler/xla/client/lib:conv_grad_size_util", "//tensorflow/core:framework", "//tensorflow/core/kernels:conv_grad_shape_utils", - "//tensorflow/core/lib/bfloat16", + "//tensorflow/core/platform:bfloat16", "@llvm-project//llvm:Support", "@llvm-project//mlir:Analysis", "@llvm-project//mlir:Dialect", diff --git a/tensorflow/compiler/mlir/xla/hlo_utils.cc b/tensorflow/compiler/mlir/xla/hlo_utils.cc index 18b4265d786..b9d563a659d 100644 --- a/tensorflow/compiler/mlir/xla/hlo_utils.cc +++ b/tensorflow/compiler/mlir/xla/hlo_utils.cc @@ -22,7 +22,7 @@ limitations under the License. #include "mlir/IR/StandardTypes.h" // from @llvm-project #include "mlir/IR/TypeUtilities.h" // from @llvm-project #include "tensorflow/compiler/xla/literal.h" -#include "tensorflow/core/lib/bfloat16/bfloat16.h" +#include "tensorflow/core/platform/bfloat16.h" #include "tensorflow/core/platform/logging.h" namespace xla { diff --git a/tensorflow/compiler/mlir/xla/transforms/legalize_tf.cc b/tensorflow/compiler/mlir/xla/transforms/legalize_tf.cc index 5fe933ee635..878feb85f75 100644 --- a/tensorflow/compiler/mlir/xla/transforms/legalize_tf.cc +++ b/tensorflow/compiler/mlir/xla/transforms/legalize_tf.cc @@ -57,7 +57,7 @@ limitations under the License. #include "tensorflow/compiler/xla/xla_data.pb.h" #include "tensorflow/core/framework/kernel_shape_util.h" #include "tensorflow/core/kernels/conv_grad_shape_utils.h" -#include "tensorflow/core/lib/bfloat16/bfloat16.h" +#include "tensorflow/core/platform/bfloat16.h" #include "tensorflow/core/util/padding.h" #include "tensorflow/core/util/tensor_format.h" diff --git a/tensorflow/compiler/tests/randomized_tests.cc b/tensorflow/compiler/tests/randomized_tests.cc index 9f963110cf3..0f19affc8e3 100644 --- a/tensorflow/compiler/tests/randomized_tests.cc +++ b/tensorflow/compiler/tests/randomized_tests.cc @@ -63,9 +63,9 @@ limitations under the License. #include "tensorflow/core/framework/tensor_testutil.h" #include "tensorflow/core/framework/types.pb.h" #include "tensorflow/core/graph/graph.h" -#include "tensorflow/core/lib/bfloat16/bfloat16.h" #include "tensorflow/core/lib/core/status.h" #include "tensorflow/core/lib/core/status_test_util.h" +#include "tensorflow/core/platform/bfloat16.h" #include "tensorflow/core/platform/test.h" #include "tensorflow/core/public/session.h" #include "tensorflow/core/public/session_options.h" diff --git a/tensorflow/compiler/xla/bit_cast.h b/tensorflow/compiler/xla/bit_cast.h index 90e9a5c25dd..feb548c9433 100644 --- a/tensorflow/compiler/xla/bit_cast.h +++ b/tensorflow/compiler/xla/bit_cast.h @@ -29,7 +29,7 @@ limitations under the License. #include "absl/base/casts.h" #include "third_party/eigen3/Eigen/Core" #include "tensorflow/compiler/xla/types.h" -#include "tensorflow/core/lib/bfloat16/bfloat16.h" +#include "tensorflow/core/platform/bfloat16.h" #include "tensorflow/core/platform/types.h" namespace xla { diff --git a/tensorflow/compiler/xla/client/lib/quantize.h b/tensorflow/compiler/xla/client/lib/quantize.h index 26dbbd5b00b..320dfcbf062 100644 --- a/tensorflow/compiler/xla/client/lib/quantize.h +++ b/tensorflow/compiler/xla/client/lib/quantize.h @@ -25,7 +25,7 @@ limitations under the License. #include "tensorflow/compiler/xla/types.h" #include "tensorflow/compiler/xla/util.h" #include "tensorflow/compiler/xla/xla_data.pb.h" -#include "tensorflow/core/lib/bfloat16/bfloat16.h" +#include "tensorflow/core/platform/bfloat16.h" namespace xla { diff --git a/tensorflow/compiler/xla/python/BUILD b/tensorflow/compiler/xla/python/BUILD index 179538c94c9..046fadb405b 100644 --- a/tensorflow/compiler/xla/python/BUILD +++ b/tensorflow/compiler/xla/python/BUILD @@ -155,7 +155,7 @@ cc_library( "//tensorflow/compiler/xla:statusor", "//tensorflow/compiler/xla:types", "//tensorflow/compiler/xla:util", - "//tensorflow/core/lib/bfloat16", + "//tensorflow/core/platform:bfloat16", "//tensorflow/core/platform:logging", "//third_party/py/numpy:headers", "//third_party/python_runtime:headers", # buildcleaner: keep diff --git a/tensorflow/compiler/xla/python/bfloat16.cc b/tensorflow/compiler/xla/python/bfloat16.cc index 1f21b3fb242..b70244cc3ef 100644 --- a/tensorflow/compiler/xla/python/bfloat16.cc +++ b/tensorflow/compiler/xla/python/bfloat16.cc @@ -27,7 +27,7 @@ limitations under the License. #include "absl/strings/str_cat.h" #include "tensorflow/compiler/xla/types.h" #include "tensorflow/compiler/xla/util.h" -#include "tensorflow/core/lib/bfloat16/bfloat16.h" +#include "tensorflow/core/platform/bfloat16.h" #include "tensorflow/core/platform/logging.h" namespace xla { diff --git a/tensorflow/compiler/xla/util.cc b/tensorflow/compiler/xla/util.cc index 1fbce96625b..4034e5fdd27 100644 --- a/tensorflow/compiler/xla/util.cc +++ b/tensorflow/compiler/xla/util.cc @@ -31,10 +31,10 @@ limitations under the License. #include "absl/strings/str_split.h" #include "absl/types/optional.h" #include "tensorflow/compiler/xla/types.h" -#include "tensorflow/core/lib/bfloat16/bfloat16.h" #include "tensorflow/core/lib/core/errors.h" #include "tensorflow/core/lib/math/math_util.h" #include "tensorflow/core/lib/strings/numbers.h" +#include "tensorflow/core/platform/bfloat16.h" #include "tensorflow/core/platform/env.h" #include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/numbers.h" diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD index b9fe544783c..0cd0ea147b5 100644 --- a/tensorflow/core/BUILD +++ b/tensorflow/core/BUILD @@ -318,7 +318,6 @@ alias( cc_library( name = "lib_proto_parsing", hdrs = [ - "//tensorflow/core/lib/bfloat16:bfloat16.h", "//tensorflow/core/lib/core:legacy_lib_proto_parsing_headers", "//tensorflow/core/lib/strings:legacy_lib_proto_parsing_headers", "//tensorflow/core/platform:lib_proto_parsing_hdrs", @@ -328,7 +327,6 @@ cc_library( ":platform_base", "@com_google_absl//absl/strings", "@double_conversion//:double-conversion", - "//tensorflow/core/lib/bfloat16", "//tensorflow/core/lib/core:errors", "//tensorflow/core/lib/core:stringpiece", "//tensorflow/core/lib/core:status", @@ -353,6 +351,7 @@ cc_library( cc_library( name = "lib", hdrs = [ + # TODO(rmlarsen): Remove bfloat16.h once dependency in third_party/swift is updated. "//tensorflow/core/lib/bfloat16:bfloat16.h", "//tensorflow/core/lib/core:legacy_lib_core_headers", "//tensorflow/core/lib/gtl:legacy_lib_gtl_headers", @@ -582,7 +581,6 @@ cc_library( "//tensorflow/core/framework:numeric_types.h", "//tensorflow/core/framework:tensor_types.h", "//tensorflow/core/framework:type_traits.h", - "//tensorflow/core/lib/bfloat16:bfloat16.h", "//tensorflow/core/platform:framework_lite_hdrs", "//tensorflow/core/platform/default:integral_types.h", "//tensorflow/core/platform/default:logging.h", @@ -593,7 +591,6 @@ cc_library( "@nsync//:nsync_cpp", ] + [ "//third_party/eigen3", - "//tensorflow/core/lib/bfloat16", "//tensorflow/core/platform:dynamic_annotations", "//tensorflow/core/platform:platform_port", "//tensorflow/core/platform:thread_annotations", @@ -1258,7 +1255,6 @@ filegroup( "//tensorflow/core/example:mobile_srcs_no_runtime", "//tensorflow/core/framework:attr_value_proto_text_srcs", "//tensorflow/core/framework:mobile_srcs_no_runtime", - "//tensorflow/core/lib/bfloat16:mobile_srcs_no_runtime", "//tensorflow/core/lib/core:mobile_srcs_no_runtime", "//tensorflow/core/lib/gtl:mobile_srcs_no_runtime", "//tensorflow/core/lib/hash:mobile_srcs_no_runtime", @@ -1696,7 +1692,6 @@ filegroup( "//tensorflow/core/framework:resource_handle.h", "//tensorflow/core/platform:legacy_lib_internal_headers", "//tensorflow/core/platform:lib_internal_private_hdrs", - "//tensorflow/core/lib/bfloat16:bfloat16.h", "//tensorflow/core/lib/core:legacy_lib_core_all_headers", "//tensorflow/core/lib/gtl:legacy_lib_gtl_all_headers", "//tensorflow/core/lib/histogram:legacy_lib_histogram_all_headers", @@ -1813,7 +1808,6 @@ cc_library( "@com_google_absl//absl/memory", "@com_google_absl//absl/strings", "//third_party/eigen3", - "//tensorflow/core/lib/bfloat16", "//tensorflow/core/lib/core:arena", "//tensorflow/core/lib/core:bitmap", "//tensorflow/core/lib/core:blocking_counter", @@ -1894,6 +1888,7 @@ cc_library( "//tensorflow/core/lib/strings:strcat", "//tensorflow/core/lib/strings:stringprintf", "//tensorflow/core/platform:abi", + "//tensorflow/core/platform:bfloat16", "//tensorflow/core/platform:base64", "//tensorflow/core/platform:blocking_counter", "//tensorflow/core/platform:casts", @@ -2021,7 +2016,6 @@ alias( cc_library( name = "tflite_portable_logging", hdrs = [ - "//tensorflow/core/lib/bfloat16:bfloat16.h", "//tensorflow/core/platform:tflite_portable_logging_hdrs", "//tensorflow/core/platform/default:integral_types.h", "//tensorflow/core/platform/default:logging.h", @@ -2051,7 +2045,6 @@ cc_library( hdrs = [ "lib/jpeg/jpeg_handle.h", "lib/jpeg/jpeg_mem.h", - "//tensorflow/core/lib/bfloat16:bfloat16.h", "//tensorflow/core/lib/core:legacy_lib_core_stringpiece_header", "//tensorflow/core/platform:jpeg_internal_hdrs", "//tensorflow/core/platform/default:integral_types.h", @@ -2078,7 +2071,6 @@ cc_library( ]), hdrs = [ "lib/gif/gif_io.h", - "//tensorflow/core/lib/bfloat16:bfloat16.h", "//tensorflow/core/lib/core:legacy_lib_core_stringpiece_header", "//tensorflow/core/lib/gtl:legacy_android_gif_internal_headers", "//tensorflow/core/platform:gif_internal_hdrs", diff --git a/tensorflow/core/framework/BUILD b/tensorflow/core/framework/BUILD index 1842b04e4f0..c60a44e0cc2 100644 --- a/tensorflow/core/framework/BUILD +++ b/tensorflow/core/framework/BUILD @@ -614,7 +614,6 @@ cc_library( "//tensorflow/core:__subpackages__", ], deps = [ - "//tensorflow/core/lib/bfloat16", "//tensorflow/core/platform:types", "//third_party/eigen3", ], diff --git a/tensorflow/core/framework/numeric_types.h b/tensorflow/core/framework/numeric_types.h index 10313eb8feb..cef2f562515 100644 --- a/tensorflow/core/framework/numeric_types.h +++ b/tensorflow/core/framework/numeric_types.h @@ -24,7 +24,6 @@ limitations under the License. #include "third_party/eigen3/unsupported/Eigen/CXX11/FixedPoint" // clang-format on -#include "tensorflow/core/lib/bfloat16/bfloat16.h" #include "tensorflow/core/platform/types.h" namespace tensorflow { diff --git a/tensorflow/core/grappler/utils_test.cc b/tensorflow/core/grappler/utils_test.cc index 31444735b20..fd3f8ee89f5 100644 --- a/tensorflow/core/grappler/utils_test.cc +++ b/tensorflow/core/grappler/utils_test.cc @@ -26,10 +26,10 @@ limitations under the License. #include "tensorflow/core/framework/tensor_testutil.h" #include "tensorflow/core/graph/benchmark_testlib.h" #include "tensorflow/core/grappler/grappler_item.h" -#include "tensorflow/core/lib/bfloat16/bfloat16.h" #include "tensorflow/core/lib/core/status.h" #include "tensorflow/core/lib/core/status_test_util.h" #include "tensorflow/core/lib/core/threadpool.h" +#include "tensorflow/core/platform/bfloat16.h" #include "tensorflow/core/platform/env.h" #include "tensorflow/core/platform/notification.h" #include "tensorflow/core/platform/test.h" diff --git a/tensorflow/core/kernels/check_numerics_op.cc b/tensorflow/core/kernels/check_numerics_op.cc index 6922158413d..994f27ffe8e 100644 --- a/tensorflow/core/kernels/check_numerics_op.cc +++ b/tensorflow/core/kernels/check_numerics_op.cc @@ -16,7 +16,7 @@ limitations under the License. // See docs in ../ops/array_ops.cc. // clang-format off -#include "tensorflow/core/lib/bfloat16/bfloat16.h" +#include "tensorflow/core/platform/bfloat16.h" #include // NOLINT #include // NOLINT diff --git a/tensorflow/core/kernels/cwise_ops_common.h b/tensorflow/core/kernels/cwise_ops_common.h index c0aee43d268..9920da3f163 100644 --- a/tensorflow/core/kernels/cwise_ops_common.h +++ b/tensorflow/core/kernels/cwise_ops_common.h @@ -22,7 +22,7 @@ limitations under the License. #define EIGEN_USE_THREADS -#include "tensorflow/core/lib/bfloat16/bfloat16.h" +#include "tensorflow/core/platform/bfloat16.h" #ifdef TENSORFLOW_USE_SYCL #include "tensorflow/core/kernels/cwise_ops_sycl_common.h" diff --git a/tensorflow/core/kernels/data/dataset_test_base.cc b/tensorflow/core/kernels/data/dataset_test_base.cc index e41e35be1e9..14af07fe494 100644 --- a/tensorflow/core/kernels/data/dataset_test_base.cc +++ b/tensorflow/core/kernels/data/dataset_test_base.cc @@ -64,12 +64,12 @@ limitations under the License. #include "tensorflow/core/kernels/data/range_dataset_op.h" #include "tensorflow/core/kernels/data/take_dataset_op.h" #include "tensorflow/core/kernels/data/tensor_slice_dataset_op.h" -#include "tensorflow/core/lib/bfloat16/bfloat16.h" #include "tensorflow/core/lib/core/status_test_util.h" #include "tensorflow/core/lib/gtl/inlined_vector.h" #include "tensorflow/core/lib/io/record_writer.h" #include "tensorflow/core/lib/io/zlib_compression_options.h" #include "tensorflow/core/lib/io/zlib_outputbuffer.h" +#include "tensorflow/core/platform/bfloat16.h" #include "tensorflow/core/platform/env.h" #include "tensorflow/core/platform/errors.h" #include "tensorflow/core/platform/file_system.h" diff --git a/tensorflow/core/kernels/debug_ops.h b/tensorflow/core/kernels/debug_ops.h index 498cd6146a8..0b256a062c2 100644 --- a/tensorflow/core/kernels/debug_ops.h +++ b/tensorflow/core/kernels/debug_ops.h @@ -18,7 +18,7 @@ limitations under the License. #include -#include "tensorflow/core/lib/bfloat16/bfloat16.h" +#include "tensorflow/core/platform/bfloat16.h" #if GOOGLE_CUDA || TENSORFLOW_USE_ROCM #include "tensorflow/core/common_runtime/gpu/gpu_event_mgr.h" diff --git a/tensorflow/core/kernels/dequantize_op.cc b/tensorflow/core/kernels/dequantize_op.cc index 3b38daf0067..5393a677db2 100644 --- a/tensorflow/core/kernels/dequantize_op.cc +++ b/tensorflow/core/kernels/dequantize_op.cc @@ -23,8 +23,8 @@ limitations under the License. #include "tensorflow/core/framework/types.h" #include "tensorflow/core/kernels/meta_support.h" #include "tensorflow/core/kernels/quantization_utils.h" -#include "tensorflow/core/lib/bfloat16/bfloat16.h" #include "tensorflow/core/lib/core/errors.h" +#include "tensorflow/core/platform/bfloat16.h" namespace { enum { diff --git a/tensorflow/core/kernels/ragged_tensor_to_tensor_op.cc b/tensorflow/core/kernels/ragged_tensor_to_tensor_op.cc index 88931292ef2..28898c65ca7 100644 --- a/tensorflow/core/kernels/ragged_tensor_to_tensor_op.cc +++ b/tensorflow/core/kernels/ragged_tensor_to_tensor_op.cc @@ -34,9 +34,9 @@ limitations under the License. #include "tensorflow/core/framework/types.h" #include "tensorflow/core/kernels/broadcast_to_op.h" #include "tensorflow/core/kernels/list_kernels.h" -#include "tensorflow/core/lib/bfloat16/bfloat16.h" #include "tensorflow/core/lib/core/errors.h" #include "tensorflow/core/lib/core/status.h" +#include "tensorflow/core/platform/bfloat16.h" #include "tensorflow/core/platform/types.h" #include "tensorflow/core/util/bcast.h" #include "tensorflow/core/util/ragged_to_dense_util.h" diff --git a/tensorflow/core/kernels/softmax_op_gpu.cu.cc b/tensorflow/core/kernels/softmax_op_gpu.cu.cc index 3cf357713e9..160cf4f4b24 100644 --- a/tensorflow/core/kernels/softmax_op_gpu.cu.cc +++ b/tensorflow/core/kernels/softmax_op_gpu.cu.cc @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/core/lib/strings/str_util.h" #if GOOGLE_CUDA || TENSORFLOW_USE_ROCM #define EIGEN_USE_GPU @@ -27,6 +26,7 @@ limitations under the License. #include "tensorflow/core/kernels/gpu_prim.h" #include "tensorflow/core/kernels/reduction_gpu_kernels.cu.h" #include "tensorflow/core/kernels/reduction_ops_common.h" +#include "tensorflow/core/lib/strings/str_util.h" #include "tensorflow/core/platform/types.h" #include "tensorflow/core/util/gpu_kernel_helper.h" diff --git a/tensorflow/core/kernels/softplus_op.h b/tensorflow/core/kernels/softplus_op.h index 0e4de9cdeb1..b7f601072d2 100644 --- a/tensorflow/core/kernels/softplus_op.h +++ b/tensorflow/core/kernels/softplus_op.h @@ -19,7 +19,7 @@ limitations under the License. // nvcc. // clang-format off -#include "tensorflow/core/lib/bfloat16/bfloat16.h" +#include "tensorflow/core/platform/bfloat16.h" #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor" // clang-format on #include "tensorflow/core/framework/tensor_types.h" diff --git a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.cc b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.cc index 9baaa6edb7b..791ac1bac0d 100644 --- a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.cc +++ b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.cc @@ -23,7 +23,7 @@ limitations under the License. #include "tensorflow/core/framework/op.h" #include "tensorflow/core/framework/op_kernel.h" #include "tensorflow/core/kernels/fill_functor.h" -#include "tensorflow/core/lib/bfloat16/bfloat16.h" +#include "tensorflow/core/platform/bfloat16.h" namespace tensorflow { diff --git a/tensorflow/core/kernels/training_ops.cc b/tensorflow/core/kernels/training_ops.cc index 5948121e8a3..557e73e2290 100644 --- a/tensorflow/core/kernels/training_ops.cc +++ b/tensorflow/core/kernels/training_ops.cc @@ -23,8 +23,8 @@ limitations under the License. #include "tensorflow/core/framework/register_types.h" #include "tensorflow/core/kernels/training_op_helpers.h" #include "tensorflow/core/kernels/variable_ops.h" -#include "tensorflow/core/lib/bfloat16/bfloat16.h" #include "tensorflow/core/lib/core/errors.h" +#include "tensorflow/core/platform/bfloat16.h" #include "tensorflow/core/util/util.h" #ifdef TENSORFLOW_USE_SYCL diff --git a/tensorflow/core/kernels/unique_op.cc b/tensorflow/core/kernels/unique_op.cc index 8316018294b..20dccdc0627 100644 --- a/tensorflow/core/kernels/unique_op.cc +++ b/tensorflow/core/kernels/unique_op.cc @@ -23,9 +23,9 @@ limitations under the License. #include "tensorflow/core/framework/register_types.h" #include "tensorflow/core/framework/tensor.h" #include "tensorflow/core/framework/tensor_shape.h" -#include "tensorflow/core/lib/bfloat16/bfloat16.h" #include "tensorflow/core/lib/core/status.h" #include "tensorflow/core/lib/hash/hash.h" +#include "tensorflow/core/platform/bfloat16.h" namespace tensorflow { namespace { diff --git a/tensorflow/core/lib/bfloat16/BUILD b/tensorflow/core/lib/bfloat16/BUILD index d8213933358..00f0ff03cfc 100644 --- a/tensorflow/core/lib/bfloat16/BUILD +++ b/tensorflow/core/lib/bfloat16/BUILD @@ -1,7 +1,7 @@ -load( - "//tensorflow/core/platform:rules_cc.bzl", - "cc_library", -) +# load( +# "//tensorflow/core/platform:rules_cc.bzl", +# "cc_library", +# ) package( default_visibility = [ @@ -10,24 +10,23 @@ package( licenses = ["notice"], # Apache 2.0 ) -cc_library( - name = "bfloat16", - hdrs = ["bfloat16.h"], - deps = [ - "//tensorflow/core/platform:byte_order", - "//third_party/eigen3", - ], -) +# cc_library( +# name = "bfloat16", +# hdrs = ["bfloat16.h"], +# deps = [ +# "//third_party/eigen3", +# "//tensorflow/core/platform:byte_order", +# ], +# ) -# Export source files needed for mobile builds, which do not use granular targets. -filegroup( - name = "mobile_srcs_no_runtime", - srcs = [ - "bfloat16.h", - ], -) +# # Export source files needed for mobile builds, which do not use granular targets. +# filegroup( +# name = "mobile_srcs_no_runtime", +# srcs = [ +# "bfloat16.h", +# ], +# ) -# TODO(bmzhao): Remove the following once references in core/BUILD is removed. exports_files( - glob(["*"]), + ["bfloat16.h"], ) diff --git a/tensorflow/core/lib/bfloat16/bfloat16.h b/tensorflow/core/lib/bfloat16/bfloat16.h index 5f82c0ffd5f..d6ac77b6750 100644 --- a/tensorflow/core/lib/bfloat16/bfloat16.h +++ b/tensorflow/core/lib/bfloat16/bfloat16.h @@ -16,13 +16,6 @@ limitations under the License. #ifndef TENSORFLOW_CORE_LIB_BFLOAT16_BFLOAT16_H_ #define TENSORFLOW_CORE_LIB_BFLOAT16_BFLOAT16_H_ -// clang-format off -#include "tensorflow/core/platform/byte_order.h" -#include "third_party/eigen3/Eigen/Core" -// clang-format on - -namespace tensorflow { -typedef Eigen::bfloat16 bfloat16; -} // end namespace tensorflow +#include "tensorflow/core/platform/bfloat16.h" #endif // TENSORFLOW_CORE_LIB_BFLOAT16_BFLOAT16_H_ diff --git a/tensorflow/core/lib/random/BUILD b/tensorflow/core/lib/random/BUILD index 1487a813149..88d2f0280f1 100644 --- a/tensorflow/core/lib/random/BUILD +++ b/tensorflow/core/lib/random/BUILD @@ -40,7 +40,6 @@ cc_library( deps = [ ":exact_uniform_int", ":philox_random", - "//tensorflow/core/lib/bfloat16", "//tensorflow/core/lib/gtl:array_slice", "//tensorflow/core/platform:logging", "//tensorflow/core/platform:macros", diff --git a/tensorflow/core/lib/random/random_distributions.h b/tensorflow/core/lib/random/random_distributions.h index 386f13347d7..4dc2c7fee12 100644 --- a/tensorflow/core/lib/random/random_distributions.h +++ b/tensorflow/core/lib/random/random_distributions.h @@ -18,14 +18,13 @@ limitations under the License. #include -#include - #include +#include #include #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor" -#include "tensorflow/core/lib/bfloat16/bfloat16.h" #include "tensorflow/core/lib/random/philox_random.h" +#include "tensorflow/core/platform/types.h" namespace tensorflow { namespace random { diff --git a/tensorflow/core/platform/BUILD b/tensorflow/core/platform/BUILD index a889666c608..5d6f74fb1a3 100644 --- a/tensorflow/core/platform/BUILD +++ b/tensorflow/core/platform/BUILD @@ -68,6 +68,7 @@ exports_files( "cpu_info.cc", "cpu_info.h", "cuda_libdevice_path.h", + "bfloat16.h", "demangle.h", "env.cc", "env.h", @@ -123,6 +124,15 @@ cc_library( ], ) +cc_library( + name = "bfloat16", + hdrs = ["bfloat16.h"], + deps = [ + ":byte_order", + "//third_party/eigen3", + ], +) + cc_library( name = "blocking_counter", hdrs = ["blocking_counter.h"], @@ -786,6 +796,7 @@ cc_library( ], deps = [ ":platform", + ":bfloat16", ":tstring", ] + tf_platform_deps("types"), ) @@ -1322,6 +1333,7 @@ filegroup( srcs = [ "abi.h", "base64.h", + "bfloat16.h", "casts.h", "coding.h", "context.h", @@ -1408,6 +1420,7 @@ filegroup( filegroup( name = "framework_lite_hdrs", srcs = [ + "bfloat16.h", "byte_order.h", "cpu_info.h", "ctstring.h", @@ -1428,6 +1441,7 @@ filegroup( filegroup( name = "lib_internal_private_hdrs", srcs = [ + "bfloat16.h", "raw_coding.h", "scanner.h", "str_util.h", @@ -1473,6 +1487,7 @@ filegroup( filegroup( name = "tflite_portable_logging_hdrs", srcs = [ + "bfloat16.h", "ctstring.h", "ctstring_internal.h", "logging.h", @@ -1487,6 +1502,7 @@ filegroup( filegroup( name = "jpeg_internal_hdrs", srcs = [ + "bfloat16.h", "ctstring.h", "ctstring_internal.h", "dynamic_annotations.h", @@ -1504,6 +1520,7 @@ filegroup( filegroup( name = "gif_internal_hdrs", srcs = [ + "bfloat16.h", "ctstring.h", "ctstring_internal.h", "dynamic_annotations.h", @@ -1523,6 +1540,7 @@ filegroup( srcs = [ "abi.cc", "abi.h", + "bfloat16.h", "blocking_counter.h", "byte_order.h", "casts.h", diff --git a/tensorflow/core/platform/bfloat16.h b/tensorflow/core/platform/bfloat16.h new file mode 100644 index 00000000000..3e3ab2ce55a --- /dev/null +++ b/tensorflow/core/platform/bfloat16.h @@ -0,0 +1,28 @@ +/* Copyright 2020 The TensorFlow Authors. All Rights Reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +==============================================================================*/ + +#ifndef TENSORFLOW_CORE_PLATFORM_BFLOAT16_BFLOAT16_H_ +#define TENSORFLOW_CORE_PLATFORM_BFLOAT16_BFLOAT16_H_ + +// clang-format off +#include "tensorflow/core/platform/byte_order.h" +#include "third_party/eigen3/Eigen/Core" +// clang-format on + +namespace tensorflow { +typedef Eigen::bfloat16 bfloat16; +} // end namespace tensorflow + +#endif // TENSORFLOW_CORE_LIB_BFLOAT16_BFLOAT16_H_ diff --git a/tensorflow/core/platform/types.h b/tensorflow/core/platform/types.h index b2fefcaa960..e7539c411dd 100644 --- a/tensorflow/core/platform/types.h +++ b/tensorflow/core/platform/types.h @@ -18,6 +18,7 @@ limitations under the License. #include +#include "tensorflow/core/platform/bfloat16.h" #include "tensorflow/core/platform/platform.h" #include "tensorflow/core/platform/tstring.h" diff --git a/tensorflow/core/util/tensor_bundle/tensor_bundle.cc b/tensorflow/core/util/tensor_bundle/tensor_bundle.cc index bb18000fcfe..c5aa2f1e8c9 100644 --- a/tensorflow/core/util/tensor_bundle/tensor_bundle.cc +++ b/tensorflow/core/util/tensor_bundle/tensor_bundle.cc @@ -31,7 +31,6 @@ limitations under the License. #include "tensorflow/core/framework/variant_tensor_data.h" #include "tensorflow/core/framework/versions.h" #include "tensorflow/core/framework/versions.pb.h" -#include "tensorflow/core/lib/bfloat16/bfloat16.h" #include "tensorflow/core/lib/core/coding.h" #include "tensorflow/core/lib/core/errors.h" #include "tensorflow/core/lib/gtl/map_util.h" @@ -41,6 +40,7 @@ limitations under the License. #include "tensorflow/core/lib/random/random.h" #include "tensorflow/core/lib/strings/str_util.h" #include "tensorflow/core/lib/strings/stringprintf.h" +#include "tensorflow/core/platform/bfloat16.h" #include "tensorflow/core/platform/errors.h" #include "tensorflow/core/util/env_var.h" #include "tensorflow/core/util/saved_tensor_slice_util.h"