Skip to content
Snippets Groups Projects

amfe v1.0.5

Merged Adrien Crovato requested to merge adri into master
All threads resolved!
4 files
+ 11
33
Compare changes
  • Side-by-side
  • Inline
Files
4
+ 4
27
@@ -30,7 +30,7 @@ IF(TBB_VERSION_INTERFACE LESS 11004)
ENDIF()
TARGET_LINK_LIBRARIES(tbox ${TBB_LIBRARIES})
# -- MKL/BLAS/LAPACK --
# -- MKL --
# Do not forget to set your environement variables using: (default path)
# - "C:\Program Files (x86)\Intel\Composer XE\mkl\bin\intel64\mklvars_intel64.bat" (windows, check that VS is in x64 mode)
# - source /opt/intel/mkl/bin/mklvars.sh intel64 (linux)
@@ -45,40 +45,17 @@ IF(USE_MKL)
MESSAGE(STATUS "MKL_LIBRARIES=${MKL_LIBRARIES}")
IF(MKL_INCLUDE_DIRS AND MKL_LIBRARIES)
MESSAGE(STATUS "Found Intel MKL")
SET(FOUND_MKL TRUE)
SET(LAPACK_INCLUDE_DIRS ${MKL_INCLUDE_DIRS})
SET(LAPACK_LIBRARIES ${MKL_LIBRARIES})
TARGET_INCLUDE_DIRECTORIES(tbox PUBLIC ${MKL_INCLUDE_DIRS})
TARGET_LINK_LIBRARIES(tbox ${MKL_LIBRARIES})
ELSE()
MESSAGE(FATAL_ERROR "Intel MKL not found!")
ENDIF()
# Find BLAS
ELSE()
IF(${BLA_VENDOR} MATCHES "OpenBlas")
FIND_LIBRARY(LAPACK_LIBRARIES openblas)
ELSE()
FIND_PACKAGE(LAPACK REQUIRED) #FIND_LAPACK calls FIND_BLAS
ENDIF()
IF(NOT LAPACK_LIBRARIES)
MESSAGE(FATAL_ERROR "BLAS/LAPACK not found!")
ENDIF()
MESSAGE(STATUS "LAPACK_LIBRARIES=${LAPACK_LIBRARIES}")
MESSAGE(STATUS "LAPACK_LINKER_FLAGS=${LAPACK_LINKER_FLAGS}")
MESSAGE(STATUS "BLA_VENDOR=${BLA_VENDOR}")
MESSAGE(STATUS "BLA_STATIC=${BLA_STATIC}")
ENDIF()
# -- Eigen --
FIND_PACKAGE(EIGEN 3.3.4 REQUIRED)
TARGET_INCLUDE_DIRECTORIES(tbox PUBLIC ${EIGEN_INCLUDE_DIRS} ${LAPACK_INCLUDE_DIRS})
TARGET_INCLUDE_DIRECTORIES(tbox PUBLIC ${EIGEN_INCLUDE_DIRS})
TARGET_COMPILE_DEFINITIONS(tbox PUBLIC EIGEN_DONT_PARALLELIZE)
IF(FOUND_MKL)
MESSAGE(STATUS "Linking Eigen with MKL")
TARGET_COMPILE_DEFINITIONS(tbox PUBLIC EIGEN_USE_MKL_ALL)
ELSE()
MESSAGE(STATUS "Linking Eigen with BLAS ${BLA_VENDOR}")
TARGET_COMPILE_DEFINITIONS(tbox PUBLIC EIGEN_USE_BLAS)
ENDIF()
TARGET_LINK_LIBRARIES(tbox ${LAPACK_LIBRARIES})
# -- MUMPS --
IF (USE_MUMPS)
Loading