diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b8bbd2e0272..1fdb88d26176 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -312,7 +312,7 @@ endforeach() include_directories("include") include_directories("3rdparty/mshadow") -include_directories("3rdparty/cub") +include_directories("3rdparty/nvidia_cub") include_directories("3rdparty/tvm/nnvm/include") include_directories("3rdparty/tvm/include") include_directories("3rdparty/dmlc-core/include") @@ -494,7 +494,7 @@ list(APPEND CUDA ${MSHADOW_CUDASOURCE}) FILE(GLOB_RECURSE GROUP_SOURCE "src/*.cc" "3rdparty/tvm/nnvm/*.cc" "plugin/*.cc") FILE(GLOB_RECURSE GROUP_Include "src/*.h" "3rdparty/tvm/nnvm/*.h" "3rdparty/mshadow/mshadow/*.h" "plugin/*.h") FILE(GLOB_RECURSE GROUP_CUDA "src/*.cu" "src/*.cuh" "3rdparty/mshadow/mshadow/*.cuh" "plugin/*.cu" - "plugin/*.cuh" "3rdparty/cub/cub/*.cuh") + "plugin/*.cuh" "3rdparty/nvidia_cub/cub/*.cuh") assign_source_group("Source" ${GROUP_SOURCE}) assign_source_group("Include" ${GROUP_Include}) assign_source_group("CUDA" ${GROUP_CUDA}) diff --git a/LICENSE b/LICENSE index a8b57e583764..39fdc8e3894d 100644 --- a/LICENSE +++ b/LICENSE @@ -274,7 +274,7 @@ ******************************************************************************/ 2. CUB Library - For details, see, 3rdparty/cub/LICENSE.TXT + For details, see, 3rdparty/nvidia_cub/LICENSE.TXT Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Makefile b/Makefile index 16ea59f3d585..ed5fa6c4a11f 100644 --- a/Makefile +++ b/Makefile @@ -417,7 +417,7 @@ LIB_DEP += $(DMLC_CORE)/libdmlc.a $(NNVM_PATH)/lib/libnnvm.a ALL_DEP = $(OBJ) $(EXTRA_OBJ) $(PLUGIN_OBJ) $(LIB_DEP) ifeq ($(USE_CUDA), 1) - CFLAGS += -I$(ROOTDIR)/3rdparty/cub + CFLAGS += -I$(ROOTDIR)/3rdparty/nvidia_cub ALL_DEP += $(CUOBJ) $(EXTRA_CUOBJ) $(PLUGIN_CUOBJ) LDFLAGS += -lcufft ifeq ($(ENABLE_CUDA_RTC), 1)