diff --git a/xla/service/gpu/model/BUILD b/xla/service/gpu/model/BUILD index 0eebb822ca70a..efd8bb9f098c8 100644 --- a/xla/service/gpu/model/BUILD +++ b/xla/service/gpu/model/BUILD @@ -37,9 +37,9 @@ cc_library( "//xla/service:hlo_cost_analysis", "//xla/service:latency_hiding_scheduler", "//xla/stream_executor:device_description", + "//xla/tsl/platform:status", "@com_google_absl//absl/log", "@com_google_absl//absl/time", - "@tsl//tsl/platform:status", ], ) @@ -129,11 +129,11 @@ xla_test( "//xla/service/gpu/tests:gpu_codegen_test", "//xla/stream_executor:device_description", "//xla/tests:xla_internal_test_main", + "//xla/tsl/platform:statusor", + "//xla/tsl/platform:test", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", "@com_google_absl//absl/types:span", - "@tsl//tsl/platform:statusor", - "@tsl//tsl/platform:test", ], ) @@ -162,9 +162,9 @@ xla_cc_test( "//xla/stream_executor:device_description", "//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", - "@tsl//tsl/platform:statusor", ], ) @@ -181,10 +181,10 @@ cc_library( "//xla/service:hlo_cost_analysis", "//xla/service:hlo_graph_dumper", "//xla/stream_executor:device_description", + "//xla/tsl/platform:status", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", - "@tsl//tsl/platform:status", ], ) @@ -202,8 +202,8 @@ xla_cc_test( "//xla/service/gpu:gpu_device_info_for_tests", "//xla/tests:hlo_test_base", "//xla/tests:xla_internal_test_main", + "//xla/tsl/platform:statusor", "@com_google_googletest//:gtest", - "@tsl//tsl/platform:statusor", ], ) @@ -225,6 +225,8 @@ cc_library( "//xla/service/gpu:backend_configs_cc", "//xla/service/gpu:cublas_cudnn", "//xla/stream_executor:device_description", + "//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", @@ -232,8 +234,6 @@ cc_library( "@com_google_absl//absl/log:check", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", - "@tsl//tsl/platform:errors", - "@tsl//tsl/platform:statusor", ], ) @@ -299,9 +299,9 @@ xla_cc_test( "//xla/stream_executor:device_description", "//xla/tests:hlo_test_base", "//xla/tests:xla_internal_test_main", + "//xla/tsl/platform:statusor", "@com_google_absl//absl/strings", "@com_google_googletest//:gtest", - "@tsl//tsl/platform:statusor", ], ) @@ -320,12 +320,12 @@ cc_library( "//xla/service/gpu:hlo_fusion_analysis", "//xla/service/gpu:launch_dimensions", "//xla/stream_executor:device_description", + "//xla/tsl/platform:status", "@com_google_absl//absl/log", "@com_google_absl//absl/log:check", "@com_google_absl//absl/time", "@com_google_absl//absl/types:span", "@llvm-project//llvm:Support", - "@tsl//tsl/platform:status", ], ) @@ -349,13 +349,13 @@ xla_cc_test( "//xla/stream_executor:device_description", "//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", "@com_google_absl//absl/time", "@com_google_googletest//:gtest", "@llvm-project//mlir:IR", - "@tsl//tsl/platform:errors", - "@tsl//tsl/platform:statusor", ], ) @@ -384,6 +384,7 @@ cc_library( "//xla/service/gpu:hlo_fusion_analysis", "//xla/service/gpu:launch_dimensions", "//xla/stream_executor:device_description", + "//xla/tsl/platform:status", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/log", @@ -395,7 +396,6 @@ cc_library( "@com_google_absl//absl/types:span", "@llvm-project//llvm:Support", "@llvm-project//mlir:IR", - "@tsl//tsl/platform:status", ] + if_cuda_is_configured(["@local_config_cuda//cuda:nvml_headers"]), ) @@ -436,6 +436,8 @@ cc_library( "//xla/service/gpu:ir_emission_utils", "//xla/service/gpu:launch_dimensions", "//xla/stream_executor:device_description", + "//xla/tsl/platform:status", + "//xla/tsl/platform:statusor", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/log", "@com_google_absl//absl/log:check", @@ -446,8 +448,6 @@ cc_library( "@com_google_absl//absl/types:span", "@llvm-project//llvm:Support", "@llvm-project//mlir:IR", - "@tsl//tsl/platform:status", - "@tsl//tsl/platform:statusor", ], ) @@ -474,13 +474,13 @@ xla_cc_test( "//xla/tests:hlo_test_base", "//xla/tests:xla_internal_test_main", "//xla/tsl/lib/core:status_test_util", + "//xla/tsl/platform:status_matchers", + "//xla/tsl/platform:statusor", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", "@com_google_absl//absl/time", "@com_google_googletest//:gtest", "@llvm-project//mlir:IR", - "@tsl//tsl/platform:status_matchers", - "@tsl//tsl/platform:statusor", ], ) @@ -489,11 +489,11 @@ cc_library( srcs = ["affine_map_evaluator.cc"], hdrs = ["affine_map_evaluator.h"], deps = [ + "//xla/tsl/platform:logging", "@com_google_absl//absl/types:span", "@llvm-project//llvm:Support", "@llvm-project//mlir:IR", "@llvm-project//mlir:Support", - "@tsl//tsl/platform:logging", ], ) @@ -504,8 +504,8 @@ xla_cc_test( ":affine_map_evaluator", "//xla/tests:hlo_test_base", "//xla/tests:xla_internal_test_main", + "//xla/tsl/platform:test", "@llvm-project//mlir:IR", - "@tsl//tsl/platform:test", ], ) @@ -537,11 +537,11 @@ xla_cc_test( "//xla/hlo/analysis:indexing_analysis", "//xla/hlo/analysis:indexing_test_utils", "//xla/tests:xla_internal_test_main", + "//xla/tsl/platform:test", "@com_google_absl//absl/strings:string_view", "@com_google_absl//absl/types:span", "@com_google_googletest//:gtest", "@llvm-project//llvm:Support", - "@tsl//tsl/platform:test", ], ) @@ -571,9 +571,9 @@ xla_cc_test( "//xla/hlo/testlib:verified_hlo_module", "//xla/hlo/utils:hlo_traversal", "//xla/tests:hlo_test_base", + "//xla/tsl/platform:statusor", "@com_google_googletest//:gtest_main", "@llvm-project//mlir:IR", - "@tsl//tsl/platform:statusor", ], ) @@ -594,6 +594,7 @@ cc_library( "//xla/service:name_uniquer", "//xla/service/gpu:backend_configs_cc", "//xla/tsl/lib/gtl:iterator_range", + "//xla/tsl/platform:errors", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:inlined_vector", "@com_google_absl//absl/log:check", @@ -604,7 +605,6 @@ cc_library( "@com_google_absl//absl/strings:str_format", "@com_google_absl//absl/types:span", "@llvm-project//llvm:Support", - "@tsl//tsl/platform:errors", ], ) @@ -650,6 +650,7 @@ cc_library( "//xla/hlo/utils:hlo_traversal", "//xla/service:instruction_fusion", "//xla/service:name_uniquer", + "//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", @@ -684,6 +685,8 @@ xla_cc_test( "//xla/service:instruction_fusion", "//xla/tests:hlo_test_base", "//xla/tsl/lib/core:status_test_util", + "//xla/tsl/platform:status_matchers", + "//xla/tsl/platform:statusor", "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/log", "@com_google_absl//absl/status", @@ -691,8 +694,6 @@ xla_cc_test( "@com_google_absl//absl/types:span", "@com_google_googletest//:gtest_main", "@llvm-project//mlir:IR", - "@tsl//tsl/platform:status_matchers", - "@tsl//tsl/platform:statusor", ], ) @@ -732,12 +733,12 @@ xla_cc_test( "//xla/service/gpu:gpu_device_info_for_tests", "//xla/stream_executor:device_description", "//xla/tests:hlo_test_base", + "//xla/tsl/platform:status_matchers", + "//xla/tsl/platform:statusor", + "//xla/tsl/platform:test", "@com_google_absl//absl/log", "@com_google_googletest//:gtest_main", "@llvm-project//mlir:IR", - "@tsl//tsl/platform:status_matchers", - "@tsl//tsl/platform:statusor", - "@tsl//tsl/platform:test", ], ) @@ -786,12 +787,12 @@ xla_cc_test( "//xla/service/gpu:hlo_fusion_analysis", "//xla/stream_executor:device_description", "//xla/tests:hlo_test_base", + "//xla/tsl/platform:statusor", + "//xla/tsl/platform:test", "@com_google_absl//absl/strings:string_view", "@com_google_absl//absl/types:span", "@com_google_googletest//:gtest_main", "@llvm-project//mlir:IR", - "@tsl//tsl/platform:statusor", - "@tsl//tsl/platform:test", ], ) @@ -819,10 +820,10 @@ cc_library( "//xla/hlo/ir:hlo", "//xla/service:hlo_proto_cc", "//xla/stream_executor:device_description", + "//xla/tsl/platform:logging", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/memory", "@com_google_absl//absl/strings", - "@tsl//tsl/platform:logging", "@tsl//tsl/platform:protobuf", ], ) @@ -865,12 +866,12 @@ cc_library( "//xla/service:interpreter_plugin", "//xla/stream_executor:device_description", "//xla/tests:test_utils", + "//xla/tsl/platform:errors", + "//xla/tsl/platform:statusor", "@com_google_absl//absl/log", "@com_google_absl//absl/log:check", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/time", - "@tsl//tsl/platform:errors", - "@tsl//tsl/platform:statusor", ], ) @@ -900,15 +901,15 @@ cc_library( "//xla/service:hlo_runner", "//xla/service:platform_util", "//xla/stream_executor:device_description", + "//xla/tsl/platform:env", + "//xla/tsl/platform:status", "//xla/tsl/util:command_line_flags", "@com_google_absl//absl/log", "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:str_format", - "@tsl//tsl/platform:env", "@tsl//tsl/platform:path", "@tsl//tsl/platform:platform_port", "@tsl//tsl/platform:protobuf", - "@tsl//tsl/platform:status", ], ) for sm in [ @@ -938,10 +939,11 @@ xla_test( "//xla:xla_data_proto_cc", "//xla/hlo/ir:hlo", "//xla/tests:hlo_test_base", + "//xla/tsl/platform:errors", + "//xla/tsl/platform:status_matchers", + "//xla/tsl/platform:test_main", "@com_google_googletest//:gtest", "@com_google_googletest//:gtest_main", - "@tsl//tsl/platform:errors", - "@tsl//tsl/platform:status_matchers", ], ) diff --git a/xla/service/gpu/model/affine_map_evaluator.cc b/xla/service/gpu/model/affine_map_evaluator.cc index b4a58be494eb1..3ef60cb47789f 100644 --- a/xla/service/gpu/model/affine_map_evaluator.cc +++ b/xla/service/gpu/model/affine_map_evaluator.cc @@ -22,7 +22,7 @@ limitations under the License. #include "mlir/IR/AffineExpr.h" #include "mlir/IR/AffineMap.h" #include "mlir/Support/LLVM.h" -#include "tsl/platform/logging.h" // IWYU pragma: keep +#include "xla/tsl/platform/logging.h" // IWYU pragma: keep namespace xla { namespace gpu { diff --git a/xla/service/gpu/model/affine_map_evaluator_test.cc b/xla/service/gpu/model/affine_map_evaluator_test.cc index 8c33813f0558b..9b30e927fc6cd 100644 --- a/xla/service/gpu/model/affine_map_evaluator_test.cc +++ b/xla/service/gpu/model/affine_map_evaluator_test.cc @@ -19,7 +19,7 @@ limitations under the License. #include "mlir/IR/AffineMap.h" #include "mlir/IR/MLIRContext.h" #include "xla/tests/hlo_test_base.h" -#include "tsl/platform/test.h" +#include "xla/tsl/platform/test.h" namespace xla { namespace gpu { diff --git a/xla/service/gpu/model/analytical_latency_estimator.cc b/xla/service/gpu/model/analytical_latency_estimator.cc index 43f05340ce2ff..a34437f707ae5 100644 --- a/xla/service/gpu/model/analytical_latency_estimator.cc +++ b/xla/service/gpu/model/analytical_latency_estimator.cc @@ -30,7 +30,7 @@ limitations under the License. #include "xla/service/hlo_cost_analysis.h" #include "xla/service/latency_hiding_scheduler.h" #include "xla/stream_executor/device_description.h" -#include "tsl/platform/status.h" +#include "xla/tsl/platform/status.h" namespace xla { namespace gpu { diff --git a/xla/service/gpu/model/analytical_latency_estimator_test.cc b/xla/service/gpu/model/analytical_latency_estimator_test.cc index 95940241d8b0d..09ea57ab10bb1 100644 --- a/xla/service/gpu/model/analytical_latency_estimator_test.cc +++ b/xla/service/gpu/model/analytical_latency_estimator_test.cc @@ -33,8 +33,8 @@ limitations under the License. #include "xla/shape.h" #include "xla/shape_util.h" #include "xla/stream_executor/device_description.h" -#include "tsl/platform/statusor.h" -#include "tsl/platform/test.h" +#include "xla/tsl/platform/statusor.h" +#include "xla/tsl/platform/test.h" namespace xla { diff --git a/xla/service/gpu/model/coalescing_analysis_test.cc b/xla/service/gpu/model/coalescing_analysis_test.cc index 3e150a7dc66e6..3f3c06ec2e1b7 100644 --- a/xla/service/gpu/model/coalescing_analysis_test.cc +++ b/xla/service/gpu/model/coalescing_analysis_test.cc @@ -39,9 +39,9 @@ limitations under the License. #include "xla/shape_util.h" #include "xla/stream_executor/device_description.h" #include "xla/tests/hlo_test_base.h" +#include "xla/tsl/platform/statusor.h" +#include "xla/tsl/platform/test.h" #include "xla/xla_data.pb.h" -#include "tsl/platform/statusor.h" -#include "tsl/platform/test.h" namespace xla { namespace gpu { diff --git a/xla/service/gpu/model/fusion_analysis_cache_test.cc b/xla/service/gpu/model/fusion_analysis_cache_test.cc index c5711bf8c80be..4df8b7cddb619 100644 --- a/xla/service/gpu/model/fusion_analysis_cache_test.cc +++ b/xla/service/gpu/model/fusion_analysis_cache_test.cc @@ -22,7 +22,7 @@ limitations under the License. #include "xla/service/gpu/hlo_fusion_analysis.h" #include "xla/stream_executor/device_description.h" #include "xla/tests/hlo_test_base.h" -#include "tsl/platform/statusor.h" +#include "xla/tsl/platform/statusor.h" namespace xla::gpu { namespace { diff --git a/xla/service/gpu/model/gpu_cost_model_stats_collection.cc b/xla/service/gpu/model/gpu_cost_model_stats_collection.cc index 78a4305fc29f2..1a875fe559f98 100644 --- a/xla/service/gpu/model/gpu_cost_model_stats_collection.cc +++ b/xla/service/gpu/model/gpu_cost_model_stats_collection.cc @@ -24,7 +24,7 @@ limitations under the License. #include "xla/hlo/ir/hlo_opcode.h" #include "xla/service/gpu/model/gpu_performance_model.h" #include "xla/service/gpu/model/gpu_performance_model_base.h" -#include "tsl/platform/status.h" +#include "xla/tsl/platform/status.h" namespace xla { namespace gpu { diff --git a/xla/service/gpu/model/gpu_cost_model_stats_collection_test.cc b/xla/service/gpu/model/gpu_cost_model_stats_collection_test.cc index 8b1d92eb55df7..f98bbcba86503 100644 --- a/xla/service/gpu/model/gpu_cost_model_stats_collection_test.cc +++ b/xla/service/gpu/model/gpu_cost_model_stats_collection_test.cc @@ -26,7 +26,7 @@ limitations under the License. #include "xla/service/gpu/model/gpu_hlo_cost_analysis.h" #include "xla/service/hlo_cost_analysis.h" #include "xla/tests/hlo_test_base.h" -#include "tsl/platform/statusor.h" +#include "xla/tsl/platform/statusor.h" namespace xla { namespace gpu { diff --git a/xla/service/gpu/model/gpu_hlo_cost_analysis.cc b/xla/service/gpu/model/gpu_hlo_cost_analysis.cc index dd8cedf8e866a..bd41168b2aacf 100644 --- a/xla/service/gpu/model/gpu_hlo_cost_analysis.cc +++ b/xla/service/gpu/model/gpu_hlo_cost_analysis.cc @@ -43,9 +43,9 @@ limitations under the License. #include "xla/service/hlo_module_config.h" #include "xla/shape.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 { namespace gpu { diff --git a/xla/service/gpu/model/gpu_indexing_performance_model.cc b/xla/service/gpu/model/gpu_indexing_performance_model.cc index a00d660f13ef8..a5382a26adcbe 100644 --- a/xla/service/gpu/model/gpu_indexing_performance_model.cc +++ b/xla/service/gpu/model/gpu_indexing_performance_model.cc @@ -50,9 +50,9 @@ limitations under the License. #include "xla/shape.h" #include "xla/shape_util.h" #include "xla/stream_executor/device_description.h" +#include "xla/tsl/platform/status.h" +#include "xla/tsl/platform/statusor.h" #include "xla/util.h" -#include "tsl/platform/status.h" -#include "tsl/platform/statusor.h" namespace xla { namespace gpu { diff --git a/xla/service/gpu/model/gpu_indexing_performance_model_test.cc b/xla/service/gpu/model/gpu_indexing_performance_model_test.cc index a36064cd10c96..bd77677cf82c0 100644 --- a/xla/service/gpu/model/gpu_indexing_performance_model_test.cc +++ b/xla/service/gpu/model/gpu_indexing_performance_model_test.cc @@ -45,8 +45,8 @@ limitations under the License. #include "xla/stream_executor/device_description.h" #include "xla/tests/hlo_test_base.h" #include "xla/tsl/lib/core/status_test_util.h" -#include "tsl/platform/status_matchers.h" -#include "tsl/platform/statusor.h" +#include "xla/tsl/platform/status_matchers.h" +#include "xla/tsl/platform/statusor.h" namespace xla { namespace gpu { diff --git a/xla/service/gpu/model/gpu_performance_model.cc b/xla/service/gpu/model/gpu_performance_model.cc index ab09a82537e9b..60bbe2299a47e 100644 --- a/xla/service/gpu/model/gpu_performance_model.cc +++ b/xla/service/gpu/model/gpu_performance_model.cc @@ -35,9 +35,9 @@ limitations under the License. #include "xla/service/gpu/model/gpu_hlo_cost_analysis.h" #include "xla/service/gpu/model/gpu_performance_model_base.h" #include "xla/stream_executor/device_description.h" +#include "xla/tsl/platform/status.h" #include "xla/util.h" #include "xla/xla_data.pb.h" -#include "tsl/platform/status.h" namespace xla { namespace gpu { diff --git a/xla/service/gpu/model/gpu_performance_model_base_test.cc b/xla/service/gpu/model/gpu_performance_model_base_test.cc index c96334ae02650..b3d396de98dd2 100644 --- a/xla/service/gpu/model/gpu_performance_model_base_test.cc +++ b/xla/service/gpu/model/gpu_performance_model_base_test.cc @@ -26,7 +26,7 @@ limitations under the License. #include "xla/service/gpu/model/gpu_hlo_cost_analysis.h" #include "xla/stream_executor/device_description.h" #include "xla/tests/hlo_test_base.h" -#include "tsl/platform/statusor.h" +#include "xla/tsl/platform/statusor.h" namespace xla { namespace gpu { diff --git a/xla/service/gpu/model/gpu_performance_model_test.cc b/xla/service/gpu/model/gpu_performance_model_test.cc index 085c9b67f4a79..ae0f81ccf8f23 100644 --- a/xla/service/gpu/model/gpu_performance_model_test.cc +++ b/xla/service/gpu/model/gpu_performance_model_test.cc @@ -41,9 +41,9 @@ limitations under the License. #include "xla/shape_util.h" #include "xla/stream_executor/device_description.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 gpu { diff --git a/xla/service/gpu/model/hlo_op_profiler.cc b/xla/service/gpu/model/hlo_op_profiler.cc index c6d663a8b4cad..91e3670122eb3 100644 --- a/xla/service/gpu/model/hlo_op_profiler.cc +++ b/xla/service/gpu/model/hlo_op_profiler.cc @@ -42,10 +42,10 @@ limitations under the License. #include "xla/shape_util.h" #include "xla/stream_executor/device_description.h" #include "xla/tests/test_utils.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" #ifdef GOOGLE_CUDA #include "xla/backends/profiler/gpu/cupti_collector.h" diff --git a/xla/service/gpu/model/hlo_op_profiler_run.cc b/xla/service/gpu/model/hlo_op_profiler_run.cc index b12d35961f2bc..ef4b105bb9f31 100644 --- a/xla/service/gpu/model/hlo_op_profiler_run.cc +++ b/xla/service/gpu/model/hlo_op_profiler_run.cc @@ -28,13 +28,13 @@ limitations under the License. #include "xla/service/hlo_runner.h" #include "xla/service/platform_util.h" #include "xla/stream_executor/device_description.h" +#include "xla/tsl/platform/env.h" +#include "xla/tsl/platform/status.h" #include "xla/tsl/util/command_line_flags.h" #include "xla/xla_data.pb.h" -#include "tsl/platform/env.h" #include "tsl/platform/init_main.h" #include "tsl/platform/path.h" #include "tsl/platform/protobuf.h" -#include "tsl/platform/status.h" namespace xla { namespace gpu { diff --git a/xla/service/gpu/model/hlo_op_profiler_test.cc b/xla/service/gpu/model/hlo_op_profiler_test.cc index dbab70f96ae12..41be2060946ea 100644 --- a/xla/service/gpu/model/hlo_op_profiler_test.cc +++ b/xla/service/gpu/model/hlo_op_profiler_test.cc @@ -19,9 +19,9 @@ limitations under the License. #include #include "xla/hlo/ir/hlo_opcode.h" #include "xla/tests/hlo_test_base.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/status_matchers.h" #include "xla/xla_data.pb.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/status_matchers.h" namespace xla { namespace gpu { diff --git a/xla/service/gpu/model/hlo_op_profiles.cc b/xla/service/gpu/model/hlo_op_profiles.cc index db39b830f2eb3..9e813d2b12b84 100644 --- a/xla/service/gpu/model/hlo_op_profiles.cc +++ b/xla/service/gpu/model/hlo_op_profiles.cc @@ -26,7 +26,7 @@ limitations under the License. #include "xla/service/gpu/model/hlo_op_profile.pb.h" #include "xla/service/gpu/model/hlo_op_profiles_data.h" #include "xla/stream_executor/device_description.h" -#include "tsl/platform/logging.h" +#include "xla/tsl/platform/logging.h" #include "tsl/platform/protobuf.h" namespace xla { diff --git a/xla/service/gpu/model/symbolic_tile_analysis.cc b/xla/service/gpu/model/symbolic_tile_analysis.cc index 95c3acbca2c93..05556d7a3a340 100644 --- a/xla/service/gpu/model/symbolic_tile_analysis.cc +++ b/xla/service/gpu/model/symbolic_tile_analysis.cc @@ -61,6 +61,7 @@ limitations under the License. #include "xla/service/name_uniquer.h" #include "xla/shape.h" #include "xla/status_macros.h" +#include "xla/tsl/platform/statusor.h" #include "xla/util.h" namespace xla { diff --git a/xla/service/gpu/model/symbolic_tile_analysis_test.cc b/xla/service/gpu/model/symbolic_tile_analysis_test.cc index 6fc12d0364040..c0382b090f06f 100644 --- a/xla/service/gpu/model/symbolic_tile_analysis_test.cc +++ b/xla/service/gpu/model/symbolic_tile_analysis_test.cc @@ -42,9 +42,9 @@ limitations under the License. #include "xla/service/instruction_fusion.h" #include "xla/tests/hlo_test_base.h" #include "xla/tsl/lib/core/status_test_util.h" +#include "xla/tsl/platform/status_matchers.h" +#include "xla/tsl/platform/statusor.h" #include "xla/util.h" -#include "tsl/platform/status_matchers.h" -#include "tsl/platform/statusor.h" namespace xla { namespace gpu { diff --git a/xla/service/gpu/model/symbolic_tile_test.cc b/xla/service/gpu/model/symbolic_tile_test.cc index 1b2e3c5af075b..47edf4c4c55b6 100644 --- a/xla/service/gpu/model/symbolic_tile_test.cc +++ b/xla/service/gpu/model/symbolic_tile_test.cc @@ -29,7 +29,7 @@ limitations under the License. #include "xla/hlo/analysis/indexing_map.h" #include "xla/hlo/analysis/indexing_test_utils.h" #include "xla/service/gpu/model/affine_map_evaluator.h" -#include "tsl/platform/test.h" +#include "xla/tsl/platform/test.h" namespace xla { namespace gpu { diff --git a/xla/service/gpu/model/symbolic_tiled_hlo_instruction_test.cc b/xla/service/gpu/model/symbolic_tiled_hlo_instruction_test.cc index db2da2502b630..bcf2a551446d5 100644 --- a/xla/service/gpu/model/symbolic_tiled_hlo_instruction_test.cc +++ b/xla/service/gpu/model/symbolic_tiled_hlo_instruction_test.cc @@ -28,7 +28,7 @@ limitations under the License. #include "xla/hlo/utils/hlo_traversal.h" #include "xla/service/gpu/model/symbolic_tile.h" #include "xla/tests/hlo_test_base.h" -#include "tsl/platform/statusor.h" +#include "xla/tsl/platform/statusor.h" namespace xla { namespace gpu { diff --git a/xla/service/gpu/model/tiled_hlo_instruction.cc b/xla/service/gpu/model/tiled_hlo_instruction.cc index bdefbad7cf46f..8cff29f4bfd70 100644 --- a/xla/service/gpu/model/tiled_hlo_instruction.cc +++ b/xla/service/gpu/model/tiled_hlo_instruction.cc @@ -33,8 +33,8 @@ limitations under the License. #include "xla/hlo/analysis/indexing_map_serialization.h" #include "xla/hlo/ir/hlo_instruction.h" #include "xla/service/gpu/model/tiled_hlo_computation.h" +#include "xla/tsl/platform/errors.h" #include "xla/util.h" -#include "tsl/platform/errors.h" namespace xla { namespace gpu { diff --git a/xla/service/gpu/model/triton_emitter_constraints_test.cc b/xla/service/gpu/model/triton_emitter_constraints_test.cc index c3b7e65150778..4cfe20e491375 100644 --- a/xla/service/gpu/model/triton_emitter_constraints_test.cc +++ b/xla/service/gpu/model/triton_emitter_constraints_test.cc @@ -33,9 +33,9 @@ limitations under the License. #include "xla/service/instruction_fusion.h" #include "xla/stream_executor/device_description.h" #include "xla/tests/hlo_test_base.h" -#include "tsl/platform/status_matchers.h" -#include "tsl/platform/statusor.h" -#include "tsl/platform/test.h" +#include "xla/tsl/platform/status_matchers.h" +#include "xla/tsl/platform/statusor.h" +#include "xla/tsl/platform/test.h" namespace xla { namespace gpu {