From 8ecc8b653f589852c3aa3bcbebfadcd08ac9ba92 Mon Sep 17 00:00:00 2001 From: Marcin Junczys-Dowmunt Date: Wed, 24 Feb 2021 05:19:34 +0000 Subject: [PATCH] FindMKL modified to find installed mkl in system paths --- CHANGELOG.md | 1 + cmake/FindMKL.cmake | 11 ++++------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ee3e20e..e9eb55ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. diff --git a/cmake/FindMKL.cmake b/cmake/FindMKL.cmake index be5e0106..093c02f8 100644 --- a/cmake/FindMKL.cmake +++ b/cmake/FindMKL.cmake @@ -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})