support rocm>=6

ornladios · Jun 27, 2024 · b8661a6 · b8661a6
1 parent 43dd72c
commit b8661a6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/everything.yml b/.github/workflows/everything.yml
@@ -161,7 +161,7 @@ jobs:
             compiler: gcc8
             shared: static
             parallel: serial
-          - os: ubuntu20.04
+          - os: ubuntu22.04
             compiler: rocm
             parallel: serial
             constrains: build_only

diff --git a/...ci/cmake/ci-ubuntu20.04-rocm-serial.cmake → ...ci/cmake/ci-ubuntu22.04-rocm-serial.cmake b/...ci/cmake/ci-ubuntu20.04-rocm-serial.cmake → ...ci/cmake/ci-ubuntu22.04-rocm-serial.cmake
@@ -1,14 +1,15 @@
 set(ENV{CC}  gcc)
 set(ENV{CXX} g++)
 set(ENV{FC}  gfortran)
+set(ENV{FC}  )
 
 execute_process(
   COMMAND "python3-config" "--prefix"
   OUTPUT_VARIABLE PY_ROOT
   OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 set(dashboard_cache "
-BUILD_TESTING:BOOL=ON
+BUILD_TESTING:BOOL=OFF
 ADIOS2_BUILD_EXAMPLES:BOOL=ON
 
 ADIOS2_USE_BZip2:BOOL=ON
@@ -34,6 +35,8 @@ CMAKE_CXX_COMPILER_LAUNCHER=ccache
 CMAKE_C_FLAGS:STRING=-Wall
 CMAKE_CXX_FLAGS:STRING=-Wall
 CMAKE_Fortran_FLAGS:STRING=-Wall
+OpenMP_gomp_LIBRARY:FILEPATH=/spack/var/spack/environments/adios2-ci-serial/.spack-env/view/lib/libgomp.so.1
+AMDGPU_TARGETS=gfx906
 ")
 
 set(CTEST_CMAKE_GENERATOR "Ninja")

diff --git a/scripts/ci/setup-run/ci-ubuntu20.04-rocm.sh → scripts/ci/setup-run/ci-ubuntu22.04-rocm.sh b/scripts/ci/setup-run/ci-ubuntu20.04-rocm.sh → scripts/ci/setup-run/ci-ubuntu22.04-rocm.sh
diff --git a/source/adios2/helper/kokkos/adiosKokkos.cpp b/source/adios2/helper/kokkos/adiosKokkos.cpp
@@ -85,7 +85,11 @@ bool IsGPUbuffer(const void *ptr)
     hipError_t ret;
     hipPointerAttribute_t attr;
     ret = hipPointerGetAttributes(&attr, ptr);
+#if defined(ROCM_VERSION_MAJOR) && ROCM_VERSION_MAJOR < 6
     if (ret == hipSuccess && attr.memoryType == hipMemoryTypeDevice)
+#else
+    if (ret == hipSuccess && attr.type == hipMemoryTypeDevice)
+#endif
     {
         return true;
     }