From 81e73b7240e3b11b454f01f21bab85b4aa95d6af Mon Sep 17 00:00:00 2001 From: James Sharpe Date: Wed, 25 May 2016 11:28:39 +0100 Subject: [PATCH] FindCUDA: Add support for finding the cublas_device library --- Help/release/dev/FindCUDA-cublas_device.rst | 4 ++++ Modules/FindCUDA.cmake | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 Help/release/dev/FindCUDA-cublas_device.rst diff --git a/Help/release/dev/FindCUDA-cublas_device.rst b/Help/release/dev/FindCUDA-cublas_device.rst new file mode 100644 index 000000000..2ceed608a --- /dev/null +++ b/Help/release/dev/FindCUDA-cublas_device.rst @@ -0,0 +1,4 @@ +FindCUDA-cublas_device +---------------------- + +* The :module:`FindCUDA` module learned to find the ``cublas_device`` library. diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 2979f0fd7..48bb554cc 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -549,6 +549,7 @@ macro(cuda_unset_include_and_libraries) endif() unset(CUDA_cudart_static_LIBRARY CACHE) unset(CUDA_cublas_LIBRARY CACHE) + unset(CUDA_cublas_device_LIBRARY CACHE) unset(CUDA_cublasemu_LIBRARY CACHE) unset(CUDA_cufft_LIBRARY CACHE) unset(CUDA_cufftemu_LIBRARY CACHE) @@ -854,6 +855,7 @@ if(NOT CUDA_VERSION VERSION_LESS "3.2") endif() endif() if(CUDA_VERSION VERSION_GREATER "5.0") + find_cuda_helper_libs(cublas_device) # In CUDA 5.5 NPP was splitted onto 3 separate libraries. find_cuda_helper_libs(nppc) find_cuda_helper_libs(nppi) @@ -872,7 +874,7 @@ if (CUDA_BUILD_EMULATION) set(CUDA_CUBLAS_LIBRARIES ${CUDA_cublasemu_LIBRARY}) else() set(CUDA_CUFFT_LIBRARIES ${CUDA_cufft_LIBRARY}) - set(CUDA_CUBLAS_LIBRARIES ${CUDA_cublas_LIBRARY}) + set(CUDA_CUBLAS_LIBRARIES ${CUDA_cublas_LIBRARY} ${CUDA_cublas_device_LIBRARY}) endif() ######################## @@ -1803,7 +1805,7 @@ macro(CUDA_ADD_CUBLAS_TO_TARGET target) if (CUDA_BUILD_EMULATION) target_link_libraries(${target} ${CUDA_cublasemu_LIBRARY}) else() - target_link_libraries(${target} ${CUDA_cublas_LIBRARY}) + target_link_libraries(${target} ${CUDA_cublas_LIBRARY} ${CUDA_cublas_device_LIBRARY}) endif() endmacro()