From 73d5a6fb112d2c9026f4e0c54563b7d1615d4319 Mon Sep 17 00:00:00 2001 From: David Dunleavy Date: Thu, 23 Jan 2025 08:49:09 -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: 718885045 --- xla/service/spmd/BUILD | 44 +++++++++---------- .../spmd/canonicalize_all_gather_for_cse.cc | 4 +- .../canonicalize_all_gather_for_cse_test.cc | 4 +- xla/service/spmd/collective_permute_motion.cc | 4 +- xla/service/spmd/convolution_handler.cc | 2 +- xla/service/spmd/custom_call_handler.cc | 2 +- xla/service/spmd/dot_handler.cc | 4 +- xla/service/spmd/gather_scatter_handler.cc | 2 +- xla/service/spmd/partition_assignment_test.cc | 2 +- .../spmd/schedule_aware_collective_ops_cse.cc | 4 +- .../schedule_aware_collective_ops_cse_test.cc | 4 +- xla/service/spmd/spmd_partitioner.cc | 4 +- xla/service/spmd/spmd_partitioner_util.h | 4 +- xla/service/spmd/spmd_prepare.cc | 4 +- xla/service/spmd/spmd_prepare_test.cc | 4 +- .../stateful_rng_spmd_partitioner_test.cc | 4 +- xla/service/spmd/whole_graph_manual_pass.cc | 2 +- .../spmd/whole_graph_manual_pass_test.cc | 4 +- 18 files changed, 51 insertions(+), 51 deletions(-) diff --git a/xla/service/spmd/BUILD b/xla/service/spmd/BUILD index 407b6280d4d02..c643c4c725df9 100644 --- a/xla/service/spmd/BUILD +++ b/xla/service/spmd/BUILD @@ -72,6 +72,8 @@ cc_library( "//xla/service:pattern_matcher", "//xla/service:shape_inference", "//xla/service:sharding_propagation", + "//xla/tsl/platform:errors", + "//xla/tsl/platform:statusor", "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/cleanup", "@com_google_absl//absl/container:flat_hash_map", @@ -86,9 +88,7 @@ cc_library( "@com_google_absl//absl/strings", "@com_google_absl//absl/types:span", "@com_google_absl//absl/utility", - "@tsl//tsl/platform:errors", "@tsl//tsl/platform:numbers", - "@tsl//tsl/platform:statusor", ], ) @@ -136,12 +136,12 @@ xla_cc_test( "//xla/hlo/utils:hlo_matchers", "//xla/tests:hlo_test_base", "//xla/tests:xla_internal_test_main", + "//xla/tsl/platform:errors", + "//xla/tsl/platform:statusor", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings:string_view", "@com_google_googletest//:gtest_main", - "@tsl//tsl/platform:errors", - "@tsl//tsl/platform:statusor", ], ) @@ -164,12 +164,12 @@ cc_library( "//xla/hlo/ir:hlo", "//xla/hlo/pass:hlo_pass", "//xla/hlo/utils:hlo_query", + "//xla/tsl/platform:errors", + "//xla/tsl/platform:statusor", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings:string_view", "@com_google_absl//absl/types:span", - "@tsl//tsl/platform:errors", - "@tsl//tsl/platform:statusor", ], ) @@ -183,11 +183,11 @@ xla_cc_test( "//xla/hlo/pass:hlo_pass_pipeline", "//xla/tests:hlo_test_base", "//xla/tests:xla_internal_test_main", + "//xla/tsl/platform:errors", + "//xla/tsl/platform:statusor", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings:string_view", "@com_google_googletest//:gtest_main", - "@tsl//tsl/platform:errors", - "@tsl//tsl/platform:statusor", ], ) @@ -199,13 +199,13 @@ cc_library( "//xla:shape_util", "//xla/hlo/ir:hlo", "//xla/hlo/pass:hlo_pass", + "//xla/tsl/platform:errors", + "//xla/tsl/platform:statusor", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/log", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings:string_view", - "@tsl//tsl/platform:errors", - "@tsl//tsl/platform:statusor", ], ) @@ -220,11 +220,11 @@ xla_cc_test( "//xla/hlo/utils:hlo_matchers", "//xla/tests:hlo_test_base", "//xla/tests:xla_internal_test_main", + "//xla/tsl/platform:errors", + "//xla/tsl/platform:statusor", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings:string_view", "@com_google_googletest//:gtest", - "@tsl//tsl/platform:errors", - "@tsl//tsl/platform:statusor", ], ) @@ -239,11 +239,11 @@ cc_library( "//xla/hlo/utils:hlo_sharding_util", "//xla/service:call_graph", "//xla/service:pattern_matcher", + "//xla/tsl/platform:errors", + "//xla/tsl/platform:statusor", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings:string_view", - "@tsl//tsl/platform:errors", - "@tsl//tsl/platform:statusor", ], ) @@ -281,11 +281,11 @@ xla_cc_test( "//xla/service:sharding_propagation", "//xla/tests:hlo_test_base", "//xla/tests:xla_internal_test_main", + "//xla/tsl/platform:errors", + "//xla/tsl/platform:statusor", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings:string_view", "@com_google_googletest//:gtest_main", - "@tsl//tsl/platform:errors", - "@tsl//tsl/platform:statusor", ], ) @@ -300,6 +300,8 @@ cc_library( "//xla/hlo/analysis:while_loop_analysis", "//xla/hlo/ir:hlo", "//xla/hlo/pass:hlo_pass", + "//xla/tsl/platform:errors", + "//xla/tsl/platform:statusor", "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", @@ -307,8 +309,6 @@ cc_library( "@com_google_absl//absl/log:check", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings:string_view", - "@tsl//tsl/platform:errors", - "@tsl//tsl/platform:statusor", ], ) @@ -356,9 +356,9 @@ xla_cc_test( "//xla:xla_proto_cc", "//xla/tests:hlo_test_base", "//xla/tests:xla_internal_test_main", + "//xla/tsl/platform:statusor", "@com_google_absl//absl/strings:string_view", "@com_google_googletest//:gtest_main", - "@tsl//tsl/platform:statusor", ], ) @@ -373,10 +373,10 @@ cc_library( deps = [ "//xla/hlo/ir:hlo", "//xla/hlo/pass:hlo_pass", + "//xla/tsl/platform:statusor", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings:string_view", - "@tsl//tsl/platform:statusor", ], ) @@ -390,12 +390,12 @@ xla_cc_test( "//xla/hlo/utils:hlo_matchers", "//xla/tests:hlo_test_base", "//xla/tests:xla_internal_test_main", + "//xla/tsl/platform:errors", + "//xla/tsl/platform:statusor", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings:string_view", "@com_google_googletest//:gtest_main", - "@tsl//tsl/platform:errors", - "@tsl//tsl/platform:statusor", ], ) diff --git a/xla/service/spmd/canonicalize_all_gather_for_cse.cc b/xla/service/spmd/canonicalize_all_gather_for_cse.cc index 745eed9ebb73a..a3dceadc453f2 100644 --- a/xla/service/spmd/canonicalize_all_gather_for_cse.cc +++ b/xla/service/spmd/canonicalize_all_gather_for_cse.cc @@ -30,9 +30,9 @@ limitations under the License. #include "xla/hlo/utils/hlo_query.h" #include "xla/shape.h" #include "xla/shape_util.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/statusor.h" #include "xla/util.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/statusor.h" namespace xla { diff --git a/xla/service/spmd/canonicalize_all_gather_for_cse_test.cc b/xla/service/spmd/canonicalize_all_gather_for_cse_test.cc index 593d6f7d36c32..57af9880679e7 100644 --- a/xla/service/spmd/canonicalize_all_gather_for_cse_test.cc +++ b/xla/service/spmd/canonicalize_all_gather_for_cse_test.cc @@ -29,9 +29,9 @@ limitations under the License. #include "xla/hlo/pass/hlo_pass_pipeline.h" #include "xla/hlo/utils/hlo_matchers.h" #include "xla/tests/hlo_test_base.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/statusor.h" #include "xla/xla_data.pb.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/statusor.h" namespace xla { namespace spmd { diff --git a/xla/service/spmd/collective_permute_motion.cc b/xla/service/spmd/collective_permute_motion.cc index cff4cb1a0cec1..b2c2bda4df428 100644 --- a/xla/service/spmd/collective_permute_motion.cc +++ b/xla/service/spmd/collective_permute_motion.cc @@ -34,9 +34,9 @@ limitations under the License. #include "xla/hlo/ir/hlo_instruction.h" #include "xla/hlo/ir/hlo_opcode.h" #include "xla/shape_util.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/statusor.h" #include "xla/xla_data.pb.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/statusor.h" namespace xla { diff --git a/xla/service/spmd/convolution_handler.cc b/xla/service/spmd/convolution_handler.cc index aaf27dcd30c19..40f9937ce9a83 100644 --- a/xla/service/spmd/convolution_handler.cc +++ b/xla/service/spmd/convolution_handler.cc @@ -38,10 +38,10 @@ limitations under the License. #include "xla/shape.h" #include "xla/shape_util.h" #include "xla/status_macros.h" +#include "xla/tsl/platform/statusor.h" #include "xla/util.h" #include "xla/window_util.h" #include "xla/xla_data.pb.h" -#include "tsl/platform/statusor.h" namespace xla { namespace spmd { diff --git a/xla/service/spmd/custom_call_handler.cc b/xla/service/spmd/custom_call_handler.cc index 4903decc23683..7ca4c12db497a 100644 --- a/xla/service/spmd/custom_call_handler.cc +++ b/xla/service/spmd/custom_call_handler.cc @@ -52,9 +52,9 @@ limitations under the License. #include "xla/shape.h" #include "xla/shape_util.h" #include "xla/status_macros.h" +#include "xla/tsl/platform/statusor.h" #include "xla/util.h" #include "xla/xla_data.pb.h" -#include "tsl/platform/statusor.h" namespace xla { namespace spmd { diff --git a/xla/service/spmd/dot_handler.cc b/xla/service/spmd/dot_handler.cc index 5fe3ced363115..fd9e8ad5996a5 100644 --- a/xla/service/spmd/dot_handler.cc +++ b/xla/service/spmd/dot_handler.cc @@ -55,11 +55,11 @@ limitations under the License. #include "xla/shape_util.h" #include "xla/side_effect_util.h" #include "xla/status_macros.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/statusor.h" #include "xla/util.h" #include "xla/window_util.h" #include "xla/xla_data.pb.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/statusor.h" namespace xla { namespace spmd { diff --git a/xla/service/spmd/gather_scatter_handler.cc b/xla/service/spmd/gather_scatter_handler.cc index b8a848836d252..fb2035ad31e9f 100644 --- a/xla/service/spmd/gather_scatter_handler.cc +++ b/xla/service/spmd/gather_scatter_handler.cc @@ -42,8 +42,8 @@ limitations under the License. #include "xla/service/spmd/spmd_partitioner_util.h" #include "xla/shape.h" #include "xla/shape_util.h" +#include "xla/tsl/platform/statusor.h" #include "xla/xla_data.pb.h" -#include "tsl/platform/statusor.h" namespace xla { namespace spmd { diff --git a/xla/service/spmd/partition_assignment_test.cc b/xla/service/spmd/partition_assignment_test.cc index 0aa4b91286fdb..79cc656d96c62 100644 --- a/xla/service/spmd/partition_assignment_test.cc +++ b/xla/service/spmd/partition_assignment_test.cc @@ -20,8 +20,8 @@ limitations under the License. #include #include "absl/strings/string_view.h" #include "xla/tests/hlo_test_base.h" +#include "xla/tsl/platform/statusor.h" #include "xla/xla.pb.h" -#include "tsl/platform/statusor.h" namespace xla { namespace { diff --git a/xla/service/spmd/schedule_aware_collective_ops_cse.cc b/xla/service/spmd/schedule_aware_collective_ops_cse.cc index a4b9b5c6ee991..16911d134eabb 100644 --- a/xla/service/spmd/schedule_aware_collective_ops_cse.cc +++ b/xla/service/spmd/schedule_aware_collective_ops_cse.cc @@ -31,8 +31,8 @@ limitations under the License. #include "xla/hlo/ir/hlo_opcode.h" #include "xla/shape.h" #include "xla/shape_util.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/statusor.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/statusor.h" namespace xla { namespace { diff --git a/xla/service/spmd/schedule_aware_collective_ops_cse_test.cc b/xla/service/spmd/schedule_aware_collective_ops_cse_test.cc index e39b802c935f6..be5d58b55b616 100644 --- a/xla/service/spmd/schedule_aware_collective_ops_cse_test.cc +++ b/xla/service/spmd/schedule_aware_collective_ops_cse_test.cc @@ -27,9 +27,9 @@ limitations under the License. #include "xla/hlo/ir/hlo_opcode.h" #include "xla/hlo/pass/hlo_pass_pipeline.h" #include "xla/tests/hlo_test_base.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/statusor.h" #include "xla/xla_data.pb.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/statusor.h" namespace xla { namespace spmd { diff --git a/xla/service/spmd/spmd_partitioner.cc b/xla/service/spmd/spmd_partitioner.cc index bc4225caa185f..c439271ceeada 100644 --- a/xla/service/spmd/spmd_partitioner.cc +++ b/xla/service/spmd/spmd_partitioner.cc @@ -70,13 +70,13 @@ limitations under the License. #include "xla/shape.h" #include "xla/shape_util.h" #include "xla/status_macros.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/statusor.h" #include "xla/types.h" #include "xla/util.h" #include "xla/window_util.h" #include "xla/xla_data.pb.h" -#include "tsl/platform/errors.h" #include "tsl/platform/numbers.h" -#include "tsl/platform/statusor.h" namespace xla { namespace spmd { diff --git a/xla/service/spmd/spmd_partitioner_util.h b/xla/service/spmd/spmd_partitioner_util.h index 858e5a79be4a8..7c16674f9655a 100644 --- a/xla/service/spmd/spmd_partitioner_util.h +++ b/xla/service/spmd/spmd_partitioner_util.h @@ -55,10 +55,10 @@ limitations under the License. #include "xla/service/spmd/spmd_partitioner.h" #include "xla/shape.h" #include "xla/shape_util.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/statusor.h" #include "xla/util.h" #include "xla/xla_data.pb.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/statusor.h" namespace xla { namespace spmd { diff --git a/xla/service/spmd/spmd_prepare.cc b/xla/service/spmd/spmd_prepare.cc index f355eb3743738..84c2975c74cd4 100644 --- a/xla/service/spmd/spmd_prepare.cc +++ b/xla/service/spmd/spmd_prepare.cc @@ -30,9 +30,9 @@ limitations under the License. #include "xla/hlo/utils/hlo_sharding_util.h" #include "xla/service/call_graph.h" #include "xla/service/pattern_matcher.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/statusor.h" #include "xla/xla_data.pb.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/statusor.h" namespace xla { namespace spmd { diff --git a/xla/service/spmd/spmd_prepare_test.cc b/xla/service/spmd/spmd_prepare_test.cc index 1b66acb80e995..68cf4bf93c9bc 100644 --- a/xla/service/spmd/spmd_prepare_test.cc +++ b/xla/service/spmd/spmd_prepare_test.cc @@ -27,9 +27,9 @@ limitations under the License. #include "xla/hlo/pass/hlo_pass_pipeline.h" #include "xla/hlo/utils/hlo_matchers.h" #include "xla/tests/hlo_test_base.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/statusor.h" #include "xla/util.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/statusor.h" namespace xla { namespace spmd { diff --git a/xla/service/spmd/stateful_rng_spmd_partitioner_test.cc b/xla/service/spmd/stateful_rng_spmd_partitioner_test.cc index abb22b4747500..55d77ca09236b 100644 --- a/xla/service/spmd/stateful_rng_spmd_partitioner_test.cc +++ b/xla/service/spmd/stateful_rng_spmd_partitioner_test.cc @@ -29,11 +29,11 @@ limitations under the License. #include "xla/service/hlo_verifier.h" #include "xla/service/sharding_propagation.h" #include "xla/tests/hlo_test_base.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/statusor.h" #include "xla/util.h" #include "xla/xla.pb.h" #include "xla/xla_data.pb.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/statusor.h" namespace xla { namespace spmd { diff --git a/xla/service/spmd/whole_graph_manual_pass.cc b/xla/service/spmd/whole_graph_manual_pass.cc index a6d0ae8c62c56..beb173c38aa6e 100644 --- a/xla/service/spmd/whole_graph_manual_pass.cc +++ b/xla/service/spmd/whole_graph_manual_pass.cc @@ -24,7 +24,7 @@ limitations under the License. #include "xla/hlo/ir/hlo_instructions.h" #include "xla/hlo/ir/hlo_opcode.h" #include "xla/hlo/ir/hlo_sharding.h" -#include "tsl/platform/statusor.h" +#include "xla/tsl/platform/statusor.h" namespace xla { diff --git a/xla/service/spmd/whole_graph_manual_pass_test.cc b/xla/service/spmd/whole_graph_manual_pass_test.cc index 8b5f5b84d0111..f5c7e10f60f6d 100644 --- a/xla/service/spmd/whole_graph_manual_pass_test.cc +++ b/xla/service/spmd/whole_graph_manual_pass_test.cc @@ -25,8 +25,8 @@ limitations under the License. #include "xla/hlo/pass/hlo_pass_pipeline.h" #include "xla/hlo/utils/hlo_matchers.h" #include "xla/tests/hlo_test_base.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/statusor.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/statusor.h" namespace xla { namespace spmd {