mirror of
https://github.com/marian-nmt/marian.git
synced 2024-09-11 06:15:56 +03:00
FindMKL modified to find installed mkl in system paths
This commit is contained in:
parent
147d9dc25b
commit
8ecc8b653f
@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
||||
- Dynamic gradient-scaling with `--dynamic-gradient-scaling`.
|
||||
|
||||
### Fixed
|
||||
- Find MKL installed under Ubuntu 20.04 via apt-get
|
||||
- Support for CUDA 11.
|
||||
- General improvements and fixes for MPI handling, was essentially non-functional before (syncing, random seeds, deadlocks during saving, validation etc.)
|
||||
- Allow to compile -DUSE_MPI=on with -DUSE_STATIC_LIBS=on although MPI gets still linked dynamically since it has so many dependencies.
|
||||
|
@ -63,7 +63,7 @@ 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")
|
||||
|
||||
find_path(MKL_INCLUDE_DIR NAMES mkl.h HINTS ${MKL_ROOT}/include)
|
||||
find_path(MKL_INCLUDE_DIR NAMES mkl.h HINTS ${MKL_ROOT}/include /usr/include/mkl)
|
||||
|
||||
|
||||
find_library(MKL_INTERFACE_LIBRARY
|
||||
@ -71,22 +71,19 @@ find_library(MKL_INTERFACE_LIBRARY
|
||||
PATHS ${MKL_ROOT}/lib
|
||||
${MKL_ROOT}/lib/intel64
|
||||
${MKL_ROOT}/lib/intel64_win
|
||||
${INTEL_ROOT}/mkl/lib/intel64
|
||||
NO_DEFAULT_PATH)
|
||||
${INTEL_ROOT}/mkl/lib/intel64)
|
||||
|
||||
find_library(MKL_SEQUENTIAL_LAYER_LIBRARY
|
||||
NAMES ${SEQ_LIB}
|
||||
PATHS ${MKL_ROOT}/lib
|
||||
${MKL_ROOT}/lib/intel64
|
||||
${INTEL_ROOT}/mkl/lib/intel64
|
||||
NO_DEFAULT_PATH)
|
||||
${INTEL_ROOT}/mkl/lib/intel64)
|
||||
|
||||
find_library(MKL_CORE_LIBRARY
|
||||
NAMES ${COR_LIB}
|
||||
PATHS ${MKL_ROOT}/lib
|
||||
${MKL_ROOT}/lib/intel64
|
||||
${INTEL_ROOT}/mkl/lib/intel64
|
||||
NO_DEFAULT_PATH)
|
||||
${INTEL_ROOT}/mkl/lib/intel64)
|
||||
|
||||
set(MKL_INCLUDE_DIRS ${MKL_INCLUDE_DIR})
|
||||
set(MKL_LIBRARIES ${MKL_INTERFACE_LIBRARY} ${MKL_SEQUENTIAL_LAYER_LIBRARY} ${MKL_CORE_LIBRARY})
|
||||
|
Loading…
Reference in New Issue
Block a user