From 39c35389ffc73b67e4bbca3be39a06c53c59b4b1 Mon Sep 17 00:00:00 2001
From: Takanori Nakane <nakane.t@gmail.com>
Date: Thu, 22 Dec 2022 14:37:21 +0900
Subject: [PATCH] Compatibility with CUDA 12.0 (fixes issue #939)

---
 src/acc/cuda/cuda_utils_cub.cuh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/acc/cuda/cuda_utils_cub.cuh b/src/acc/cuda/cuda_utils_cub.cuh
index cf6ede21b..e3ee9860f 100644
--- a/src/acc/cuda/cuda_utils_cub.cuh
+++ b/src/acc/cuda/cuda_utils_cub.cuh
@@ -1,6 +1,7 @@
 #ifndef CUDA_UTILS_CUB_CUH_
 #define CUDA_UTILS_CUB_CUH_
 
+#include <cuda.h> // For CUDA_VERSION
 #include <cuda_runtime.h>
 #include "src/acc/cuda/cuda_settings.h"
 #include "src/acc/cuda/cuda_mem_utils.h"
@@ -13,11 +14,15 @@
 	#undef CubLog
 #endif
 
-#define CUB_NS_QUALIFIER ::cub // for compatibility with CUDA 11.5
-#include "src/acc/cuda/cub/device/device_radix_sort.cuh"
-#include "src/acc/cuda/cub/device/device_reduce.cuh"
-#include "src/acc/cuda/cub/device/device_scan.cuh"
-#include "src/acc/cuda/cub/device/device_select.cuh"
+#if (CUDA_VERSION >= 11000)
+    #include <cub/cub.cuh>
+#else
+    // #define CUB_NS_QUALIFIER ::cub // for compatibility with CUDA 11.5
+    #include "src/acc/cuda/cub/device/device_radix_sort.cuh"
+    #include "src/acc/cuda/cub/device/device_reduce.cuh"
+    #include "src/acc/cuda/cub/device/device_scan.cuh"
+    #include "src/acc/cuda/cub/device/device_select.cuh"
+#endif
 
 namespace CudaKernels
 {