diff --git a/cmake/cuda.cmake b/cmake/cuda.cmake index 735846db1db04e3884d72ec62d911d9a0efec147..b9c72c046e747b8a9937e5c95b32656eb3e9d2cc 100644 --- a/cmake/cuda.cmake +++ b/cmake/cuda.cmake @@ -141,12 +141,10 @@ endfunction() message(STATUS "CUDA detected: " ${CUDA_VERSION}) if (${CUDA_VERSION} LESS 7.0) set(paddle_known_gpu_archs ${paddle_known_gpu_archs}) - add_definitions("-DPADDLE_CUDA_BINVER=\"60\"") elseif (${CUDA_VERSION} LESS 8.0) # CUDA 7.x set(paddle_known_gpu_archs ${paddle_known_gpu_archs7}) list(APPEND CUDA_NVCC_FLAGS "-D_MWAITXINTRIN_H_INCLUDED") list(APPEND CUDA_NVCC_FLAGS "-D__STRICT_ANSI__") - add_definitions("-DPADDLE_CUDA_BINVER=\"70\"") elseif (${CUDA_VERSION} LESS 9.0) # CUDA 8.x set(paddle_known_gpu_archs ${paddle_known_gpu_archs8}) list(APPEND CUDA_NVCC_FLAGS "-D_MWAITXINTRIN_H_INCLUDED") @@ -154,18 +152,16 @@ elseif (${CUDA_VERSION} LESS 9.0) # CUDA 8.x # CUDA 8 may complain that sm_20 is no longer supported. Suppress the # warning for now. list(APPEND CUDA_NVCC_FLAGS "-Wno-deprecated-gpu-targets") - add_definitions("-DPADDLE_CUDA_BINVER=\"80\"") elseif (${CUDA_VERSION} LESS 10.0) # CUDA 9.x set(paddle_known_gpu_archs ${paddle_known_gpu_archs9}) list(APPEND CUDA_NVCC_FLAGS "-D_MWAITXINTRIN_H_INCLUDED") list(APPEND CUDA_NVCC_FLAGS "-D__STRICT_ANSI__") - add_definitions("-DPADDLE_CUDA_BINVER=\"90\"") elseif (${CUDA_VERSION} LESS 11.0) # CUDA 10.x set(paddle_known_gpu_archs ${paddle_known_gpu_archs10}) list(APPEND CUDA_NVCC_FLAGS "-D_MWAITXINTRIN_H_INCLUDED") list(APPEND CUDA_NVCC_FLAGS "-D__STRICT_ANSI__") - add_definitions("-DPADDLE_CUDA_BINVER=\"100\"") endif() +add_definitions("-DPADDLE_CUDA_BINVER=\"${CUDA_VERSION_MAJOR}${CUDA_VERSION_MINOR}\"") include_directories(${CUDA_INCLUDE_DIRS}) if(NOT WITH_DSO) diff --git a/cmake/external/eigen.cmake b/cmake/external/eigen.cmake index 72441160f89d2c188d35fc6b08b5f0b6d746a1ad..dfe81d8f9bf2e25900b2548c707ea778e6aacf09 100644 --- a/cmake/external/eigen.cmake +++ b/cmake/external/eigen.cmake @@ -12,6 +12,13 @@ if(NOT WITH_FAST_MATH) add_definitions(-DEIGEN_FAST_MATH=0) endif() +if(WIN32) + set(EIGEN_GIT_REPOSITORY https://github.com/wopeizl/eigen-git-mirror) + set(EIGEN_GIT_TAG support_cuda9_win) +else() + set(EIGEN_GIT_REPOSITORY https://github.com/eigenteam/eigen-git-mirror) + set(EIGEN_GIT_TAG 917060c364181f33a735dc023818d5a54f60e54c) +endif() if(WITH_AMD_GPU) ExternalProject_Add( extern_eigen3 @@ -29,10 +36,10 @@ else() ExternalProject_Add( extern_eigen3 ${EXTERNAL_PROJECT_LOG_ARGS} - GIT_REPOSITORY "https://github.com/eigenteam/eigen-git-mirror" + GIT_REPOSITORY "${EIGEN_GIT_REPOSITORY}" # eigen on cuda9.1 missing header of math_funtions.hpp # https://stackoverflow.com/questions/43113508/math-functions-hpp-not-found-when-using-cuda-with-eigen - GIT_TAG 917060c364181f33a735dc023818d5a54f60e54c + GIT_TAG ${EIGEN_GIT_TAG} PREFIX ${EIGEN_SOURCE_DIR} DOWNLOAD_NAME "eigen" UPDATE_COMMAND ""