diff --git a/xla/stream_executor/rocm/BUILD b/xla/stream_executor/rocm/BUILD index b4613df09eb58..aa1cc0295d88f 100644 --- a/xla/stream_executor/rocm/BUILD +++ b/xla/stream_executor/rocm/BUILD @@ -39,12 +39,12 @@ cc_library( ], deps = [ "//xla/stream_executor/gpu:gpu_diagnostics_header", + "//xla/tsl/platform:logging", "@com_google_absl//absl/container:inlined_vector", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:str_format", - "@tsl//tsl/platform:logging", "@tsl//tsl/platform:platform_port", ], ) @@ -64,14 +64,14 @@ cc_library( "//xla/stream_executor/gpu:context", "//xla/stream_executor/gpu:context_map", "//xla/stream_executor/gpu:scoped_activate_context", + "//xla/tsl/platform:errors", + "//xla/tsl/platform:status", "@com_google_absl//absl/log", "@com_google_absl//absl/log:check", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", "@local_config_rocm//rocm:rocm_headers", - "@tsl//tsl/platform:errors", - "@tsl//tsl/platform:status", ], ) @@ -84,10 +84,10 @@ cc_library( "rocm-only", ], deps = [ + "//xla/tsl/platform:env", "@local_config_rocm//rocm:hip", # buildcleaner: keep "@local_config_rocm//rocm:rocm_headers", "@tsl//tsl/platform:dso_loader", - "@tsl//tsl/platform:env", ], ) @@ -105,6 +105,8 @@ cc_library( "//xla/stream_executor:activate_context", "//xla/stream_executor:event", "//xla/stream_executor:stream_executor_h", + "//xla/tsl/platform:errors", + "//xla/tsl/platform:statusor", "@com_google_absl//absl/base", "@com_google_absl//absl/log", "@com_google_absl//absl/status", @@ -112,8 +114,6 @@ cc_library( "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:str_format", "@local_config_rocm//rocm:rocm_headers", - "@tsl//tsl/platform:errors", - "@tsl//tsl/platform:statusor", ], ) @@ -129,11 +129,11 @@ xla_test( "//xla/stream_executor:event", "//xla/stream_executor:platform", "//xla/stream_executor:platform_manager", + "//xla/tsl/platform:status_matchers", + "//xla/tsl/platform:statusor", + "//xla/tsl/platform:test", "@com_google_googletest//:gtest_main", "@local_config_rocm//rocm:rocm_headers", - "@tsl//tsl/platform:status_matchers", - "@tsl//tsl/platform:statusor", - "@tsl//tsl/platform:test", ], ) @@ -187,6 +187,7 @@ cc_library( "//xla/stream_executor/platform:initialize", "//xla/tsl/platform:env", "//xla/tsl/platform:errors", + "//xla/tsl/platform:logging", "//xla/tsl/platform:statusor", "@com_google_absl//absl/base", "@com_google_absl//absl/base:core_headers", @@ -254,6 +255,7 @@ cc_library( "//xla/stream_executor:stream", "//xla/stream_executor:stream_executor_h", "//xla/tsl/platform:errors", + "//xla/tsl/platform:logging", "//xla/tsl/platform:statusor", "@com_google_absl//absl/log", "@com_google_absl//absl/log:check", @@ -261,7 +263,6 @@ cc_library( "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", "@local_config_rocm//rocm:rocm_headers", - "@tsl//tsl/platform:logging", ], ) @@ -280,10 +281,10 @@ xla_test( "//xla/stream_executor:platform_manager", "//xla/stream_executor:stream_executor_h", "//xla/stream_executor/gpu:gpu_test_kernels", + "//xla/tsl/platform:status_matchers", + "//xla/tsl/platform:statusor", + "//xla/tsl/platform:test", "@com_google_googletest//:gtest_main", - "@tsl//tsl/platform:status_matchers", - "@tsl//tsl/platform:statusor", - "@tsl//tsl/platform:test", ], ) @@ -309,13 +310,13 @@ cc_library( "//xla/stream_executor:stream_executor_h", "//xla/stream_executor/gpu:gpu_diagnostics_header", "//xla/stream_executor/platform:initialize", + "//xla/tsl/platform:errors", + "//xla/tsl/platform:status", "@com_google_absl//absl/log", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", "@com_google_absl//absl/synchronization", - "@tsl//tsl/platform:errors", - "@tsl//tsl/platform:status", ], alwayslink = True, # Registers itself with the PlatformManager. ) @@ -349,11 +350,11 @@ cc_library( ":rocblas_if_static", ":rocm_executor", ":rocm_platform_id", + "//xla/tsl/platform:env", "//xla/tsl/util:determinism_for_kernels", "@local_config_rocm//rocm:rocm_headers", "@tsl//tsl/platform", "@tsl//tsl/platform:dso_loader", - "@tsl//tsl/platform:env", ], alwayslink = True, ) @@ -388,6 +389,10 @@ cc_library( "//xla/stream_executor/gpu:gpu_blas_lt", "//xla/stream_executor/gpu:gpu_helpers_header", "//xla/stream_executor/platform:initialize", + "//xla/tsl/platform:errors", + "//xla/tsl/platform:logging", + "//xla/tsl/platform:macros", + "//xla/tsl/platform:statusor", "//xla/tsl/util:determinism_hdr_lib", "@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/status", @@ -398,10 +403,6 @@ cc_library( "@com_google_absl//absl/types:span", "@eigen_archive//:eigen3", "@local_config_rocm//rocm:rocm_headers", - "@tsl//tsl/platform:errors", - "@tsl//tsl/platform:logging", - "@tsl//tsl/platform:macros", - "@tsl//tsl/platform:statusor", ], alwayslink = True, ) @@ -441,12 +442,12 @@ cc_library( "//xla/stream_executor:device_memory", "//xla/stream_executor:gpu_solver_context", "//xla/stream_executor:stream", + "//xla/tsl/platform:errors", + "//xla/tsl/platform:logging", "@com_google_absl//absl/memory", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@local_config_rocm//rocm:rocm_headers", - "@tsl//tsl/platform:errors", - "@tsl//tsl/platform:logging", ], ) @@ -472,11 +473,11 @@ cc_library( "//xla/stream_executor:stream_executor_h", "//xla/stream_executor/gpu:gpu_helpers_header", "//xla/stream_executor/platform:initialize", + "//xla/tsl/platform:env", + "//xla/tsl/platform:logging", "@com_google_absl//absl/status", "@local_config_rocm//rocm:rocm_headers", "@tsl//tsl/platform:dso_loader", - "@tsl//tsl/platform:env", - "@tsl//tsl/platform:logging", ], alwayslink = True, ) @@ -524,6 +525,11 @@ cc_library( "//xla/stream_executor:stream", "//xla/stream_executor:stream_executor_h", "//xla/stream_executor/platform:initialize", + "//xla/tsl/platform:errors", + "//xla/tsl/platform:logging", + "//xla/tsl/platform:macros", + "//xla/tsl/platform:status", + "//xla/tsl/platform:statusor", "//xla/tsl/util:determinism_for_kernels", "//xla/tsl/util:env_var", "@com_google_absl//absl/algorithm:container", @@ -536,12 +542,7 @@ cc_library( "@com_google_absl//absl/types:span", "@eigen_archive//:eigen3", "@local_config_rocm//rocm:rocm_headers", - "@tsl//tsl/platform:errors", "@tsl//tsl/platform:hash", - "@tsl//tsl/platform:logging", - "@tsl//tsl/platform:macros", - "@tsl//tsl/platform:status", - "@tsl//tsl/platform:statusor", ], alwayslink = True, ) @@ -580,10 +581,10 @@ cc_library( ":hipsparse_if_static", ":rocm_executor", ":rocm_platform_id", + "//xla/tsl/platform:env", "@local_config_rocm//rocm:rocm_headers", "@tsl//tsl/platform", "@tsl//tsl/platform:dso_loader", - "@tsl//tsl/platform:env", ], alwayslink = True, ) @@ -611,9 +612,9 @@ cc_library( ":rocm_executor", ":rocm_platform_id", ":rocsolver_if_static", + "//xla/tsl/platform:env", "@local_config_rocm//rocm:rocm_headers", "@tsl//tsl/platform:dso_loader", - "@tsl//tsl/platform:env", ], alwayslink = True, ) @@ -640,9 +641,9 @@ cc_library( ":hipsolver_if_static", ":rocm_executor", ":rocm_platform_id", + "//xla/tsl/platform:env", "@local_config_rocm//rocm:rocm_headers", "@tsl//tsl/platform:dso_loader", - "@tsl//tsl/platform:env", ], alwayslink = True, ) @@ -690,6 +691,10 @@ cc_library( "//xla/stream_executor:stream", "//xla/stream_executor/gpu:gpu_blas_lt", "//xla/stream_executor/gpu:gpu_helpers_header", + "//xla/tsl/platform:env", + "//xla/tsl/platform:errors", + "//xla/tsl/platform:status", + "//xla/tsl/platform:statusor", "@com_google_absl//absl/log", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", @@ -698,11 +703,7 @@ cc_library( "@eigen_archive//:eigen3", "@local_config_rocm//rocm:rocm_headers", "@tsl//tsl/platform:dso_loader", - "@tsl//tsl/platform:env", - "@tsl//tsl/platform:errors", "@tsl//tsl/platform:ml_dtypes", - "@tsl//tsl/platform:status", - "@tsl//tsl/platform:statusor", ] + if_static([ ":hipblaslt_if_static", ]), @@ -727,12 +728,12 @@ cc_library( "//xla/stream_executor:device_memory", "//xla/stream_executor:host_or_device_scalar", "//xla/stream_executor/gpu:gpu_blas_lt", + "//xla/tsl/platform:env", + "//xla/tsl/platform:errors", + "//xla/tsl/platform:status", "@com_google_absl//absl/status", "@local_config_rocm//rocm:rocm_headers", "@tsl//tsl/platform:dso_loader", - "@tsl//tsl/platform:env", - "@tsl//tsl/platform:errors", - "@tsl//tsl/platform:status", ], ) @@ -748,10 +749,10 @@ cc_library( ":hipblas_lt_header", ":rocblas_plugin", "//xla/stream_executor:blas", + "//xla/tsl/platform:errors", "@com_google_absl//absl/log", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", - "@tsl//tsl/platform:errors", ], ) @@ -778,10 +779,10 @@ cc_library( ":rocm_executor", ":rocm_platform_id", ":roctracer_if_static", + "//xla/tsl/platform:env", "@local_config_rocm//rocm:rocm_headers", "@tsl//tsl/platform", "@tsl//tsl/platform:dso_loader", - "@tsl//tsl/platform:env", ], alwayslink = True, ) @@ -871,11 +872,11 @@ cc_test( deps = [ ":rocm_version_parser", "//xla/stream_executor:semantic_version", + "//xla/tsl/platform:status_matchers", + "//xla/tsl/platform:test", "@com_google_absl//absl/status", "@com_google_googletest//:gtest_main", "@local_config_rocm//rocm:rocm_headers", - "@tsl//tsl/platform:status_matchers", - "@tsl//tsl/platform:test", ], ) @@ -901,6 +902,8 @@ cc_library( "//xla/stream_executor:platform", "//xla/stream_executor:stream", "//xla/stream_executor:stream_common", + "//xla/tsl/platform:errors", + "//xla/tsl/platform:statusor", "@com_google_absl//absl/base", "@com_google_absl//absl/functional:any_invocable", "@com_google_absl//absl/log", @@ -911,8 +914,6 @@ cc_library( "@com_google_absl//absl/strings:str_format", "@com_google_absl//absl/strings:string_view", "@local_config_rocm//rocm:rocm_headers", - "@tsl//tsl/platform:errors", - "@tsl//tsl/platform:statusor", ], ) @@ -934,13 +935,13 @@ xla_test( "//xla/stream_executor:platform_manager", "//xla/stream_executor:typed_kernel_factory", "//xla/stream_executor/gpu:gpu_test_kernels", + "//xla/tsl/platform:status_matchers", + "//xla/tsl/platform:statusor", + "//xla/tsl/platform:test", "@com_google_absl//absl/status", "@com_google_absl//absl/strings:string_view", "@com_google_absl//absl/types:span", "@com_google_googletest//:gtest_main", - "@tsl//tsl/platform:status_matchers", - "@tsl//tsl/platform:statusor", - "@tsl//tsl/platform:test", ], ) @@ -960,13 +961,13 @@ cc_library( "//xla/stream_executor:event_based_timer", "//xla/stream_executor:stream", "//xla/stream_executor:stream_executor_h", + "//xla/tsl/platform:errors", + "//xla/tsl/platform:statusor", "@com_google_absl//absl/log", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/time", "@local_config_rocm//rocm:rocm_headers", - "@tsl//tsl/platform:errors", - "@tsl//tsl/platform:statusor", ], ) @@ -988,12 +989,12 @@ xla_test( "//xla/stream_executor:stream", "//xla/stream_executor:typed_kernel_factory", "//xla/stream_executor/gpu:gpu_test_kernels_rocm", + "//xla/tsl/platform:status_matchers", + "//xla/tsl/platform:statusor", + "//xla/tsl/platform:test", "@com_google_absl//absl/status", "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", - "@tsl//tsl/platform:status_matchers", - "@tsl//tsl/platform:statusor", - "@tsl//tsl/platform:test", ], ) @@ -1023,12 +1024,12 @@ cc_test( ], deps = [ ":rocm_status", + "//xla/tsl/platform:status_matchers", + "//xla/tsl/platform:test", "@com_google_absl//absl/status", "@com_google_absl//absl/strings:string_view", "@com_google_googletest//:gtest_main", "@local_config_rocm//rocm:rocm_headers", - "@tsl//tsl/platform:status_matchers", - "@tsl//tsl/platform:test", ], ) @@ -1055,6 +1056,9 @@ cc_library( "//xla/stream_executor/gpu:gpu_command_buffer", "//xla/stream_executor/gpu:scoped_gpu_graph_exec", "//xla/stream_executor/gpu:scoped_update_mode", + "//xla/tsl/platform:env", + "//xla/tsl/platform:errors", + "//xla/tsl/platform:statusor", "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/base", "@com_google_absl//absl/functional:any_invocable", @@ -1066,8 +1070,5 @@ cc_library( "@com_google_absl//absl/types:span", "@local_config_rocm//rocm:rocm_headers", "@tsl//tsl/platform:casts", - "@tsl//tsl/platform:env", - "@tsl//tsl/platform:errors", - "@tsl//tsl/platform:statusor", ], ) diff --git a/xla/stream_executor/rocm/hip_blas_lt.cc b/xla/stream_executor/rocm/hip_blas_lt.cc index 2d709f42c4a70..318f25f902342 100644 --- a/xla/stream_executor/rocm/hip_blas_lt.cc +++ b/xla/stream_executor/rocm/hip_blas_lt.cc @@ -50,11 +50,11 @@ limitations under the License. #include "xla/stream_executor/rocm/rocm_blas.h" #include "xla/stream_executor/scratch_allocator.h" #include "xla/stream_executor/stream.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/statusor.h" #include "xla/types.h" #include "xla/util.h" -#include "tsl/platform/errors.h" #include "tsl/platform/ml_dtypes.h" -#include "tsl/platform/statusor.h" #define SET_ATTR(setter, handle, attr, value) \ ToStatus(setter(handle, attr, &value, sizeof(decltype(value))), #setter) diff --git a/xla/stream_executor/rocm/hip_blas_utils.h b/xla/stream_executor/rocm/hip_blas_utils.h index 267e2a31050ce..5d849ac1fa3e4 100644 --- a/xla/stream_executor/rocm/hip_blas_utils.h +++ b/xla/stream_executor/rocm/hip_blas_utils.h @@ -21,7 +21,7 @@ limitations under the License. #include "absl/status/status.h" #include "xla/stream_executor/blas.h" #include "xla/stream_executor/rocm/hipblaslt_wrapper.h" -#include "tsl/platform/errors.h" +#include "xla/tsl/platform/errors.h" #if TF_HIPBLASLT diff --git a/xla/stream_executor/rocm/hipblaslt_wrapper.h b/xla/stream_executor/rocm/hipblaslt_wrapper.h index 09cac948f0d18..dfd7811c8eb13 100644 --- a/xla/stream_executor/rocm/hipblaslt_wrapper.h +++ b/xla/stream_executor/rocm/hipblaslt_wrapper.h @@ -25,8 +25,8 @@ limitations under the License. #else #include "rocm/include/hipblaslt.h" #endif +#include "xla/tsl/platform/env.h" #include "tsl/platform/dso_loader.h" -#include "tsl/platform/env.h" namespace stream_executor { namespace wrap { diff --git a/xla/stream_executor/rocm/hipsolver_wrapper.h b/xla/stream_executor/rocm/hipsolver_wrapper.h index 10bd1cb767a31..f5edb57bb96a4 100644 --- a/xla/stream_executor/rocm/hipsolver_wrapper.h +++ b/xla/stream_executor/rocm/hipsolver_wrapper.h @@ -29,8 +29,8 @@ limitations under the License. #include "rocm/include/hipsolver.h" #endif +#include "xla/tsl/platform/env.h" #include "tsl/platform/dso_loader.h" -#include "tsl/platform/env.h" namespace stream_executor { namespace wrap { diff --git a/xla/stream_executor/rocm/hipsparse_wrapper.h b/xla/stream_executor/rocm/hipsparse_wrapper.h index 213ef7e2e7c89..2a85ed02041ac 100644 --- a/xla/stream_executor/rocm/hipsparse_wrapper.h +++ b/xla/stream_executor/rocm/hipsparse_wrapper.h @@ -27,8 +27,8 @@ limitations under the License. #else #include "rocm/include/hipsparse.h" #endif +#include "xla/tsl/platform/env.h" #include "tsl/platform/dso_loader.h" -#include "tsl/platform/env.h" #include "tsl/platform/platform.h" namespace stream_executor { diff --git a/xla/stream_executor/rocm/rocblas_wrapper.h b/xla/stream_executor/rocm/rocblas_wrapper.h index 8b706c22adfe3..1344eb53973c0 100644 --- a/xla/stream_executor/rocm/rocblas_wrapper.h +++ b/xla/stream_executor/rocm/rocblas_wrapper.h @@ -25,8 +25,8 @@ limitations under the License. #include "rocm/include/rocblas/rocblas.h" #include "rocm/rocm_config.h" +#include "xla/tsl/platform/env.h" #include "tsl/platform/dso_loader.h" -#include "tsl/platform/env.h" #include "tsl/platform/platform.h" namespace stream_executor { diff --git a/xla/stream_executor/rocm/rocm_blas.cc b/xla/stream_executor/rocm/rocm_blas.cc index bc9138efbb08f..ec08822ec236b 100644 --- a/xla/stream_executor/rocm/rocm_blas.cc +++ b/xla/stream_executor/rocm/rocm_blas.cc @@ -53,11 +53,11 @@ limitations under the License. #include "xla/stream_executor/rocm/rocm_platform_id.h" #include "xla/stream_executor/scratch_allocator.h" #include "xla/stream_executor/stream_executor.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/logging.h" +#include "xla/tsl/platform/macros.h" +#include "xla/tsl/platform/statusor.h" #include "xla/tsl/util/determinism.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/logging.h" -#include "tsl/platform/macros.h" -#include "tsl/platform/statusor.h" using tsl::OpDeterminismRequired; diff --git a/xla/stream_executor/rocm/rocm_command_buffer.cc b/xla/stream_executor/rocm/rocm_command_buffer.cc index dd3a50ce4ee99..db8ddb42f0ac5 100644 --- a/xla/stream_executor/rocm/rocm_command_buffer.cc +++ b/xla/stream_executor/rocm/rocm_command_buffer.cc @@ -45,10 +45,10 @@ limitations under the License. #include "xla/stream_executor/rocm/rocm_kernel.h" #include "xla/stream_executor/rocm/rocm_status.h" #include "xla/stream_executor/stream_executor.h" +#include "xla/tsl/platform/env.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/statusor.h" #include "tsl/platform/casts.h" -#include "tsl/platform/env.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/statusor.h" namespace stream_executor::gpu { namespace { diff --git a/xla/stream_executor/rocm/rocm_context.cc b/xla/stream_executor/rocm/rocm_context.cc index 9addbb1a29af4..983e57420909e 100644 --- a/xla/stream_executor/rocm/rocm_context.cc +++ b/xla/stream_executor/rocm/rocm_context.cc @@ -30,8 +30,8 @@ limitations under the License. #include "xla/stream_executor/gpu/scoped_activate_context.h" #include "xla/stream_executor/rocm/rocm_driver_wrapper.h" #include "xla/stream_executor/rocm/rocm_status.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/status.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/status.h" namespace stream_executor::gpu { diff --git a/xla/stream_executor/rocm/rocm_diagnostics.cc b/xla/stream_executor/rocm/rocm_diagnostics.cc index 569bfa36c3bf7..dfcf07645e260 100644 --- a/xla/stream_executor/rocm/rocm_diagnostics.cc +++ b/xla/stream_executor/rocm/rocm_diagnostics.cc @@ -34,8 +34,8 @@ limitations under the License. #include "absl/strings/str_format.h" #include "absl/strings/str_split.h" #include "absl/strings/strip.h" +#include "xla/tsl/platform/logging.h" #include "tsl/platform/host_info.h" -#include "tsl/platform/logging.h" namespace stream_executor { namespace rocm { diff --git a/xla/stream_executor/rocm/rocm_dnn.cc b/xla/stream_executor/rocm/rocm_dnn.cc index 6b46805ce3840..a8312e5104ebc 100644 --- a/xla/stream_executor/rocm/rocm_dnn.cc +++ b/xla/stream_executor/rocm/rocm_dnn.cc @@ -61,18 +61,18 @@ limitations under the License. #include "xla/stream_executor/scratch_allocator.h" #include "xla/stream_executor/stream.h" #include "xla/stream_executor/stream_executor.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/logging.h" +#include "xla/tsl/platform/macros.h" +#include "xla/tsl/platform/status.h" +#include "xla/tsl/platform/statusor.h" #include "xla/tsl/util/determinism.h" #include "xla/tsl/util/env_var.h" -#include "tsl/platform/errors.h" #include "tsl/platform/hash.h" -#include "tsl/platform/logging.h" -#include "tsl/platform/macros.h" -#include "tsl/platform/status.h" -#include "tsl/platform/statusor.h" #ifndef PLATFORM_GOOGLE +#include "xla/tsl/platform/env.h" #include "tsl/platform/dso_loader.h" -#include "tsl/platform/env.h" #endif namespace { diff --git a/xla/stream_executor/rocm/rocm_driver_wrapper.h b/xla/stream_executor/rocm/rocm_driver_wrapper.h index a90af297c60ff..4ea404b2f0314 100644 --- a/xla/stream_executor/rocm/rocm_driver_wrapper.h +++ b/xla/stream_executor/rocm/rocm_driver_wrapper.h @@ -22,8 +22,8 @@ limitations under the License. #include "rocm/include/hip/hip_runtime.h" #include "rocm/rocm_config.h" +#include "xla/tsl/platform/env.h" #include "tsl/platform/dso_loader.h" -#include "tsl/platform/env.h" namespace stream_executor { namespace wrap { diff --git a/xla/stream_executor/rocm/rocm_event.cc b/xla/stream_executor/rocm/rocm_event.cc index 1eb63f12df2a1..aa7e62e5190df 100644 --- a/xla/stream_executor/rocm/rocm_event.cc +++ b/xla/stream_executor/rocm/rocm_event.cc @@ -29,8 +29,8 @@ limitations under the License. #include "xla/stream_executor/event.h" #include "xla/stream_executor/rocm/rocm_driver_wrapper.h" #include "xla/stream_executor/rocm/rocm_status.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/statusor.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/statusor.h" namespace stream_executor { namespace gpu { diff --git a/xla/stream_executor/rocm/rocm_event_test.cc b/xla/stream_executor/rocm/rocm_event_test.cc index 5f1db89a8b52e..16146a825aefd 100644 --- a/xla/stream_executor/rocm/rocm_event_test.cc +++ b/xla/stream_executor/rocm/rocm_event_test.cc @@ -23,8 +23,8 @@ limitations under the License. #include "xla/stream_executor/platform.h" #include "xla/stream_executor/platform_manager.h" #include "xla/stream_executor/rocm/rocm_platform_id.h" -#include "tsl/platform/statusor.h" -#include "tsl/platform/test.h" +#include "xla/tsl/platform/statusor.h" +#include "xla/tsl/platform/test.h" namespace stream_executor::gpu { namespace { diff --git a/xla/stream_executor/rocm/rocm_executor.cc b/xla/stream_executor/rocm/rocm_executor.cc index 068c44b9575c2..6e26809494793 100644 --- a/xla/stream_executor/rocm/rocm_executor.cc +++ b/xla/stream_executor/rocm/rocm_executor.cc @@ -85,6 +85,7 @@ limitations under the License. #include "xla/stream_executor/stream_executor.h" #include "xla/tsl/platform/env.h" #include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/logging.h" #include "xla/tsl/platform/statusor.h" #include "xla/tsl/platform/threadpool.h" #include "tsl/platform/casts.h" diff --git a/xla/stream_executor/rocm/rocm_fft.cc b/xla/stream_executor/rocm/rocm_fft.cc index 74830d3360b91..cb69633296aa2 100644 --- a/xla/stream_executor/rocm/rocm_fft.cc +++ b/xla/stream_executor/rocm/rocm_fft.cc @@ -33,11 +33,11 @@ limitations under the License. #include "xla/stream_executor/scratch_allocator.h" #include "xla/stream_executor/stream.h" #include "xla/stream_executor/stream_executor.h" -#include "tsl/platform/logging.h" +#include "xla/tsl/platform/logging.h" #ifndef PLATFORM_GOOGLE +#include "xla/tsl/platform/env.h" #include "tsl/platform/dso_loader.h" -#include "tsl/platform/env.h" #endif namespace stream_executor { diff --git a/xla/stream_executor/rocm/rocm_kernel.h b/xla/stream_executor/rocm/rocm_kernel.h index a252666ea7d1a..9c15fe9a77754 100644 --- a/xla/stream_executor/rocm/rocm_kernel.h +++ b/xla/stream_executor/rocm/rocm_kernel.h @@ -30,7 +30,7 @@ limitations under the License. #include "xla/stream_executor/kernel.h" #include "xla/stream_executor/launch_dim.h" #include "xla/stream_executor/stream_executor.h" -#include "tsl/platform/logging.h" +#include "xla/tsl/platform/logging.h" namespace stream_executor::gpu { diff --git a/xla/stream_executor/rocm/rocm_kernel_test.cc b/xla/stream_executor/rocm/rocm_kernel_test.cc index 7f810e10dbfb1..815995ccf5b58 100644 --- a/xla/stream_executor/rocm/rocm_kernel_test.cc +++ b/xla/stream_executor/rocm/rocm_kernel_test.cc @@ -22,9 +22,9 @@ limitations under the License. #include "xla/stream_executor/platform.h" #include "xla/stream_executor/platform_manager.h" #include "xla/stream_executor/stream_executor.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 stream_executor::gpu { namespace { diff --git a/xla/stream_executor/rocm/rocm_platform.cc b/xla/stream_executor/rocm/rocm_platform.cc index 22c4456a8a097..2d812e23ddbc8 100644 --- a/xla/stream_executor/rocm/rocm_platform.cc +++ b/xla/stream_executor/rocm/rocm_platform.cc @@ -31,8 +31,8 @@ limitations under the License. #include "xla/stream_executor/rocm/rocm_executor.h" #include "xla/stream_executor/rocm/rocm_platform_id.h" #include "xla/stream_executor/rocm/rocm_status.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/status.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/status.h" namespace stream_executor { namespace gpu { diff --git a/xla/stream_executor/rocm/rocm_solver_context.cc b/xla/stream_executor/rocm/rocm_solver_context.cc index e2c9dffc4df1f..11e7e3f5ec50f 100644 --- a/xla/stream_executor/rocm/rocm_solver_context.cc +++ b/xla/stream_executor/rocm/rocm_solver_context.cc @@ -29,9 +29,9 @@ limitations under the License. #include "xla/stream_executor/device_memory.h" #include "xla/stream_executor/gpu_solver_context.h" #include "xla/stream_executor/stream.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/logging.h" #include "xla/util.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/logging.h" namespace stream_executor { diff --git a/xla/stream_executor/rocm/rocm_status_test.cc b/xla/stream_executor/rocm/rocm_status_test.cc index 1ad8fb99a3759..e7bf2b42998de 100644 --- a/xla/stream_executor/rocm/rocm_status_test.cc +++ b/xla/stream_executor/rocm/rocm_status_test.cc @@ -20,8 +20,8 @@ limitations under the License. #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "rocm/include/hip/hip_runtime.h" -#include "tsl/platform/status_matchers.h" -#include "tsl/platform/test.h" +#include "xla/tsl/platform/status_matchers.h" +#include "xla/tsl/platform/test.h" namespace stream_executor::gpu { namespace { diff --git a/xla/stream_executor/rocm/rocm_stream.cc b/xla/stream_executor/rocm/rocm_stream.cc index c7ab3c462ca32..e16e54d5344c2 100644 --- a/xla/stream_executor/rocm/rocm_stream.cc +++ b/xla/stream_executor/rocm/rocm_stream.cc @@ -45,8 +45,8 @@ limitations under the License. #include "xla/stream_executor/rocm/rocm_kernel.h" #include "xla/stream_executor/rocm/rocm_status.h" #include "xla/stream_executor/stream.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/statusor.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/statusor.h" namespace stream_executor::gpu { namespace { diff --git a/xla/stream_executor/rocm/rocm_stream_test.cc b/xla/stream_executor/rocm/rocm_stream_test.cc index a291f6c609cb4..ce272494b6489 100644 --- a/xla/stream_executor/rocm/rocm_stream_test.cc +++ b/xla/stream_executor/rocm/rocm_stream_test.cc @@ -39,9 +39,9 @@ limitations under the License. #include "xla/stream_executor/rocm/rocm_executor.h" #include "xla/stream_executor/rocm/rocm_platform_id.h" #include "xla/stream_executor/typed_kernel_factory.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 stream_executor { namespace gpu { diff --git a/xla/stream_executor/rocm/rocm_timer.cc b/xla/stream_executor/rocm/rocm_timer.cc index 784f6f67ba14b..31b1c11514b15 100644 --- a/xla/stream_executor/rocm/rocm_timer.cc +++ b/xla/stream_executor/rocm/rocm_timer.cc @@ -29,8 +29,8 @@ limitations under the License. #include "xla/stream_executor/rocm/rocm_status.h" #include "xla/stream_executor/stream.h" #include "xla/stream_executor/stream_executor.h" -#include "tsl/platform/errors.h" -#include "tsl/platform/statusor.h" +#include "xla/tsl/platform/errors.h" +#include "xla/tsl/platform/statusor.h" namespace stream_executor::gpu { namespace { diff --git a/xla/stream_executor/rocm/rocm_timer_test.cc b/xla/stream_executor/rocm/rocm_timer_test.cc index cbe8b38c6c9df..8562c701206a4 100644 --- a/xla/stream_executor/rocm/rocm_timer_test.cc +++ b/xla/stream_executor/rocm/rocm_timer_test.cc @@ -34,9 +34,9 @@ limitations under the License. #include "xla/stream_executor/rocm/rocm_platform_id.h" #include "xla/stream_executor/stream.h" #include "xla/stream_executor/typed_kernel_factory.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 stream_executor::gpu { namespace { diff --git a/xla/stream_executor/rocm/rocm_version_parser_test.cc b/xla/stream_executor/rocm/rocm_version_parser_test.cc index 1859aed034fbd..aae4b70ca025e 100644 --- a/xla/stream_executor/rocm/rocm_version_parser_test.cc +++ b/xla/stream_executor/rocm/rocm_version_parser_test.cc @@ -20,8 +20,8 @@ limitations under the License. #include "absl/status/status.h" #include "rocm/include/hip/hip_version.h" #include "xla/stream_executor/semantic_version.h" -#include "tsl/platform/status_matchers.h" -#include "tsl/platform/test.h" +#include "xla/tsl/platform/status_matchers.h" +#include "xla/tsl/platform/test.h" namespace stream_executor { diff --git a/xla/stream_executor/rocm/rocsolver_wrapper.h b/xla/stream_executor/rocm/rocsolver_wrapper.h index 173f4e5faeaa9..ef6bbfaefdbe5 100644 --- a/xla/stream_executor/rocm/rocsolver_wrapper.h +++ b/xla/stream_executor/rocm/rocsolver_wrapper.h @@ -27,8 +27,8 @@ limitations under the License. #include "rocm/include/rocsolver.h" #endif +#include "xla/tsl/platform/env.h" #include "tsl/platform/dso_loader.h" -#include "tsl/platform/env.h" namespace stream_executor { namespace wrap { diff --git a/xla/stream_executor/rocm/roctracer_wrapper.h b/xla/stream_executor/rocm/roctracer_wrapper.h index 871df2cb9e2f6..4ba18752824f0 100644 --- a/xla/stream_executor/rocm/roctracer_wrapper.h +++ b/xla/stream_executor/rocm/roctracer_wrapper.h @@ -28,8 +28,8 @@ limitations under the License. #else #include "rocm/include/roctracer/roctracer_hcc.h" #endif +#include "xla/tsl/platform/env.h" #include "tsl/platform/dso_loader.h" -#include "tsl/platform/env.h" #include "tsl/platform/platform.h" namespace stream_executor {