mirror of
https://github.com/marian-nmt/marian.git
synced 2024-09-11 06:15:56 +03:00
Improve FindCUDNN and FindMKL to look into well-known path on Windows
This commit is contained in:
parent
7465921290
commit
1ec1802e48
@ -115,13 +115,10 @@ get_filename_component(__libpath_cudart "${CUDA_CUDART_LIBRARY}" PATH)
|
||||
# More strict enforcement of minor/patch version is done if/when the header file is examined.
|
||||
if(CUDNN_FIND_VERSION_EXACT)
|
||||
SET(__cudnn_ver_suffix ".${CUDNN_FIND_VERSION_MAJOR}")
|
||||
SET(__cudnn_lib_win_name cudnn64_${CUDNN_FIND_VERSION_MAJOR})
|
||||
else()
|
||||
SET(__cudnn_lib_win_name cudnn64)
|
||||
endif()
|
||||
|
||||
find_library(CUDNN_LIBRARY
|
||||
NAMES libcudnn.so${__cudnn_ver_suffix} libcudnn${__cudnn_ver_suffix}.dylib ${__cudnn_lib_win_name}
|
||||
NAMES libcudnn.so${__cudnn_ver_suffix} libcudnn${__cudnn_ver_suffix}.dylib cudnn
|
||||
PATHS $ENV{LD_LIBRARY_PATH} ${__libpath_cudart} ${CUDNN_ROOT_DIR} ${PC_CUDNN_LIBRARY_DIRS} ${CMAKE_INSTALL_PREFIX}
|
||||
PATH_SUFFIXES lib lib64 bin
|
||||
DOC "CUDNN library." )
|
||||
|
@ -53,7 +53,13 @@ else()
|
||||
set(COR_LIB "mkl_core")
|
||||
endif()
|
||||
|
||||
set(INTEL_ROOT "/opt/intel" CACHE PATH "Folder contains intel libs")
|
||||
if(MSVC)
|
||||
set(ProgramFilesx86 "ProgramFiles(x86)")
|
||||
set(INTEL_ROOT_DEFAULT $ENV{${ProgramFilesx86}}/IntelSWTools/compilers_and_libraries/windows)
|
||||
else()
|
||||
set(INTEL_ROOT_DEFAULT "/opt/intel")
|
||||
endif()
|
||||
set(INTEL_ROOT ${INTEL_ROOT_DEFAULT} CACHE PATH "Folder contains intel libs")
|
||||
find_path(MKL_ROOT include/mkl.h PATHS $ENV{MKLROOT} ${INTEL_ROOT}/mkl
|
||||
DOC "Folder contains MKL")
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user