fix FindMKL

This commit is contained in:
Marcin Junczys-Dowmunt 2018-02-24 16:11:53 -08:00
parent 6dd57c38f0
commit ccbbbb95d3
2 changed files with 15 additions and 12 deletions

View File

@ -68,14 +68,12 @@ endif(Tcmalloc_FOUND)
find_package(MKL)
if(MKL_FOUND)
include_directories(${MKL_INCLUDE_DIR})
message(${MKL_INCLUDE_DIR})
set(EXT_LIBS ${EXT_LIBS} ${MKL_LIBRARIES})
add_definitions(-DBLAS_FOUND=1 -DMKL_FOUND=1)
else(MKL_FOUND)
find_package(BLAS)
if(BLAS_FOUND)
include_directories(${BLAS_INCLUDE_DIR})
message(${BLAS_INCLUDE_DIR})
set(EXT_LIBS ${EXT_LIBS} ${BLAS_LIBRARIES})
add_definitions(-DBLAS_FOUND=1)
endif(BLAS_FOUND)

View File

@ -46,27 +46,32 @@ else()
set(COR_LIB "mkl_core")
endif()
find_path(MKL_INCLUDE_DIR NAMES mkl.h HINTS $ENV{MKLROOT}/include)
set(INTEL_ROOT "/opt/intel" 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_library(MKL_INTERFACE_LIBRARY
NAMES ${INT_LIB}
PATHS $ENV{MKLROOT}/lib
$ENV{MKLROOT}/lib/intel64
$ENV{INTEL}/mkl/lib/intel64
PATHS ${MKL_ROOT}/lib
${MKL_ROOT}/lib/intel64
${INTEL_ROOT}/mkl/lib/intel64
NO_DEFAULT_PATH)
find_library(MKL_SEQUENTIAL_LAYER_LIBRARY
NAMES ${SEQ_LIB}
PATHS $ENV{MKLROOT}/lib
$ENV{MKLROOT}/lib/intel64
$ENV{INTEL}/mkl/lib/intel64
PATHS ${MKL_ROOT}/lib
${MKL_ROOT}/lib/intel64
${INTEL_ROOT}/mkl/lib/intel64
NO_DEFAULT_PATH)
find_library(MKL_CORE_LIBRARY
NAMES ${COR_LIB}
PATHS $ENV{MKLROOT}/lib
$ENV{MKLROOT}/lib/intel64
$ENV{INTEL}/mkl/lib/intel64
PATHS ${MKL_ROOT}/lib
${MKL_ROOT}/lib/intel64
${INTEL_ROOT}/mkl/lib/intel64
NO_DEFAULT_PATH)
set(MKL_INCLUDE_DIRS ${MKL_INCLUDE_DIR})