From 6e2c0f489ba4cfae4614d6f07da41e0ecd36b226 Mon Sep 17 00:00:00 2001
From: peizhou001 <110809584+peizhou001@users.noreply.github.com>
Date: Tue, 5 Dec 2023 17:21:03 +0800
Subject: [PATCH] use cccl (#6694)

---
 .gitmodules        | 6 +++---
 CMakeLists.txt     | 7 ++++---
 third_party/cccl   | 1 +
 third_party/thrust | 1 -
 4 files changed, 8 insertions(+), 7 deletions(-)
 create mode 160000 third_party/cccl
 delete mode 160000 third_party/thrust

diff --git a/.gitmodules b/.gitmodules
index f1d265748d37..70bfa0953978 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,9 +22,9 @@
 [submodule "third_party/tensorpipe"]
 	path = third_party/tensorpipe
 	url = https://github.com/pytorch/tensorpipe
-[submodule "third_party/thrust"]
-	path = third_party/thrust
-	url = https://github.com/NVIDIA/thrust.git
 [submodule "third_party/pcg"]
 	path = third_party/pcg
 	url = https://github.com/imneme/pcg-cpp.git
+[submodule "third_party/cccl"]
+	path = third_party/cccl
+	url = https://github.com/NVIDIA/cccl.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ffeba77b489..db39e48c35a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,9 +125,10 @@ if(USE_CUDA)
   # see https://github.com/NVIDIA/thrust/issues/1401
   add_definitions(-DTHRUST_CUB_WRAPPED_NAMESPACE=dgl)
   include(cmake/modules/CUDA.cmake)
-  message(STATUS "Use external CUB/Thrust library for a consistent API and performance.")
-  cuda_include_directories(BEFORE "${CMAKE_SOURCE_DIR}/third_party/thrust")
-  cuda_include_directories(BEFORE "${CMAKE_SOURCE_DIR}/third_party/thrust/dependencies/cub")
+  message(STATUS "Use external CCCL library for a consistent API and performance.")
+  cuda_include_directories(BEFORE "${CMAKE_SOURCE_DIR}/third_party/cccl/thrust")
+  cuda_include_directories(BEFORE "${CMAKE_SOURCE_DIR}/third_party/cccl/cub")
+  cuda_include_directories(BEFORE "${CMAKE_SOURCE_DIR}/third_party/cccl/libcudacxx/include")
 endif(USE_CUDA)
 
 # initial variables
diff --git a/third_party/cccl b/third_party/cccl
new file mode 160000
index 000000000000..4d5c181cb4e6
--- /dev/null
+++ b/third_party/cccl
@@ -0,0 +1 @@
+Subproject commit 4d5c181cb4e67b14e7d1fdeb45cf0104119bfb09
diff --git a/third_party/thrust b/third_party/thrust
deleted file mode 160000
index 6a3078c64cab..000000000000
--- a/third_party/thrust
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6a3078c64cab0e2f276340fa5dcafa0d758ed890