Skip to content

Commit 804129b

Browse files
authored
Merge pull request #158 from psychocoderHPC/topic-hipSupport
add HIP support
2 parents a39629c + ec8e515 commit 804129b

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

lib/isaac.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2257,6 +2257,8 @@ namespace isaac
22572257
ISAAC_IDX_TYPE((readbackViewport[3] + blockSize.y - 1) / blockSize.y)};
22582258
#if ALPAKA_ACC_GPU_CUDA_ENABLED == 1
22592259
if(boost::mpl::not_<boost::is_same<T_Acc, alpaka::AccGpuCudaRt<T_AccDim, ISAAC_IDX_TYPE>>>::value)
2260+
#elif ALPAKA_ACC_GPU_HIP_ENABLED == 1
2261+
if(boost::mpl::not_<boost::is_same<T_Acc, alpaka::AccGpuHipRt<T_AccDim, ISAAC_IDX_TYPE>>>::value)
22602262
#endif
22612263
{
22622264
gridSize.x = ISAAC_IDX_TYPE(readbackViewport[2]);

lib/isaac/isaac_defines.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
#define ISAAC_Z_NEAR 0.002f
5454
#define ISAAC_Z_FAR 100.0f
5555

56-
#ifdef __CUDACC__
56+
#if(BOOST_LANG_CUDA || BOOST_LANG_HIP)
5757
# define ISAAC_HOST_DEVICE_INLINE ALPAKA_FN_HOST_ACC __forceinline__
5858
#else
5959
# define ISAAC_HOST_DEVICE_INLINE ALPAKA_FN_HOST_ACC inline
@@ -64,7 +64,7 @@
6464

6565
#define ISAAC_DEVICE_INLINE ISAAC_HOST_DEVICE_INLINE
6666

67-
#ifdef __CUDACC__
67+
#if(BOOST_LANG_CUDA || BOOST_LANG_HIP)
6868
# define ISAAC_DEVICE __device__ __host__
6969
#else
7070
# define ISAAC_DEVICE
@@ -78,7 +78,7 @@
7878

7979
#define ISAAC_CONSTANT ALPAKA_STATIC_ACC_MEM_CONSTANT
8080

81-
#ifdef __CUDACC__
81+
#if(BOOST_LANG_CUDA || BOOST_LANG_HIP)
8282
# define ISAAC_MAX max
8383
# define ISAAC_MIN min
8484
#else

lib/isaac/isaac_kernel.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ namespace isaac
5353

5454
#if ALPAKA_ACC_GPU_CUDA_ENABLED == 1
5555
if(boost::mpl::not_<boost::is_same<T_Acc, alpaka::AccGpuCudaRt<Dim, ISAAC_IDX_TYPE>>>::value)
56+
#elif ALPAKA_ACC_GPU_HIP_ENABLED == 1
57+
if(boost::mpl::not_<boost::is_same<T_Acc, alpaka::AccGpuHipRt<Dim, ISAAC_IDX_TYPE>>>::value)
5658
#endif
5759
{
5860
blockSize = isaac_size3(1);

0 commit comments

Comments
 (0)