Fix hipblas path (#705)

* hipblas.h --> hipblas/hipblas.h * Guard hipblas path change with a condition on HIP_VERSION. --------- Co-authored-by: Nicholson Koukpaizan <[email protected]>
LLNL · Jan 24, 2025 · 6708066 · 6708066
1 parent 74aab8b
commit 6708066
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/cmake/FindHiopHipLibraries.cmake b/cmake/FindHiopHipLibraries.cmake
@@ -39,7 +39,7 @@ target_include_directories(Hipblas INTERFACE ${HIPBLAS_INCLUDE_DIR})
 include(FindHiopMagma)
 target_link_libraries(Magma    INTERFACE Hipblas)
 
-target_include_directories(hiop_hip INTERFACE ${ROCM_PATH}/hipfft/include)
+target_include_directories(hiop_hip INTERFACE ${ROCM_PATH}/include/hipfft)
 target_link_libraries(hiop_hip INTERFACE
   hip::hiprand roc::rocrand
   hip::hipfft

diff --git a/src/LinAlg/VectorHipKernels.cpp b/src/LinAlg/VectorHipKernels.cpp
@@ -53,7 +53,11 @@
  */
 #include "VectorHipKernels.hpp"
 #include <hip/hip_runtime.h>
+#if HIP_VERSION >= 50200000
+#include <hipblas/hipblas.h>
+#else
 #include <hipblas.h>
+#endif
 
 #include <thrust/device_ptr.h>
 #include <thrust/device_vector.h>

diff --git a/src/LinAlg/hiopVectorHip.cpp b/src/LinAlg/hiopVectorHip.cpp
@@ -59,7 +59,11 @@
 #include "VectorHipKernels.hpp"
 #include "MathKernelsHip.hpp"
 #include <hip/hip_runtime.h>
+#if HIP_VERSION >= 50200000
+#include <hipblas/hipblas.h>
+#else
 #include <hipblas.h>
+#endif
 
 #include "hiopVectorPar.hpp"
 

diff --git a/src/LinAlg/hiopVectorHip.hpp b/src/LinAlg/hiopVectorHip.hpp
@@ -65,7 +65,11 @@
 
 #include "hiopVector.hpp"
 
+#if HIP_VERSION >= 50200000
+#include <hipblas/hipblas.h>
+#else
 #include <hipblas.h>
+#endif
 
 namespace hiop
 {