From f9543e63d64ceee3b4a8de458b2515da429fee95 Mon Sep 17 00:00:00 2001 From: Serhii Yaskovets <yaskovet@mpi-cbg.de> Date: Mon, 22 May 2023 10:27:42 +0200 Subject: [PATCH] Disable moderngpu [bug on A40] --- src/util/cuda/reduce_ofp.cuh | 5 +++-- src/util/cuda/scan_ofp.cuh | 3 ++- src/util/cuda/sort_ofp.cuh | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/util/cuda/reduce_ofp.cuh b/src/util/cuda/reduce_ofp.cuh index a9f2cf2e..6a4fb65f 100644 --- a/src/util/cuda/reduce_ofp.cuh +++ b/src/util/cuda/reduce_ofp.cuh @@ -27,7 +27,8 @@ #else // Here we have old CUDA #include "cub_old/cub.cuh" - #include "util/cuda/moderngpu/kernel_reduce.hxx" + //#include "util/cuda/moderngpu/kernel_reduce.hxx" + #define REDUCE_WITH_CUB #endif #include "util/cuda/ofp_context.hxx" @@ -98,4 +99,4 @@ namespace openfpm #endif -#endif /* REDUCE_OFP_HPP_ */ \ No newline at end of file +#endif /* REDUCE_OFP_HPP_ */ diff --git a/src/util/cuda/scan_ofp.cuh b/src/util/cuda/scan_ofp.cuh index 2ef79fdb..f91d64a1 100644 --- a/src/util/cuda/scan_ofp.cuh +++ b/src/util/cuda/scan_ofp.cuh @@ -27,7 +27,8 @@ #else // Here we have old CUDA #include "cub_old/cub.cuh" - #include "util/cuda/moderngpu/kernel_scan.hxx" + //#include "util/cuda/moderngpu/kernel_scan.hxx" + #define SCAN_WITH_CUB #endif #include "util/cuda/ofp_context.hxx" diff --git a/src/util/cuda/sort_ofp.cuh b/src/util/cuda/sort_ofp.cuh index e7939c60..52deb9d6 100644 --- a/src/util/cuda/sort_ofp.cuh +++ b/src/util/cuda/sort_ofp.cuh @@ -28,7 +28,8 @@ #else // Here we have old CUDA #include "cub_old/cub.cuh" - #include "util/cuda/moderngpu/kernel_mergesort.hxx" + //#include "util/cuda/moderngpu/kernel_mergesort.hxx" + #define SORT_WITH_CUB #endif #include "util/cuda/ofp_context.hxx" -- GitLab