From 1a227becf9572919da06315b29387780526aa689 Mon Sep 17 00:00:00 2001 From: David Dunleavy Date: Wed, 29 Jan 2025 17:42:58 -0800 Subject: [PATCH] Update users of TSL headers and targets to new location in XLA Updating: - `env.h` - `env_time.h` - `errors.h` - `file_statistics.h` - `file_system.h` - `file_system_helper.h` - `logging.h` - `macros.h` - `status.h` - `status_matchers.h` - `status_to_from_proto.h` - `statusor.h` - `test.h` - `test_benchmark.h` - `threadpool.h` - `threadpool_async_executor.h` - `threadpool_interface.h` - `threadpool_options.h` - `types.h` and associated targets. PiperOrigin-RevId: 721174688 --- tensorflow/core/kernels/data/BUILD | 12 ++++++------ tensorflow/core/kernels/data/batch_dataset_op.cc | 2 +- .../core/kernels/data/concatenate_dataset_op.cc | 4 ++-- tensorflow/core/kernels/data/flat_map_dataset_op.cc | 4 ++-- .../core/kernels/data/interleave_dataset_op.cc | 2 +- tensorflow/core/kernels/data/iterator_ops.cc | 2 +- .../core/kernels/data/parallel_map_dataset_op.cc | 2 +- tensorflow/core/kernels/data/range_dataset_op.cc | 2 +- tensorflow/core/kernels/data/repeat_dataset_op.cc | 4 ++-- tensorflow/core/kernels/data/shard_dataset_op.cc | 2 +- tensorflow/core/kernels/data/skip_dataset_op.cc | 4 ++-- .../core/kernels/data/tf_record_dataset_op_test.cc | 4 ++-- tensorflow/core/kernels/data/window_dataset.cc | 2 +- tensorflow/core/kernels/data/window_dataset_op.cc | 2 +- tensorflow/core/kernels/data/zip_dataset_op.cc | 6 +++--- 15 files changed, 27 insertions(+), 27 deletions(-) diff --git a/tensorflow/core/kernels/data/BUILD b/tensorflow/core/kernels/data/BUILD index 6a19a8fee82cda..9543ce3e7c6ea3 100644 --- a/tensorflow/core/kernels/data/BUILD +++ b/tensorflow/core/kernels/data/BUILD @@ -302,8 +302,8 @@ tf_kernel_library( "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", - "@local_tsl//tsl/platform:logging", "@local_tsl//tsl/platform:thread_annotations", + "@local_xla//xla/tsl/platform:logging", ], ) @@ -861,7 +861,7 @@ tf_kernel_library( "@com_google_absl//absl/base", "@com_google_absl//absl/status", "@com_google_absl//absl/strings:str_format", - "@local_tsl//tsl/platform:logging", + "@local_xla//xla/tsl/platform:logging", ], ) @@ -1034,7 +1034,7 @@ tf_kernel_library( "@com_google_absl//absl/memory", "@com_google_absl//absl/status", "@local_tsl//tsl/platform:mutex", - "@local_tsl//tsl/platform:types", + "@local_xla//xla/tsl/platform:types", ], ) @@ -1106,8 +1106,8 @@ tf_kernel_library( "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", - "@local_tsl//tsl/platform:errors", "@local_tsl//tsl/platform:thread_annotations", + "@local_xla//xla/tsl/platform:errors", ], ) @@ -1257,8 +1257,8 @@ tf_kernel_library( "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", - "@local_tsl//tsl/platform:errors", - "@local_tsl//tsl/platform:statusor", + "@local_xla//xla/tsl/platform:errors", + "@local_xla//xla/tsl/platform:statusor", ], ) diff --git a/tensorflow/core/kernels/data/batch_dataset_op.cc b/tensorflow/core/kernels/data/batch_dataset_op.cc index 43892f1c6a80ae..caa82d31270e2e 100644 --- a/tensorflow/core/kernels/data/batch_dataset_op.cc +++ b/tensorflow/core/kernels/data/batch_dataset_op.cc @@ -23,6 +23,7 @@ limitations under the License. #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" +#include "xla/tsl/platform/statusor.h" #include "tensorflow/core/data/dataset_utils.h" #include "tensorflow/core/data/global_shuffle_utils.h" #include "tensorflow/core/data/name_utils.h" @@ -35,7 +36,6 @@ limitations under the License. #include "tensorflow/core/platform/stringprintf.h" #include "tensorflow/core/util/batch_util.h" #include "tsl/platform/mutex.h" -#include "tsl/platform/statusor.h" namespace tensorflow { namespace data { diff --git a/tensorflow/core/kernels/data/concatenate_dataset_op.cc b/tensorflow/core/kernels/data/concatenate_dataset_op.cc index 6e7f2fdeef050d..ba5a594a7843d5 100644 --- a/tensorflow/core/kernels/data/concatenate_dataset_op.cc +++ b/tensorflow/core/kernels/data/concatenate_dataset_op.cc @@ -21,13 +21,13 @@ limitations under the License. #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/statusor.h" #include "tensorflow/core/data/name_utils.h" #include "tensorflow/core/data/split_utils.h" #include "tensorflow/core/framework/dataset.h" #include "tensorflow/core/framework/tensor.h" -#include "tsl/platform/errors.h" #include "tsl/platform/mutex.h" -#include "tsl/platform/statusor.h" #include "tsl/platform/thread_annotations.h" namespace tensorflow { diff --git a/tensorflow/core/kernels/data/flat_map_dataset_op.cc b/tensorflow/core/kernels/data/flat_map_dataset_op.cc index cc9f372792a45f..63d4573f960dd4 100644 --- a/tensorflow/core/kernels/data/flat_map_dataset_op.cc +++ b/tensorflow/core/kernels/data/flat_map_dataset_op.cc @@ -23,6 +23,8 @@ limitations under the License. #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" +#include "xla/tsl/platform/logging.h" +#include "xla/tsl/platform/statusor.h" #include "tensorflow/core/common_runtime/function.h" #include "tensorflow/core/common_runtime/graph_constructor.h" #include "tensorflow/core/common_runtime/graph_runner.h" @@ -38,8 +40,6 @@ limitations under the License. #include "tensorflow/core/framework/partial_tensor_shape.h" #include "tensorflow/core/framework/tensor.h" #include "tensorflow/core/lib/random/random.h" -#include "tsl/platform/logging.h" -#include "tsl/platform/statusor.h" #include "tsl/platform/thread_annotations.h" namespace tensorflow { diff --git a/tensorflow/core/kernels/data/interleave_dataset_op.cc b/tensorflow/core/kernels/data/interleave_dataset_op.cc index a5added76bff09..ce33031868d83a 100644 --- a/tensorflow/core/kernels/data/interleave_dataset_op.cc +++ b/tensorflow/core/kernels/data/interleave_dataset_op.cc @@ -20,6 +20,7 @@ limitations under the License. #include "absl/status/status.h" #include "absl/status/statusor.h" +#include "xla/tsl/platform/errors.h" #include "tensorflow/core/common_runtime/function.h" #include "tensorflow/core/common_runtime/input_colocation_exemption_registry.h" #include "tensorflow/core/data/dataset_utils.h" @@ -33,7 +34,6 @@ limitations under the License. #include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/status.h" #include "tensorflow/core/platform/stringprintf.h" -#include "tsl/platform/errors.h" #include "tsl/platform/thread_annotations.h" namespace tensorflow { diff --git a/tensorflow/core/kernels/data/iterator_ops.cc b/tensorflow/core/kernels/data/iterator_ops.cc index 6384bc35d20856..d10513763fa726 100644 --- a/tensorflow/core/kernels/data/iterator_ops.cc +++ b/tensorflow/core/kernels/data/iterator_ops.cc @@ -23,6 +23,7 @@ limitations under the License. #include "absl/status/status.h" #include "absl/time/time.h" +#include "xla/tsl/platform/statusor.h" #include "tensorflow/core/activity_watcher/activity.h" #include "tensorflow/core/activity_watcher/activity_utils.h" #include "tensorflow/core/common_runtime/graph_runner.h" @@ -56,7 +57,6 @@ limitations under the License. #include "tensorflow/core/platform/tstring.h" #include "tensorflow/core/profiler/lib/traceme.h" #include "tensorflow/core/profiler/lib/traceme_encode.h" -#include "tsl/platform/statusor.h" namespace tensorflow { namespace data { diff --git a/tensorflow/core/kernels/data/parallel_map_dataset_op.cc b/tensorflow/core/kernels/data/parallel_map_dataset_op.cc index 68680cc217c71a..bdd176d5f52065 100644 --- a/tensorflow/core/kernels/data/parallel_map_dataset_op.cc +++ b/tensorflow/core/kernels/data/parallel_map_dataset_op.cc @@ -27,6 +27,7 @@ limitations under the License. #include "absl/base/call_once.h" #include "absl/status/status.h" #include "absl/strings/str_format.h" +#include "xla/tsl/platform/logging.h" #include "tensorflow/core/common_runtime/function.h" #include "tensorflow/core/common_runtime/input_colocation_exemption_registry.h" #include "tensorflow/core/data/dataset_utils.h" @@ -47,7 +48,6 @@ limitations under the License. #include "tensorflow/core/profiler/lib/traceme.h" #include "tensorflow/core/profiler/lib/traceme_encode.h" #include "tensorflow/core/protobuf/error_codes.pb.h" -#include "tsl/platform/logging.h" namespace tensorflow { namespace data { diff --git a/tensorflow/core/kernels/data/range_dataset_op.cc b/tensorflow/core/kernels/data/range_dataset_op.cc index dfa6d4b43cd70e..205bd45973f21a 100644 --- a/tensorflow/core/kernels/data/range_dataset_op.cc +++ b/tensorflow/core/kernels/data/range_dataset_op.cc @@ -22,6 +22,7 @@ limitations under the License. #include "absl/memory/memory.h" #include "absl/status/status.h" +#include "xla/tsl/platform/types.h" #include "tensorflow/core/data/global_shuffle_utils.h" #include "tensorflow/core/data/name_utils.h" #include "tensorflow/core/data/split_utils.h" @@ -30,7 +31,6 @@ limitations under the License. #include "tensorflow/core/framework/tensor.h" #include "tensorflow/core/platform/errors.h" #include "tsl/platform/mutex.h" -#include "tsl/platform/types.h" namespace tensorflow { namespace data { diff --git a/tensorflow/core/kernels/data/repeat_dataset_op.cc b/tensorflow/core/kernels/data/repeat_dataset_op.cc index 571a609423283a..595c79dbfdc54e 100644 --- a/tensorflow/core/kernels/data/repeat_dataset_op.cc +++ b/tensorflow/core/kernels/data/repeat_dataset_op.cc @@ -26,13 +26,13 @@ limitations under the License. #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/statusor.h" #include "tensorflow/core/data/global_shuffle_utils.h" #include "tensorflow/core/data/name_utils.h" #include "tensorflow/core/framework/dataset.h" #include "tensorflow/core/framework/partial_tensor_shape.h" #include "tensorflow/core/framework/tensor.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/statusor.h" #include "tsl/platform/thread_annotations.h" namespace tensorflow { diff --git a/tensorflow/core/kernels/data/shard_dataset_op.cc b/tensorflow/core/kernels/data/shard_dataset_op.cc index f027267e95cad6..522c95364a10e4 100644 --- a/tensorflow/core/kernels/data/shard_dataset_op.cc +++ b/tensorflow/core/kernels/data/shard_dataset_op.cc @@ -24,6 +24,7 @@ limitations under the License. #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" +#include "xla/tsl/platform/statusor.h" #include "tensorflow/core/data/dataset_utils.h" #include "tensorflow/core/data/global_shuffle_utils.h" #include "tensorflow/core/data/name_utils.h" @@ -35,7 +36,6 @@ limitations under the License. #include "tensorflow/core/platform/errors.h" #include "tensorflow/core/platform/stringprintf.h" #include "tensorflow/core/util/batch_util.h" -#include "tsl/platform/statusor.h" #include "tsl/platform/thread_annotations.h" namespace tensorflow { diff --git a/tensorflow/core/kernels/data/skip_dataset_op.cc b/tensorflow/core/kernels/data/skip_dataset_op.cc index b5d04bb9d69cc9..a0edd6a789e88e 100644 --- a/tensorflow/core/kernels/data/skip_dataset_op.cc +++ b/tensorflow/core/kernels/data/skip_dataset_op.cc @@ -20,13 +20,13 @@ limitations under the License. #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/statusor.h" #include "tensorflow/core/data/global_shuffle_utils.h" #include "tensorflow/core/data/name_utils.h" #include "tensorflow/core/framework/dataset.h" #include "tensorflow/core/framework/partial_tensor_shape.h" #include "tensorflow/core/framework/tensor.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/statusor.h" namespace tensorflow { namespace data { diff --git a/tensorflow/core/kernels/data/tf_record_dataset_op_test.cc b/tensorflow/core/kernels/data/tf_record_dataset_op_test.cc index 349fa61f73f16a..48c880e0026479 100644 --- a/tensorflow/core/kernels/data/tf_record_dataset_op_test.cc +++ b/tensorflow/core/kernels/data/tf_record_dataset_op_test.cc @@ -21,6 +21,8 @@ limitations under the License. #include "absl/strings/str_join.h" #include "absl/strings/string_view.h" #include "xla/tsl/lib/core/status_test_util.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/status.h" #include "tensorflow/core/data/dataset_test_base.h" #include "tensorflow/core/data/name_utils.h" #include "tensorflow/core/framework/dataset.h" @@ -35,8 +37,6 @@ limitations under the License. #include "tensorflow/core/platform/test.h" #include "tensorflow/core/platform/tstring.h" #include "tensorflow/core/platform/types.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/status.h" namespace tensorflow { namespace data { diff --git a/tensorflow/core/kernels/data/window_dataset.cc b/tensorflow/core/kernels/data/window_dataset.cc index 409f51134fe442..e940636363a587 100644 --- a/tensorflow/core/kernels/data/window_dataset.cc +++ b/tensorflow/core/kernels/data/window_dataset.cc @@ -18,6 +18,7 @@ limitations under the License. #include #include "absl/status/status.h" +#include "xla/tsl/platform/errors.h" #include "tensorflow/core/data/name_utils.h" #include "tensorflow/core/framework/dataset.h" #include "tensorflow/core/framework/dataset_options.pb.h" @@ -31,7 +32,6 @@ limitations under the License. #include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/status.h" #include "tensorflow/core/platform/types.h" -#include "tsl/platform/errors.h" #include "tsl/platform/thread_annotations.h" namespace tensorflow { diff --git a/tensorflow/core/kernels/data/window_dataset_op.cc b/tensorflow/core/kernels/data/window_dataset_op.cc index faa10d8902fa9e..836a6635b3ef43 100644 --- a/tensorflow/core/kernels/data/window_dataset_op.cc +++ b/tensorflow/core/kernels/data/window_dataset_op.cc @@ -16,6 +16,7 @@ limitations under the License. #include "absl/log/check.h" #include "absl/status/status.h" +#include "xla/tsl/platform/errors.h" #include "tensorflow/core/data/name_utils.h" #include "tensorflow/core/framework/dataset.h" #include "tensorflow/core/framework/dataset_options.pb.h" @@ -34,7 +35,6 @@ limitations under the License. #include "tensorflow/core/platform/stringprintf.h" #include "tensorflow/core/platform/tstring.h" #include "tensorflow/core/platform/types.h" -#include "tsl/platform/errors.h" #include "tsl/platform/thread_annotations.h" namespace tensorflow { diff --git a/tensorflow/core/kernels/data/zip_dataset_op.cc b/tensorflow/core/kernels/data/zip_dataset_op.cc index 41897f70040fd3..33c8851cd4057f 100644 --- a/tensorflow/core/kernels/data/zip_dataset_op.cc +++ b/tensorflow/core/kernels/data/zip_dataset_op.cc @@ -20,6 +20,9 @@ limitations under the License. #include "absl/log/check.h" #include "absl/status/status.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/macros.h" +#include "xla/tsl/platform/statusor.h" #include "tensorflow/core/data/name_utils.h" #include "tensorflow/core/data/split_utils.h" #include "tensorflow/core/framework/dataset.h" @@ -35,9 +38,6 @@ limitations under the License. #include "tensorflow/core/platform/status.h" #include "tensorflow/core/platform/strcat.h" #include "tensorflow/core/platform/types.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/macros.h" -#include "tsl/platform/statusor.h" #include "tsl/platform/thread_annotations.h" namespace tensorflow {