Merge pull request #28 from AdhocMan/rocm_6_0_fix

Fix for ROCm 6.0 and switch to C++17
eth-cscs · Apr 10, 2024 · 208efb0 · 208efb0
2 parents 62790dd + 183b1f9
commit 208efb0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,7 +22,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
 endif()
 
 # set language and standard
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
 
 # Get GNU standard install prefixes
 include(GNUInstallDirs)

diff --git a/src/gpu_util/gpu_blas_api.hpp b/src/gpu_util/gpu_blas_api.hpp
@@ -38,7 +38,12 @@
 #include <cublas_v2.h>
 
 #elif defined(SPLA_ROCM)
+
+#if __has_include(<rocblas/rocblas.h>)
+#include <rocblas/rocblas.h>
+#else
 #include <rocblas.h>
+#endif
 
 #else
 #error Either SPLA_CUDA or SPLA_ROCM must be defined!