mirror of
https://github.com/dmlc/dgl.git
synced 2026-06-04 19:44:23 +08:00
[Bug] Update thrust to the new monorepo CCCL (#6166)
Co-authored-by: Rhett Ying <85214957+Rhett-Ying@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
9c36ddcd2b
commit
99fcdfece7
6
.gitmodules
vendored
6
.gitmodules
vendored
@@ -19,9 +19,9 @@
|
||||
[submodule "third_party/libxsmm"]
|
||||
path = third_party/libxsmm
|
||||
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"]
|
||||
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
|
||||
|
||||
@@ -142,10 +142,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")
|
||||
cuda_include_directories(BEFORE "${CMAKE_SOURCE_DIR}/third_party/thrust/dependencies/libcudacxx/include")
|
||||
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
|
||||
|
||||
@@ -60,13 +60,13 @@ target_link_libraries(${LIB_GRAPHBOLT_NAME} "${TORCH_LIBRARIES}")
|
||||
|
||||
if(USE_CUDA)
|
||||
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 THRUST_NS_QUALIFIER=thrust)
|
||||
target_include_directories(${LIB_GRAPHBOLT_NAME} PRIVATE
|
||||
"../third_party/thrust"
|
||||
"../third_party/thrust/dependencies/cub"
|
||||
"../third_party/thrust/dependencies/libcudacxx/include")
|
||||
"../third_party/cccl/thrust"
|
||||
"../third_party/cccl/cub"
|
||||
"../third_party/cccl/libcudacxx/include")
|
||||
endif()
|
||||
|
||||
# The Torch CMake configuration only sets up the path for the MKL library when
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
#include <c10/core/ScalarType.h>
|
||||
#include <c10/cuda/CUDAStream.h>
|
||||
|
||||
#include <cub/cub.cuh>
|
||||
#include <numeric>
|
||||
|
||||
#include "../index_select.h"
|
||||
#include "./common.h"
|
||||
#include "./utils.h"
|
||||
#include "cub/cub.cuh"
|
||||
|
||||
namespace graphbolt {
|
||||
namespace ops {
|
||||
|
||||
1
third_party/cccl
vendored
Submodule
1
third_party/cccl
vendored
Submodule
Submodule third_party/cccl added at 4d5c181cb4
1
third_party/thrust
vendored
1
third_party/thrust
vendored
Submodule third_party/thrust deleted from 02931a309b
Reference in New Issue
Block a user