diff --git a/CMakeLists.txt b/CMakeLists.txt index 2328e66ba..dd26329fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -790,7 +790,7 @@ if (UNIX OR APPLE) -DMKLDNN_INSTALL_DIR:PATH= -DUSE_MKL2017_AS_DEFAULT_ENGINE=${CAFFE_CPU_ONLY} -DUSE_CUDNN=${USE_CUDNN} - -DCUDA_ARCH_NAME=${CUDA_ARCH} + -DCUDA_ARCH_NAME=${CUDA_ARCH_NAME} -DCUDA_ARCH_BIN=${CUDA_ARCH_BIN} -DCUDA_ARCH_PTX=${CUDA_ARCH_PTX} -DCPU_ONLY=${CAFFE_CPU_ONLY} @@ -809,7 +809,7 @@ if (UNIX OR APPLE) CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DUSE_CUDNN=${USE_CUDNN} - -DCUDA_ARCH_NAME=${CUDA_ARCH} + -DCUDA_ARCH_NAME=${CUDA_ARCH_NAME} -DCUDA_ARCH_BIN=${CUDA_ARCH_BIN} -DCUDA_ARCH_PTX=${CUDA_ARCH_PTX} -DCPU_ONLY=${CAFFE_CPU_ONLY} diff --git a/cmake/Cuda.cmake b/cmake/Cuda.cmake index 404cda243..c2125811a 100644 --- a/cmake/Cuda.cmake +++ b/cmake/Cuda.cmake @@ -307,6 +307,11 @@ op_select_nvcc_arch_flags(NVCC_FLAGS_EXTRA) list(APPEND CUDA_NVCC_FLAGS ${NVCC_FLAGS_EXTRA}) message(STATUS "Added CUDA NVCC flags for: ${NVCC_FLAGS_EXTRA_readable}") +if(NOT CUDA_ARCH_NAME) + # Create flag for Caffe, which is just the name without the parentheses + string(REGEX MATCH "([a-zA-Z]*)" CUDA_ARCH_NAME ${CUDA_ARCH}) +endif() + # Boost 1.55 workaround, see https://svn.boost.org/trac/boost/ticket/9392 or # https://github.com/ComputationalRadiationPhysics/picongpu/blob/master/src/picongpu/CMakeLists.txt if (Boost_VERSION EQUAL 105500)