From cc0334197708bdfbea24ff40a44ceab942b81054 Mon Sep 17 00:00:00 2001 From: Serhii Yaskovets <yaskovet@mpi-cbg.de> Date: Tue, 1 Aug 2023 15:30:58 +0200 Subject: [PATCH] Move parallel primitives lib: moderngpu to CUB (define GPU_HOST_DEVICE) --- src/Vector/cuda/map_vector_sparse_cuda_kernels.cuh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Vector/cuda/map_vector_sparse_cuda_kernels.cuh b/src/Vector/cuda/map_vector_sparse_cuda_kernels.cuh index 0079b452..7d641d3a 100644 --- a/src/Vector/cuda/map_vector_sparse_cuda_kernels.cuh +++ b/src/Vector/cuda/map_vector_sparse_cuda_kernels.cuh @@ -218,7 +218,7 @@ struct smax_ template<typename type_t, unsigned int blockLength> struct maximum_block_t : public std::binary_function<type_t, type_t, type_t> { - __forceinline__ __device__ __host__ type_t operator()(type_t a, type_t b) const { + GPU_HOST_DEVICE type_t operator()(type_t a, type_t b) const { type_t res; for (int i=0; i<blockLength; ++i) { @@ -294,7 +294,7 @@ struct smin_ template<typename type_t, unsigned int blockLength> struct minimum_block_t : public std::binary_function<type_t, type_t, type_t> { - __forceinline__ __device__ __host__ type_t operator()(type_t a, type_t b) const { + GPU_HOST_DEVICE type_t operator()(type_t a, type_t b) const { type_t res; for (int i=0; i<blockLength; ++i) { @@ -343,7 +343,7 @@ struct smin_block_ template<typename type_t> struct bitwiseOr_t : public std::binary_function<type_t, type_t, type_t> { - __forceinline__ __device__ __host__ type_t operator()(type_t a, type_t b) const { + GPU_HOST_DEVICE type_t operator()(type_t a, type_t b) const { return a|b; } }; -- GitLab