OrgLion-ML
/
dlib
mirror of https://github.com/davisking/dlib.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Made cusolver finding work in newer versions of cmake and cuda

This commit is contained in:
Davis King 2019-03-02 09:45:08 -05:00
parent f7f6f67618
commit 70f9a9f11f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlib/CMakeLists.txt
View File

@ -716,10 +716,12 @@ if (NOT TARGET dlib)
endif() endif()
# Find where cuSOLVER is since the FindCUDA cmake package doesn't # Find where cuSOLVER is since the FindCUDA cmake package doesn't
# bother to look for it. # bother to look for it in older versions of cmake.
if (NOT CUDA_cusolver_LIBRARY)
get_filename_component(cuda_blas_path "${CUDA_CUBLAS_LIBRARIES}" DIRECTORY) get_filename_component(cuda_blas_path "${CUDA_CUBLAS_LIBRARIES}" DIRECTORY)
find_library(cusolver cusolver HINTS ${cuda_blas_path}) find_library(CUDA_cusolver_LIBRARY cusolver HINTS ${cuda_blas_path})
mark_as_advanced(cusolver) mark_as_advanced(CUDA_cusolver_LIBRARY)
endif()
# Also find OpenMP since cuSOLVER needs it. Importantly, we only # Also find OpenMP since cuSOLVER needs it. Importantly, we only
# look for one to link to if our use of BLAS, specifically the # look for one to link to if our use of BLAS, specifically the
# Intel MKL, hasn't already decided what to use. This is because # Intel MKL, hasn't already decided what to use. This is because
@ -756,7 +758,7 @@ if (NOT TARGET dlib)
${CUDA_CUBLAS_LIBRARIES} ${CUDA_CUBLAS_LIBRARIES}
${cudnn} ${cudnn}
${CUDA_curand_LIBRARY} ${CUDA_curand_LIBRARY}
${cusolver} ${CUDA_cusolver_LIBRARY}
) )
if(openmp_libraries) if(openmp_libraries)
list(APPEND dlib_needed_libraries ${openmp_libraries}) list(APPEND dlib_needed_libraries ${openmp_libraries})