Initial changes to support ROCm 6.0

- [TODO] cleanup is pending

Author: pruthvistony-amd

cmake/public/LoadHIP.cmake

@@ -17,9 +17,9 @@ else()
   set(HIP_PATH $ENV{HIP_PATH})
 endif()
 
-if(NOT EXISTS ${HIP_PATH})
-  return()
-endif()
+#if(NOT EXISTS ${HIP_PATH})
+#  return()
+#endif()
 
 # HCC_PATH
 if(NOT DEFINED ENV{HCC_PATH})
@@ -155,7 +155,7 @@ endif()
 message("Building PyTorch for GPU arch: ${PYTORCH_ROCM_ARCH}")
 
 # Add HIP to the CMAKE Module Path
-set(CMAKE_MODULE_PATH ${HIP_PATH}/cmake ${CMAKE_MODULE_PATH})
+set(CMAKE_MODULE_PATH ${ROCM_PATH}/lib/cmake/hip ${CMAKE_MODULE_PATH})
 
 macro(find_package_and_print_version PACKAGE_NAME)
   find_package("${PACKAGE_NAME}" ${ARGN})
@@ -167,15 +167,35 @@ find_package_and_print_version(HIP 1.0)
 
 if(HIP_FOUND)
   set(PYTORCH_FOUND_HIP TRUE)
+  set(FOUND_ROCM_VERSION_H FALSE)
+
+  if(EXISTS ${ROCM_PATH}/.info/version-dev)
+    # ROCM < 4.5, we don't have the header api file, use flat file
+    file(READ "${ROCM_PATH}/.info/version-dev" ROCM_VERSION_DEV_RAW)
+    message("\n***** ROCm version from ${ROCM_PATH}/.info/version-dev ****\n")
+  endif()
+
+  set(PROJECT_RANDOM_BINARY_DIR "${PROJECT_BINARY_DIR}")
+  set(file "${PROJECT_BINARY_DIR}/detect_rocm_version.cc")
 
   # Find ROCM version for checks
   # ROCM 5.0 and later will have header api for version management
   if(EXISTS ${ROCM_INCLUDE_DIRS}/rocm_version.h)
-
-    set(PROJECT_RANDOM_BINARY_DIR "${PROJECT_BINARY_DIR}")
-    set(file "${PROJECT_BINARY_DIR}/detect_rocm_version.cc")
+    set(FOUND_ROCM_VERSION_H TRUE)
     file(WRITE ${file} ""
       "#include <rocm_version.h>\n"
+      )
+  elseif(EXISTS ${ROCM_INCLUDE_DIRS}/rocm-core/rocm_version.h)
+    set(FOUND_ROCM_VERSION_H TRUE)
+    file(WRITE ${file} ""
+      "#include <rocm-core/rocm_version.h>\n"
+      )
+  else()
+    message("********************* rocm_version.h couldnt be found ******************\n")
+  endif()
+
+  if(FOUND_ROCM_VERSION_H)
+    file(APPEND ${file} ""
       "#include <cstdio>\n"
 
       "#ifndef ROCM_VERSION_PATCH\n"
@@ -201,11 +221,6 @@ if(HIP_FOUND)
     message(STATUS "Caffe2: Header version is: " ${rocm_version_from_header})
     set(ROCM_VERSION_DEV_RAW ${rocm_version_from_header})
     message("\n***** ROCm version from rocm_version.h ****\n")
-
-  # ROCM < 4.5, we don't have the header api file, use flat file
-  else()
-    file(READ "${ROCM_PATH}/.info/version-dev" ROCM_VERSION_DEV_RAW)
-    message("\n***** ROCm version from ${ROCM_PATH}/.info/version-dev ****\n")
   endif()
 
   string(REGEX MATCH "^([0-9]+)\.([0-9]+)\.([0-9]+).*$" ROCM_VERSION_DEV_MATCH ${ROCM_VERSION_DEV_RAW})
@@ -244,6 +259,23 @@ if(HIP_FOUND)
   set(CMAKE_HCC_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
   ### Remove setting of Flags when FindHIP.CMake PR #558 is accepted.###
 
+  if(ROCM_VERSION_DEV VERSION_GREATER_EQUAL "6.0.0")
+    set(HIP_PATH ${ROCM_PATH})
+    set(ROCRAND_PATH ${ROCM_PATH})
+    set(HIPRAND_PATH ${ROCM_PATH})
+    set(ROCBLAS_PATH ${ROCM_PATH})
+    set(MIOPEN_PATH ${ROCM_PATH})
+    set(ROCFFT_PATH ${ROCM_PATH})
+    set(HIPFFT_PATH ${ROCM_PATH})
+    set(HIPSPARSE_PATH ${ROCM_PATH})
+    set(RCCL_PATH ${ROCM_PATH})
+    set(ROCPRIM_PATH ${ROCM_PATH})
+    set(HIPCUB_PATH ${ROCM_PATH})
+    set(ROCTHRUST_PATH ${ROCM_PATH})
+    set(HIPSOLVER_PATH ${ROCM_PATH})
+    set(ROCTRACER_PATH ${ROCM_PATH})
+  endif()
+
   # As of ROCm 5.1.x, all *.cmake files are under /opt/rocm/lib/cmake/<package>
   if(ROCM_VERSION_DEV VERSION_GREATER_EQUAL "5.1.0")
     set(hip_DIR ${ROCM_PATH}/lib/cmake/hip)
@@ -283,6 +315,7 @@ if(HIP_FOUND)
     set(hipsolver_DIR ${HIPSOLVER_PATH}/lib/cmake/hipsolver)
   endif()
 
+
   find_package_and_print_version(hip REQUIRED)
   find_package_and_print_version(hsa-runtime64 REQUIRED)
   find_package_and_print_version(amd_comgr REQUIRED)