CFD/hypre
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backward compatible ROCm header update. (#680)

Browse Source 
Backward compatible update to rocm header include path.

Co-authored-by: Paul T. Bauman <ptbauman@gmail.com>
This commit is contained in:
Ruipeng Li 2022-07-15 23:28:00 -07:00 committed by GitHub
parent 5eb84ec1db
commit 22d35a4d09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/config/configure.in
View File

@ -2365,10 +2365,10 @@ AS_IF([test x"$hypre_using_hip" == x"yes"],
CUFLAGS="${HIPCPPFLAGS} ${HIPCXXFLAGS}" CUFLAGS="${HIPCPPFLAGS} ${HIPCXXFLAGS}"
fi fi
dnl rocThrust depends on rocPrim so we need both for Thrust on AMD GPUs. dnl PB: ROCm 5.2 parked all the headers in /opt/rocm-X.Y/include so we just point there.
dnl This is backwards compatible to previous ROCm versions.
dnl These are header-only so no linking needed. dnl These are header-only so no linking needed.
HYPRE_HIP_INCL="-I${HYPRE_ROCM_PREFIX}/rocthrust/include" HYPRE_HIP_INCL="-I${HYPRE_ROCM_PREFIX}/include"
HYPRE_HIP_INCL="${HYPRE_HIP_INCL} -I${HYPRE_ROCM_PREFIX}/rocprim/include"
dnl HIP library dnl HIP library
HYPRE_HIP_LIBS="-L${HYPRE_ROCM_PREFIX}/lib -lamdhip64" HYPRE_HIP_LIBS="-L${HYPRE_ROCM_PREFIX}/lib -lamdhip64"
@ -2377,7 +2377,6 @@ AS_IF([test x"$hypre_using_hip" == x"yes"],
AS_IF([test x"$hypre_using_rocsparse" == x"yes"], AS_IF([test x"$hypre_using_rocsparse" == x"yes"],
[AC_DEFINE(HYPRE_USING_ROCSPARSE, 1, [rocSPARSE being used]) [AC_DEFINE(HYPRE_USING_ROCSPARSE, 1, [rocSPARSE being used])
HYPRE_HIP_LIBS="${HYPRE_HIP_LIBS} -lrocsparse" HYPRE_HIP_LIBS="${HYPRE_HIP_LIBS} -lrocsparse"
HYPRE_HIP_INCL="${HYPRE_HIP_INCL} -I${HYPRE_ROCM_PREFIX}/rocsparse/include"
]) ])
dnl Note rocSPARSE requires rocBLAS, so this is only controlling dnl Note rocSPARSE requires rocBLAS, so this is only controlling
@ -2385,20 +2384,17 @@ AS_IF([test x"$hypre_using_hip" == x"yes"],
dnl So we don't need to add any extra libs or anything. dnl So we don't need to add any extra libs or anything.
AS_IF([test x"$hypre_using_rocblas" == x"yes"], AS_IF([test x"$hypre_using_rocblas" == x"yes"],
[AC_DEFINE(HYPRE_USING_ROCBLAS, 1, [rocBLAS being used]) [AC_DEFINE(HYPRE_USING_ROCBLAS, 1, [rocBLAS being used])
HYPRE_HIP_INCL="${HYPRE_HIP_INCL} -I${HYPRE_ROCM_PREFIX}/rocblas/include"
]) ])
dnl rocRAND: random number generation on AMD GPUs dnl rocRAND: random number generation on AMD GPUs
AS_IF([test x"$hypre_using_rocrand" == x"yes"], AS_IF([test x"$hypre_using_rocrand" == x"yes"],
[AC_DEFINE(HYPRE_USING_ROCRAND, 1, [rocRAND being used]) [AC_DEFINE(HYPRE_USING_ROCRAND, 1, [rocRAND being used])
HYPRE_HIP_LIBS="${HYPRE_HIP_LIBS} -lrocrand" HYPRE_HIP_LIBS="${HYPRE_HIP_LIBS} -lrocrand"
HYPRE_HIP_INCL="${HYPRE_HIP_INCL} -I${HYPRE_ROCM_PREFIX}/rocrand/include"
]) ])
dnl rocTX tracing API dnl rocTX tracing API
AS_IF([test x"$hypre_using_gpu_profiling" == x"yes"], AS_IF([test x"$hypre_using_gpu_profiling" == x"yes"],
[AC_DEFINE(HYPRE_USING_ROCTX, 1, [Define to 1 if using AMD rocTX profiling]) [AC_DEFINE(HYPRE_USING_ROCTX, 1, [Define to 1 if using AMD rocTX profiling])
HYPRE_HIP_INCL="${HYPRE_HIP_INCL} -I${HYPRE_ROCM_PREFIX}/roctracer/include"
HYPRE_HIP_LIBS="${HYPRE_HIP_LIBS} -lroctx64" HYPRE_HIP_LIBS="${HYPRE_HIP_LIBS} -lroctx64"
]) ])

7
src/configure vendored
View File

@ -9282,8 +9282,7 @@ fi
CUFLAGS="${HIPCPPFLAGS} ${HIPCXXFLAGS}" CUFLAGS="${HIPCPPFLAGS} ${HIPCXXFLAGS}"
fi fi
HYPRE_HIP_INCL="-I${HYPRE_ROCM_PREFIX}/rocthrust/include" HYPRE_HIP_INCL="-I${HYPRE_ROCM_PREFIX}/include"
HYPRE_HIP_INCL="${HYPRE_HIP_INCL} -I${HYPRE_ROCM_PREFIX}/rocprim/include"
HYPRE_HIP_LIBS="-L${HYPRE_ROCM_PREFIX}/lib -lamdhip64" HYPRE_HIP_LIBS="-L${HYPRE_ROCM_PREFIX}/lib -lamdhip64"
@ -9292,7 +9291,6 @@ fi
$as_echo "#define HYPRE_USING_ROCSPARSE 1" >>confdefs.h $as_echo "#define HYPRE_USING_ROCSPARSE 1" >>confdefs.h
HYPRE_HIP_LIBS="${HYPRE_HIP_LIBS} -lrocsparse" HYPRE_HIP_LIBS="${HYPRE_HIP_LIBS} -lrocsparse"
HYPRE_HIP_INCL="${HYPRE_HIP_INCL} -I${HYPRE_ROCM_PREFIX}/rocsparse/include"
fi fi
@ -9300,7 +9298,6 @@ fi
$as_echo "#define HYPRE_USING_ROCBLAS 1" >>confdefs.h $as_echo "#define HYPRE_USING_ROCBLAS 1" >>confdefs.h
HYPRE_HIP_INCL="${HYPRE_HIP_INCL} -I${HYPRE_ROCM_PREFIX}/rocblas/include"
fi fi
@ -9309,7 +9306,6 @@ fi
$as_echo "#define HYPRE_USING_ROCRAND 1" >>confdefs.h $as_echo "#define HYPRE_USING_ROCRAND 1" >>confdefs.h
HYPRE_HIP_LIBS="${HYPRE_HIP_LIBS} -lrocrand" HYPRE_HIP_LIBS="${HYPRE_HIP_LIBS} -lrocrand"
HYPRE_HIP_INCL="${HYPRE_HIP_INCL} -I${HYPRE_ROCM_PREFIX}/rocrand/include"
fi fi
@ -9317,7 +9313,6 @@ fi
$as_echo "#define HYPRE_USING_ROCTX 1" >>confdefs.h $as_echo "#define HYPRE_USING_ROCTX 1" >>confdefs.h
HYPRE_HIP_INCL="${HYPRE_HIP_INCL} -I${HYPRE_ROCM_PREFIX}/roctracer/include"
HYPRE_HIP_LIBS="${HYPRE_HIP_LIBS} -lroctx64" HYPRE_HIP_LIBS="${HYPRE_HIP_LIBS} -lroctx64"
fi fi

2
src/utilities/_hypre_utilities.hpp
View File

@ -119,7 +119,7 @@ using hypre_DeviceItem = void*;
#endif #endif
#if defined(HYPRE_USING_ROCRAND) #if defined(HYPRE_USING_ROCRAND)
#include <rocrand.h> #include <rocrand/rocrand.h>
#endif #endif
#endif // defined(HYPRE_USING_HIP) #endif // defined(HYPRE_USING_HIP)

2
src/utilities/device_utils.h
View File

@ -62,7 +62,7 @@ using hypre_DeviceItem = void*;
#endif #endif
#if defined(HYPRE_USING_ROCRAND) #if defined(HYPRE_USING_ROCRAND)
#include <rocrand.h> #include <rocrand/rocrand.h>
#endif #endif
#endif // defined(HYPRE_USING_HIP) #endif // defined(HYPRE_USING_HIP)

2
src/utilities/nvtx.c
View File

@ -9,7 +9,7 @@
#if defined(HYPRE_USING_ROCTX) #if defined(HYPRE_USING_ROCTX)
#include "hip/hip_runtime_api.h" #include "hip/hip_runtime_api.h"
#include "roctx.h" #include "roctracer/roctx.h"
#endif #endif
#if defined(HYPRE_USING_NVTX) #if defined(HYPRE_USING_NVTX)