Merge pull request tensorflow#1504 from ROCmSoftwarePlatform/deven/up…

…date_rocm_version_discovery

Update the discovery of ROCM version information from a ROCm install.

third_party/gpus/find_rocm_config.py

@@ -69,10 +69,10 @@ def _get_header_version(path, name):
 
 def _find_rocm_config(rocm_install_path):
 
-  def rocm_version_numbers(path):
+  def rocm_version_numbers_pre_rocm45(path):
     version_file = os.path.join(path, ".info/version-dev")
     if not os.path.exists(version_file):
-      raise ConfigError('ROCm version file "{}" not found'.format(version_file))
+      raise ConfigError('ROCm version file "{}" not found.'.format(version_file))
     version_numbers = []
     with open(version_file) as f:
       version_string = f.read().strip()
@@ -82,7 +82,22 @@ def rocm_version_numbers(path):
     patch = int(version_numbers[2].split("-")[0])
     return major, minor, patch
 
-  major, minor, patch = rocm_version_numbers(rocm_install_path)
+  def rocm_version_numbers_post_rocm45(path):
+    version_file = os.path.join(path, "include/rocm/rocm_version.h")
+    if not os.path.exists(version_file):
+      raise ConfigError('ROCm version file "{}" not found. Trying an alternate approach to determine the ROCm version.'.format(version_file))
+    major = _get_header_version(version_file, "ROCM_VERSION_MAJOR")
+    minor = _get_header_version(version_file, "ROCM_VERSION_MINOR")
+    # ROCM_VERSION_PATCH is only defined in ROCm 5.0 and higher
+    patch = _get_header_version(version_file, "ROCM_VERSION_PATCH") if int(major) >= 5 else 0
+    return major, minor, patch
+
+  try:
+    major, minor, patch = rocm_version_numbers_post_rocm45(rocm_install_path)
+  except ConfigError as e:
+    sys.stderr.write("\nWARNING: {}\n\n".format(str(e)))
+    major, minor, patch = rocm_version_numbers_pre_rocm45(rocm_install_path)
+    pass
 
   rocm_config = {
       "rocm_version_number": _get_composite_version_number(major, minor, patch)

third_party/gpus/find_rocm_config.py.gz.base64

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