fix compiling error in cuda 11.6 windows (#43934)

PaddlePaddle · Jun 29, 2022 · 77d75aa · 77d75aa
1 parent a7a4843
commit 77d75aa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/cmake/external/cub.cmake b/cmake/external/cub.cmake
@@ -23,7 +23,15 @@ set(CUB_PATH
 set(CUB_PREFIX_DIR ${CUB_PATH})
 
 set(CUB_REPOSITORY ${GIT_URL}/NVlabs/cub.git)
-set(CUB_TAG 1.8.0)
+
+if(WIN32 AND ${CMAKE_CUDA_COMPILER_VERSION} GREATER_EQUAL 11.6)
+  # cuda_11.6.2_511.65‘s own cub is 1.15.0, which will cause compiling error in windows.
+  set(CUB_TAG 1.16.0)
+  # cub 1.16.0 is not compitable with current thrust version
+  add_definitions(-DTHRUST_IGNORE_CUB_VERSION_CHECK)
+else()
+  set(CUB_TAG 1.8.0)
+endif()
 
 set(CUB_INCLUDE_DIR ${CUB_PREFIX_DIR}/src/extern_cub)
 message("CUB_INCLUDE_DIR is ${CUB_INCLUDE_DIR}")

diff --git a/cmake/third_party.cmake b/cmake/third_party.cmake
@@ -327,7 +327,8 @@ if(WITH_ONNXRUNTIME)
 endif()
 
 if(WITH_GPU)
-  if(${CMAKE_CUDA_COMPILER_VERSION} LESS 11.0)
+  if(${CMAKE_CUDA_COMPILER_VERSION} LESS 11.0 OR ${CMAKE_CUDA_COMPILER_VERSION}
+                                                 GREATER_EQUAL 11.6)
     include(external/cub) # download cub
     list(APPEND third_party_deps extern_cub)
   endif()