Add definitions to all modules

flow/src/CMakeLists.txt

@@ -20,6 +20,15 @@ ADD_LIBRARY(flow SHARED ${SRCS})
 MACRO_DebugPostfix(flow)
 TARGET_INCLUDE_DIRECTORIES(flow PUBLIC ${PROJECT_SOURCE_DIR}/flow/src)
 
+# -- Eigen --
+#TARGET_COMPILE_DEFINITIONS(flow PUBLIC EIGEN_DONT_PARALLELIZE)
+#IF(WITH_MKL)
+#    TARGET_COMPILE_DEFINITIONS(flow PUBLIC EIGEN_USE_MKL_ALL)
+#ELSE()
+#    TARGET_COMPILE_DEFINITIONS(flow PUBLIC EIGEN_USE_BLAS)
+#    #TARGET_COMPILE_DEFINITIONS(flow PUBLIC EIGEN_USE_LAPACKE)
+#ENDIF()
+
 TARGET_LINK_LIBRARIES(flow tbox)
 
 SOURCE_GROUP(base REGULAR_EXPRESSION ".*\\.(cpp|inl|hpp|h)")

heat/src/CMakeLists.txt

@@ -20,6 +20,15 @@ ADD_LIBRARY(heat SHARED ${SRCS})
 MACRO_DebugPostfix(heat)
 TARGET_INCLUDE_DIRECTORIES(heat PUBLIC ${PROJECT_SOURCE_DIR}/heat/src)
 
+# -- Eigen --
+TARGET_COMPILE_DEFINITIONS(heat PUBLIC EIGEN_DONT_PARALLELIZE)
+IF(WITH_MKL)
+    TARGET_COMPILE_DEFINITIONS(heat PUBLIC EIGEN_USE_MKL_ALL)
+ELSE()
+    TARGET_COMPILE_DEFINITIONS(heat PUBLIC EIGEN_USE_BLAS)
+    #TARGET_COMPILE_DEFINITIONS(heat PUBLIC EIGEN_USE_LAPACKE)
+ENDIF()
+
 TARGET_LINK_LIBRARIES(heat tbox)
 
 SOURCE_GROUP(base REGULAR_EXPRESSION ".*\\.(cpp|inl|hpp|h)")

mirrors/src/CMakeLists.txt

@@ -20,6 +20,15 @@ ADD_LIBRARY(mirrors SHARED ${SRCS})
 MACRO_DebugPostfix(mirrors)
 TARGET_INCLUDE_DIRECTORIES(mirrors PUBLIC ${PROJECT_SOURCE_DIR}/mirrors/src)
 
+# -- Eigen --
+TARGET_COMPILE_DEFINITIONS(mirrors PUBLIC EIGEN_DONT_PARALLELIZE)
+IF(WITH_MKL)
+    TARGET_COMPILE_DEFINITIONS(mirrors PUBLIC EIGEN_USE_MKL_ALL)
+ELSE()
+    TARGET_COMPILE_DEFINITIONS(mirrors PUBLIC EIGEN_USE_BLAS)
+    #TARGET_COMPILE_DEFINITIONS(mirrors PUBLIC EIGEN_USE_LAPACKE)
+ENDIF()
+
 TARGET_LINK_LIBRARIES(mirrors tbox)
 
 SOURCE_GROUP(base REGULAR_EXPRESSION ".*\\.(cpp|inl|hpp|h)")

mrstlnos/src/CMakeLists.txt

@@ -74,6 +74,15 @@ else()
 endif()
 # --------------------------------------------------------------
 
+# -- Eigen --
+TARGET_COMPILE_DEFINITIONS(mrstlnos PUBLIC EIGEN_DONT_PARALLELIZE)
+IF(WITH_MKL)
+    TARGET_COMPILE_DEFINITIONS(mrstlnos PUBLIC EIGEN_USE_MKL_ALL)
+ELSE()
+    TARGET_COMPILE_DEFINITIONS(mrstlnos PUBLIC EIGEN_USE_BLAS)
+    #TARGET_COMPILE_DEFINITIONS(mrstlnos PUBLIC EIGEN_USE_LAPACKE)
+ENDIF()
+
 IF(_VERB)
 MESSAGE("   Trilinos_LIBRARIES = ${Trilinos_LIBRARIES}")
 ENDIF()

sph/src/CMakeLists.txt

@@ -21,6 +21,15 @@ MACRO_DebugPostfix(sph)
 
 TARGET_INCLUDE_DIRECTORIES(sph PUBLIC ${PROJECT_SOURCE_DIR}/sph/src)
 
+# -- Eigen --
+TARGET_COMPILE_DEFINITIONS(sph PUBLIC EIGEN_DONT_PARALLELIZE)
+IF(WITH_MKL)
+    TARGET_COMPILE_DEFINITIONS(sph PUBLIC EIGEN_USE_MKL_ALL)
+ELSE()
+    TARGET_COMPILE_DEFINITIONS(sph PUBLIC EIGEN_USE_BLAS)
+    #TARGET_COMPILE_DEFINITIONS(sph PUBLIC EIGEN_USE_LAPACKE)
+ENDIF()
+
 TARGET_LINK_LIBRARIES(sph tbox fwk)
 
 SOURCE_GROUP(base       REGULAR_EXPRESSION ".*\\.(cpp|inl|hpp|h)")

tbox/src/CMakeLists.txt

@@ -46,6 +46,7 @@ MESSAGE(STATUS "MKL_LIBRARIES=${MKL_LIBRARIES}")
 # If MKL is not found, search for openblas or other blas
 IF(MKL_INCLUDE_DIRS AND MKL_LIBRARIES)
     MESSAGE(STATUS "Found Intel MKL")
+    SET(WITH_MKL TRUE)
     INCLUDE_DIRECTORIES(${MKL_INCLUDE_DIRS})
     SET(LAPACK_INCLUDE_DIRS ${MKL_INCLUDE_DIRS})
     SET(LAPACK_LIBRARIES ${MKL_LIBRARIES})
@@ -69,7 +70,7 @@ ENDIF()
 FIND_PACKAGE(EIGEN REQUIRED)
 TARGET_INCLUDE_DIRECTORIES(tbox PUBLIC ${EIGEN_INCLUDE_DIRS})
 TARGET_COMPILE_DEFINITIONS(tbox PUBLIC EIGEN_DONT_PARALLELIZE)
-IF(MKL_INCLUDE_DIRS AND MKL_LIBRARIES)
+IF(WITH_MKL)
     MESSAGE(STATUS "Linking Eigen with MKL")
     TARGET_COMPILE_DEFINITIONS(tbox PUBLIC EIGEN_USE_MKL_ALL)
 ELSE()

tboxVtk/src/CMakeLists.txt

@@ -21,6 +21,15 @@ MACRO_DebugPostfix(tboxVtk)
 
 TARGET_INCLUDE_DIRECTORIES(tboxVtk PUBLIC ${PROJECT_SOURCE_DIR}/tboxVtk/src)
 
+# -- Eigen --
+TARGET_COMPILE_DEFINITIONS(tboxVtk PUBLIC EIGEN_DONT_PARALLELIZE)
+IF(WITH_MKL)
+    TARGET_COMPILE_DEFINITIONS(tboxVtk PUBLIC EIGEN_USE_MKL_ALL)
+ELSE()
+    TARGET_COMPILE_DEFINITIONS(tboxVtk PUBLIC EIGEN_USE_BLAS)
+    #TARGET_COMPILE_DEFINITIONS(tboxVtk PUBLIC EIGEN_USE_LAPACKE)
+ENDIF()
+
 # ------------------------------------------------------------------------
 # "new" way to link against VTK >=6 using COMPONENTS
 # https://vtk.org/Wiki/VTK/Build_System_Migration

waves/src/CMakeLists.txt

@@ -20,6 +20,15 @@ ADD_LIBRARY(waves SHARED ${SRCS})
 MACRO_DebugPostfix(waves)
 TARGET_INCLUDE_DIRECTORIES(waves PUBLIC ${PROJECT_SOURCE_DIR}/waves/src)
 
+# -- Eigen --
+TARGET_COMPILE_DEFINITIONS(waves PUBLIC EIGEN_DONT_PARALLELIZE)
+IF(WITH_MKL)
+    TARGET_COMPILE_DEFINITIONS(waves PUBLIC EIGEN_USE_MKL_ALL)
+ELSE()
+    TARGET_COMPILE_DEFINITIONS(waves PUBLIC EIGEN_USE_BLAS)
+    #TARGET_COMPILE_DEFINITIONS(waves PUBLIC EIGEN_USE_LAPACKE)
+ENDIF()
+
 TARGET_LINK_LIBRARIES(waves tbox fwk)
 
 SOURCE_GROUP(base       REGULAR_EXPRESSION ".*\\.(cpp|inl|hpp|h)")

[Adrien Crovato]

@R.Boman is that what you suggested?

[Boman Romain]

yes; it looks ok