PR #17858: [ROCm] Fix build brake caused by missing dso_loader.h incl…

…udes Imported from GitHub PR #17858 The issue was introduced here -> b30b420#diff-923ec2612240244a60ae28c17f798a7daeccbab84a8e9de9efd7ba96c311c763L115 Some of the ROCm files need `dso_loader.h`. Copybara import of the project: -- 3853105 by Milica Makevic <[email protected]>: Return dso_loader.h includes for ROCm Merging this change closes #17858 FUTURE_COPYBARA_INTEGRATE_REVIEW=#17858 from ROCm:ci_hotfix_241002 3853105 PiperOrigin-RevId: 681479175
openxla · Oct 2, 2024 · 101e5f7 · 101e5f7
1 parent 91587de
commit 101e5f7
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 1 deletion.
diff --git a/xla/stream_executor/rocm/BUILD b/xla/stream_executor/rocm/BUILD
@@ -76,6 +76,7 @@ cc_library(
         "//xla/stream_executor/gpu:gpu_driver_header",
         "//xla/stream_executor/gpu:scoped_activate_context",
         "//xla/stream_executor/platform",
+        "//xla/stream_executor/platform:dso_loader",
         "@com_google_absl//absl/base",
         "@com_google_absl//absl/container:inlined_vector",
         "@com_google_absl//absl/container:node_hash_map",
@@ -350,6 +351,7 @@ cc_library(
         ":rocm_executor",
         ":rocm_platform_id",
         "//xla/stream_executor/platform",
+        "//xla/stream_executor/platform:dso_loader",
         "//xla/tsl/util:determinism_for_kernels",
         "@local_config_rocm//rocm:rocm_headers",
         "@tsl//tsl/platform",
@@ -444,6 +446,7 @@ cc_library(
         "//xla/stream_executor/gpu:gpu_stream_header",
         "//xla/stream_executor/gpu:scoped_activate_context",
         "//xla/stream_executor/platform",
+        "//xla/stream_executor/platform:dso_loader",
         "@local_config_rocm//rocm:rocm_headers",
         "@tsl//tsl/platform:env",
         "@tsl//tsl/platform:logging",
@@ -599,6 +602,7 @@ cc_library(
         ":rocm_platform_id",
         ":rocsolver_if_static",
         "//xla/stream_executor/platform",
+        "//xla/stream_executor/platform:dso_loader",
         "@local_config_rocm//rocm:rocm_headers",
         "@tsl//tsl/platform:env",
     ],
@@ -634,6 +638,7 @@ cc_library(
         ":rocm_executor",
         ":rocm_platform_id",
         "//xla/stream_executor/platform",
+        "//xla/stream_executor/platform:dso_loader",
         "@local_config_rocm//rocm:rocm_headers",
         "@tsl//tsl/platform:env",
     ],
@@ -783,6 +788,7 @@ cc_library(
         ":rocm_platform_id",
         ":roctracer_if_static",
         "//xla/stream_executor/platform",
+        "//xla/stream_executor/platform:dso_loader",
         "@local_config_rocm//rocm:rocm_headers",
         "@tsl//tsl/platform",
         "@tsl//tsl/platform:env",

diff --git a/xla/stream_executor/rocm/hipblaslt_wrapper.h b/xla/stream_executor/rocm/hipblaslt_wrapper.h
@@ -27,6 +27,7 @@ limitations under the License.
 #else
 #include "rocm/include/hipblaslt.h"
 #endif
+#include "xla/stream_executor/platform/dso_loader.h"
 #include "xla/stream_executor/platform/port.h"
 #include "tsl/platform/env.h"
 

diff --git a/xla/stream_executor/rocm/hipsolver_wrapper.h b/xla/stream_executor/rocm/hipsolver_wrapper.h
@@ -29,6 +29,7 @@ limitations under the License.
 
 #include "rocm/include/hipsolver.h"
 #endif
+#include "xla/stream_executor/platform/dso_loader.h"
 #include "xla/stream_executor/platform/port.h"
 #include "tsl/platform/env.h"
 

diff --git a/xla/stream_executor/rocm/rocblas_wrapper.h b/xla/stream_executor/rocm/rocblas_wrapper.h
@@ -25,6 +25,7 @@ limitations under the License.
 
 #include "rocm/include/rocblas/rocblas.h"
 #include "rocm/rocm_config.h"
+#include "xla/stream_executor/platform/dso_loader.h"
 #include "xla/stream_executor/platform/port.h"
 #include "tsl/platform/env.h"
 #include "tsl/platform/platform.h"

diff --git a/xla/stream_executor/rocm/rocm_dnn.cc b/xla/stream_executor/rocm/rocm_dnn.cc
@@ -36,6 +36,7 @@ limitations under the License.
 #include "xla/stream_executor/gpu/gpu_executor.h"
 #include "xla/stream_executor/gpu/gpu_stream.h"
 #include "xla/stream_executor/gpu/scoped_activate_context.h"
+#include "xla/stream_executor/platform/dso_loader.h"
 #include "xla/stream_executor/platform/initialize.h"
 #include "xla/stream_executor/plugin_registry.h"
 #include "xla/stream_executor/rocm/rocm_diagnostics.h"

diff --git a/xla/stream_executor/rocm/rocm_driver_wrapper.h b/xla/stream_executor/rocm/rocm_driver_wrapper.h
@@ -24,6 +24,7 @@ limitations under the License.
 
 #include "rocm/include/hip/hip_runtime.h"
 #include "rocm/rocm_config.h"
+#include "xla/stream_executor/platform/dso_loader.h"
 #include "xla/stream_executor/platform/port.h"
 #include "tsl/platform/env.h"
 

diff --git a/xla/stream_executor/rocm/rocm_fft.cc b/xla/stream_executor/rocm/rocm_fft.cc
@@ -22,6 +22,7 @@ limitations under the License.
 #include "xla/stream_executor/gpu/gpu_helpers.h"
 #include "xla/stream_executor/gpu/gpu_stream.h"
 #include "xla/stream_executor/gpu/scoped_activate_context.h"
+#include "xla/stream_executor/platform/dso_loader.h"
 #include "xla/stream_executor/platform/initialize.h"
 #include "xla/stream_executor/platform/port.h"
 #include "xla/stream_executor/plugin_registry.h"

diff --git a/xla/stream_executor/rocm/rocsolver_wrapper.h b/xla/stream_executor/rocm/rocsolver_wrapper.h
@@ -26,7 +26,7 @@ limitations under the License.
 #else
 #include "rocm/include/rocsolver.h"
 #endif
-
+#include "xla/stream_executor/platform/dso_loader.h"
 #include "xla/stream_executor/platform/port.h"
 #include "tsl/platform/env.h"
 

diff --git a/xla/stream_executor/rocm/roctracer_wrapper.h b/xla/stream_executor/rocm/roctracer_wrapper.h
@@ -28,6 +28,7 @@ limitations under the License.
 #else
 #include "rocm/include/roctracer/roctracer_hcc.h"
 #endif
+#include "xla/stream_executor/platform/dso_loader.h"
 #include "xla/stream_executor/platform/port.h"
 #include "tsl/platform/env.h"
 #include "tsl/platform/platform.h"