[ROCm] Support ROCm 6 (#17256)

This PR updates some ROCm modules in order to support ROCm 6.
apache · Aug 9, 2024 · 6ae2961 · 6ae2961
1 parent b40a02c
commit 6ae2961
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/cmake/modules/ROCM.cmake b/cmake/modules/ROCM.cmake
@@ -23,6 +23,7 @@ if(ROCM_FOUND)
   # avoid global retrigger of cmake
   include_directories(SYSTEM ${ROCM_INCLUDE_DIRS})
   add_definitions(-D__HIP_PLATFORM_HCC__=1)
+  add_definitions(-D__HIP_PLATFORM_AMD__=1)
 endif(ROCM_FOUND)
 
 

diff --git a/cmake/utils/FindRCCL.cmake b/cmake/utils/FindRCCL.cmake
@@ -32,7 +32,7 @@ macro(find_rccl use_rccl)
     find_path(RCCL_INCLUDE_DIR NAMES rccl.h)
     find_library(RCCL_LIBRARY NAMES rccl)
   else()
-    find_path(RCCL_INCLUDE_DIR NAMES rccl.h HINTS ${use_rccl} ${use_rccl}/include)
+    find_path(RCCL_INCLUDE_DIR NAMES rccl.h HINTS ${use_rccl} ${use_rccl}/include ${use_rccl}/include/rccl)
     find_library(RCCL_LIBRARY NAMES rccl HINTS ${use_rccl} ${use_rccl}/lib)
   endif()
   include(FindPackageHandleStandardArgs)

diff --git a/src/runtime/rocm/rocm_device_api.cc b/src/runtime/rocm/rocm_device_api.cc
@@ -113,7 +113,7 @@ class ROCMDeviceAPI final : public DeviceAPI {
       case kGcnArch: {
         hipDeviceProp_t prop;
         ROCM_CALL(hipGetDeviceProperties(&prop, device.device_id));
-        *rv = prop.gcnArch;
+        *rv = prop.gcnArchName;
         return;
       }
       case kApiVersion: {