From 82f17abe31de0bb3deeadbdf7e4cb5cf4fca6c2f Mon Sep 17 00:00:00 2001
From: wenzexu <ricol.xwz@outlook.com>
Date: Tue, 22 Oct 2024 20:26:34 +1100
Subject: [PATCH] fix: remove custom CUB include and disable CUB version check

- Removed `-I./cub` from the `INCLUDES` as CUB is now included in the CUDA Toolkit.
- Added `-DTHRUST_IGNORE_CUB_VERSION_CHECK` flag to bypass the Thrust and CUB version check.
---
 cuda/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cuda/Makefile b/cuda/Makefile
index a3c22d2..307494a 100644
--- a/cuda/Makefile
+++ b/cuda/Makefile
@@ -12,7 +12,7 @@
 NVCC       ?= nvcc
 GCC        ?= g++
 CCFLAGS    ?= -O3 -Wall -Wextra -Wno-unused-parameter
-NVCCFLAGS  ?= -O3 -D_FORCE_INLINES -Xcompiler -Wall
+NVCCFLAGS  ?= -O3 -D_FORCE_INLINES -Xcompiler -Wall -DTHRUST_IGNORE_CUB_VERSION_CHECK
 BIN         =../bin/cuda
 UNITBIN     =../unittests/bin/cuda
 
@@ -73,7 +73,7 @@ ifdef CUSTOMFLAGS
 endif
 
 # Common includes and paths for CUDA. This assumes the CUDA toolkit is in PATH
-INCLUDES      := -I. -I./cub -I${JNI_INCLUDE} -I${JNI_PLATFORM_INCLUDE}
+INCLUDES      := -I. -I${JNI_INCLUDE} -I${JNI_PLATFORM_INCLUDE}
 NVCCLDFLAGS   := -L. -L$(BIN) -lcuda -lcudart
 
 .PHONY: all clean test