Unverified Commit 99fcdfec authored by Muhammed Fatih BALIN's avatar Muhammed Fatih BALIN Committed by GitHub
Browse files

[Bug] Update thrust to the new monorepo CCCL (#6166)


Co-authored-by: default avatarRhett Ying <85214957+Rhett-Ying@users.noreply.github.com>
parent 9c36ddcd
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
[submodule "third_party/libxsmm"] [submodule "third_party/libxsmm"]
path = third_party/libxsmm path = third_party/libxsmm
url = https://github.com/hfp/libxsmm.git url = https://github.com/hfp/libxsmm.git
[submodule "third_party/thrust"]
path = third_party/thrust
url = https://github.com/NVIDIA/thrust.git
[submodule "third_party/pcg"] [submodule "third_party/pcg"]
path = third_party/pcg path = third_party/pcg
url = https://github.com/imneme/pcg-cpp.git url = https://github.com/imneme/pcg-cpp.git
[submodule "third_party/cccl"]
path = third_party/cccl
url = https://github.com/NVIDIA/cccl.git
...@@ -142,10 +142,10 @@ if(USE_CUDA) ...@@ -142,10 +142,10 @@ if(USE_CUDA)
# see https://github.com/NVIDIA/thrust/issues/1401 # see https://github.com/NVIDIA/thrust/issues/1401
add_definitions(-DTHRUST_CUB_WRAPPED_NAMESPACE=dgl) add_definitions(-DTHRUST_CUB_WRAPPED_NAMESPACE=dgl)
include(cmake/modules/CUDA.cmake) include(cmake/modules/CUDA.cmake)
message(STATUS "Use external CUB/Thrust library for a consistent API and performance.") message(STATUS "Use external CCCL 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/cccl/thrust")
cuda_include_directories(BEFORE "${CMAKE_SOURCE_DIR}/third_party/thrust/dependencies/cub") cuda_include_directories(BEFORE "${CMAKE_SOURCE_DIR}/third_party/cccl/cub")
cuda_include_directories(BEFORE "${CMAKE_SOURCE_DIR}/third_party/thrust/dependencies/libcudacxx/include") cuda_include_directories(BEFORE "${CMAKE_SOURCE_DIR}/third_party/cccl/libcudacxx/include")
endif(USE_CUDA) endif(USE_CUDA)
# initial variables # initial variables
......
...@@ -60,13 +60,13 @@ target_link_libraries(${LIB_GRAPHBOLT_NAME} "${TORCH_LIBRARIES}") ...@@ -60,13 +60,13 @@ target_link_libraries(${LIB_GRAPHBOLT_NAME} "${TORCH_LIBRARIES}")
if(USE_CUDA) if(USE_CUDA)
set_target_properties(${LIB_GRAPHBOLT_NAME} PROPERTIES CUDA_STANDARD 17) set_target_properties(${LIB_GRAPHBOLT_NAME} PROPERTIES CUDA_STANDARD 17)
message(STATUS "Use external CUB/Thrust library for a consistent API and performance for graphbolt.") message(STATUS "Use external CCCL library for a consistent API and performance for graphbolt.")
target_compile_definitions(${LIB_GRAPHBOLT_NAME} PRIVATE CUB_WRAPPED_NAMESPACE=graphbolt) target_compile_definitions(${LIB_GRAPHBOLT_NAME} PRIVATE CUB_WRAPPED_NAMESPACE=graphbolt)
target_compile_definitions(${LIB_GRAPHBOLT_NAME} PRIVATE THRUST_NS_QUALIFIER=thrust) target_compile_definitions(${LIB_GRAPHBOLT_NAME} PRIVATE THRUST_NS_QUALIFIER=thrust)
target_include_directories(${LIB_GRAPHBOLT_NAME} PRIVATE target_include_directories(${LIB_GRAPHBOLT_NAME} PRIVATE
"../third_party/thrust" "../third_party/cccl/thrust"
"../third_party/thrust/dependencies/cub" "../third_party/cccl/cub"
"../third_party/thrust/dependencies/libcudacxx/include") "../third_party/cccl/libcudacxx/include")
endif() endif()
# The Torch CMake configuration only sets up the path for the MKL library when # The Torch CMake configuration only sets up the path for the MKL library when
......
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
#include <c10/core/ScalarType.h> #include <c10/core/ScalarType.h>
#include <c10/cuda/CUDAStream.h> #include <c10/cuda/CUDAStream.h>
#include <cub/cub.cuh>
#include <numeric> #include <numeric>
#include "../index_select.h" #include "../index_select.h"
#include "./common.h" #include "./common.h"
#include "./utils.h" #include "./utils.h"
#include "cub/cub.cuh"
namespace graphbolt { namespace graphbolt {
namespace ops { namespace ops {
......
Subproject commit 4d5c181cb4e67b14e7d1fdeb45cf0104119bfb09
Subproject commit 02931a309bee769853088b79b4e3ab1c0bd2336c
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment