Merge pull request #45154 from ROCmSoftwarePlatform:google_upstream_r…

…ocm_misc_updates_201124

PiperOrigin-RevId: 344211203
Change-Id: I269866da3d130137209edc1b488e5fd1330895ef

third_party/gpus/find_rocm_config.py

@@ -138,7 +138,15 @@ def miopen_version_numbers(path):
 def _find_rocblas_config(rocm_install_path):
 
   def rocblas_version_numbers(path):
-    version_file = os.path.join(path, "rocblas/include/rocblas-version.h")
+    possible_version_files = [
+        "rocblas/include/rocblas-version.h",  # ROCm 3.7 and prior
+        "rocblas/include/internal/rocblas-version.h",  # ROCm 3.8
+    ]
+    version_file = None
+    for f in possible_version_files:
+      version_file = os.path.join(path, f)
+      if os.path.exists(version_file):
+        break
     if not os.path.exists(version_file):
       raise ConfigError(
           'rocblas version file "{}" not found'.format(version_file))
@@ -254,11 +262,11 @@ def find_rocm_config():
   result.update(_find_rocm_config(rocm_install_path))
   result.update(_find_hipruntime_config(rocm_install_path))
   result.update(_find_miopen_config(rocm_install_path))
-  # result.update(_find_rocblas_config(rocm_install_path))
-  # result.update(_find_rocrand_config(rocm_install_path))
-  # result.update(_find_rocfft_config(rocm_install_path))
-  # result.update(_find_roctracer_config(rocm_install_path))
-  # result.update(_find_hipsparse_config(rocm_install_path))
+  result.update(_find_rocblas_config(rocm_install_path))
+  result.update(_find_rocrand_config(rocm_install_path))
+  result.update(_find_rocfft_config(rocm_install_path))
+  result.update(_find_roctracer_config(rocm_install_path))
+  result.update(_find_hipsparse_config(rocm_install_path))
 
   return result
 

third_party/gpus/find_rocm_config.py.gz.base64

@@ -1 +1 @@
-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
+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