From 7f929a5108ab58cf1be0bb5093daf71becdbd8ec Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 9 Feb 2021 13:19:51 +0100
Subject: [PATCH] [CMake] Removed option OGS_USE_EIGEN.
Closes #3100.
---
CMakeLists.txt | 44 ++++++++-------------
MathLib/CMakeLists.txt | 6 +--
MathLib/LinAlg/ApplyKnownSolution.h | 4 +-
MathLib/LinAlg/GlobalMatrixVectorTypes.h | 4 +-
MathLib/LinAlg/LinAlg.cpp | 2 +-
MathLib/LinAlg/LinAlg.h | 2 +-
MathLib/LinAlg/MatrixVectorTraits.cpp | 4 +-
MathLib/LinAlg/MatrixVectorTraits.h | 2 +-
MathLib/LinAlg/SetMatrixSparsity.h | 2 -
MathLib/LinAlg/UnifiedMatrixSetters.cpp | 4 +-
MathLib/LinAlg/UnifiedMatrixSetters.h | 4 +-
Tests/MathLib/TestGlobalMatrixInterface.cpp | 4 +-
Tests/MathLib/TestGlobalVectorInterface.cpp | 4 +-
Tests/MathLib/TestLinearSolver.cpp | 8 +---
scripts/cmake/test/AddTest.cmake | 2 +-
scripts/cmake/test/MeshTest.cmake | 2 +-
16 files changed, 38 insertions(+), 60 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8f4271a2e9..677143e3cfa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,7 +110,6 @@ option(OGS_USE_NETCDF "Add NetCDF support." OFF)
option(OGS_USE_XDMF "Add Xdmf file IO support" OFF)
# Eigen
-option(OGS_USE_EIGEN "Use Eigen linear solver" ON)
option(OGS_USE_EIGEN_UNSUPPORTED "Use Eigen unsupported modules" ON)
option(OGS_EIGEN_INITIALIZE_MATRICES_BY_NAN "" ON)
option(EIGEN_NO_DEBUG "Disables Eigen's assertions" OFF)
@@ -188,7 +187,6 @@ option(OGS_USE_MFRONT
# ---- Definitions ----
if(OGS_USE_LIS)
include_directories(SYSTEM ${LIS_INCLUDE_DIR})
- set(OGS_USE_EIGEN ON)
endif()
if(OGS_USE_MKL)
@@ -196,32 +194,24 @@ if(OGS_USE_MKL)
endif()
# Eigen
-if(OGS_USE_EIGEN)
- if(CMAKE_BUILD_TYPE STREQUAL "Debug")
- add_definitions(-DEIGEN_INITIALIZE_MATRICES_BY_NAN)
- endif()
-
- if(EIGEN_NO_DEBUG)
- add_definitions(-DEIGEN_NO_DEBUG)
- endif()
-
- if(EIGEN_DONT_VECTORIZE)
- add_definitions(-DEIGEN_DONT_VECTORIZE)
- endif()
-
- if(OGS_EIGEN_DYNAMIC_SHAPE_MATRICES_INTERNAL)
- add_definitions(-DOGS_EIGEN_DYNAMIC_SHAPE_MATRICES)
- endif()
-
- if(OGS_USE_EIGEN_UNSUPPORTED)
- add_definitions(-DUSE_EIGEN_UNSUPPORTED)
- endif()
-
- if(OGS_EIGEN_INITIALIZE_MATRICES_BY_NAN)
- add_definitions(-DEIGEN_INITIALIZE_MATRICES_BY_NAN)
- endif()
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+ add_definitions(-DEIGEN_INITIALIZE_MATRICES_BY_NAN)
+endif()
+if(EIGEN_NO_DEBUG)
+ add_definitions(-DEIGEN_NO_DEBUG)
+endif()
+if(EIGEN_DONT_VECTORIZE)
+ add_definitions(-DEIGEN_DONT_VECTORIZE)
+endif()
+if(OGS_EIGEN_DYNAMIC_SHAPE_MATRICES_INTERNAL)
+ add_definitions(-DOGS_EIGEN_DYNAMIC_SHAPE_MATRICES)
+endif()
+if(OGS_USE_EIGEN_UNSUPPORTED)
+ add_definitions(-DUSE_EIGEN_UNSUPPORTED)
+endif()
+if(OGS_EIGEN_INITIALIZE_MATRICES_BY_NAN)
+ add_definitions(-DEIGEN_INITIALIZE_MATRICES_BY_NAN)
endif()
-# End Eigen
# Packaging
include(scripts/cmake/packaging/Pack.cmake)
diff --git a/MathLib/CMakeLists.txt b/MathLib/CMakeLists.txt
index d7e6f97f1c4..2a7ee1dddad 100644
--- a/MathLib/CMakeLists.txt
+++ b/MathLib/CMakeLists.txt
@@ -9,10 +9,7 @@ if(CVODE_FOUND)
append_source_files(SOURCES ODE)
endif()
append_source_files(SOURCES Nonlinear)
-
-if(OGS_USE_EIGEN)
- append_source_files(SOURCES LinAlg/Eigen)
-endif()
+append_source_files(SOURCES LinAlg/Eigen)
if(OGS_USE_LIS)
append_source_files(SOURCES LinAlg/Lis)
@@ -59,7 +56,6 @@ target_compile_definitions(MathLib
PUBLIC
$<$<BOOL:${USE_LIS}>:USE_LIS>
$<$<BOOL:${OGS_USE_PETSC}>:USE_PETSC>
- $<$<BOOL:${OGS_USE_EIGEN}>:OGS_USE_EIGEN>
$<$<BOOL:${CVODE_FOUND}>:CVODE_FOUND>
PRIVATE
$<$<BOOL:${OGS_USE_MKL}>:USE_MKL>
diff --git a/MathLib/LinAlg/ApplyKnownSolution.h b/MathLib/LinAlg/ApplyKnownSolution.h
index 4873ac11ce9..084dbfa84e3 100644
--- a/MathLib/LinAlg/ApplyKnownSolution.h
+++ b/MathLib/LinAlg/ApplyKnownSolution.h
@@ -11,10 +11,8 @@
#include <vector>
-#ifdef OGS_USE_EIGEN
#include "MathLib/LinAlg/Eigen/EigenTools.h"
-#endif // OGS_USE_EIGEN
#ifdef USE_PETSC
#include "MathLib/LinAlg/PETSc/PETScTools.h"
-#endif // USE_PETSC
+#endif // USE_PETSC
diff --git a/MathLib/LinAlg/GlobalMatrixVectorTypes.h b/MathLib/LinAlg/GlobalMatrixVectorTypes.h
index dada4abe463..0f73395ed6f 100644
--- a/MathLib/LinAlg/GlobalMatrixVectorTypes.h
+++ b/MathLib/LinAlg/GlobalMatrixVectorTypes.h
@@ -36,7 +36,7 @@
using GlobalLinearSolver = MathLib::PETScLinearSolver;
-#elif defined(OGS_USE_EIGEN)
+#else
#include "MathLib/LinAlg/Eigen/EigenVector.h"
#include "MathLib/LinAlg/Eigen/EigenMatrix.h"
#include "MathLib/LinAlg/Eigen/EigenLinearSolver.h"
@@ -46,7 +46,7 @@
using GlobalLinearSolver = MathLib::EigenLinearSolver;
-#endif // OGS_USE_EIGEN
+#endif
/// A type used for indexing of global vectors and matrices. It is equal to the
diff --git a/MathLib/LinAlg/LinAlg.cpp b/MathLib/LinAlg/LinAlg.cpp
index 7b9246a9dc2..6489bff05d9 100644
--- a/MathLib/LinAlg/LinAlg.cpp
+++ b/MathLib/LinAlg/LinAlg.cpp
@@ -173,7 +173,7 @@ void finalizeAssembly(PETScVector& x)
// Sparse global EigenMatrix/EigenVector //////////////////////////////////////////
-#elif defined(OGS_USE_EIGEN)
+#else
#include "MathLib/LinAlg/Eigen/EigenVector.h"
#include "MathLib/LinAlg/Eigen/EigenMatrix.h"
diff --git a/MathLib/LinAlg/LinAlg.h b/MathLib/LinAlg/LinAlg.h
index 4be844712e0..1a56a5235f6 100644
--- a/MathLib/LinAlg/LinAlg.h
+++ b/MathLib/LinAlg/LinAlg.h
@@ -196,7 +196,7 @@ void finalizeAssembly(PETScVector& x);
// Sparse global EigenMatrix/EigenVector //////////////////////////////////////////
-#elif defined(OGS_USE_EIGEN)
+#else
namespace MathLib {
diff --git a/MathLib/LinAlg/MatrixVectorTraits.cpp b/MathLib/LinAlg/MatrixVectorTraits.cpp
index eee276d26d6..ff52b18cccd 100644
--- a/MathLib/LinAlg/MatrixVectorTraits.cpp
+++ b/MathLib/LinAlg/MatrixVectorTraits.cpp
@@ -92,7 +92,7 @@ std::unique_ptr<PETScVector> MatrixVectorTraits<PETScVector>::newInstance(
} // namespace MathLib
-#elif defined(OGS_USE_EIGEN)
+#else
namespace MathLib
{
@@ -153,4 +153,4 @@ std::unique_ptr<EigenVector> MatrixVectorTraits<EigenVector>::newInstance(
}
} // namespace MathLib
-#endif // defined(OGS_USE_EIGEN)
+#endif
diff --git a/MathLib/LinAlg/MatrixVectorTraits.h b/MathLib/LinAlg/MatrixVectorTraits.h
index 189a0ebef9d..785403ee02a 100644
--- a/MathLib/LinAlg/MatrixVectorTraits.h
+++ b/MathLib/LinAlg/MatrixVectorTraits.h
@@ -43,7 +43,7 @@ SPECIALIZE_MATRIX_VECTOR_TRAITS(PETScVector, PETScVector::IndexType);
}
-#elif defined(OGS_USE_EIGEN)
+#else
#include "MathLib/LinAlg/Eigen/EigenMatrix.h"
#include "MathLib/LinAlg/Eigen/EigenVector.h"
diff --git a/MathLib/LinAlg/SetMatrixSparsity.h b/MathLib/LinAlg/SetMatrixSparsity.h
index 2223f2d38c9..71b607eb193 100644
--- a/MathLib/LinAlg/SetMatrixSparsity.h
+++ b/MathLib/LinAlg/SetMatrixSparsity.h
@@ -40,6 +40,4 @@ void setMatrixSparsity(MATRIX& matrix, SPARSITY_PATTERN const& sparsity_pattern)
#include "Lis/LisMatrix.h"
#endif // USE_LIS
-#ifdef OGS_USE_EIGEN
#include "Eigen/EigenMatrix.h"
-#endif // OGS_USE_EIGEN
diff --git a/MathLib/LinAlg/UnifiedMatrixSetters.cpp b/MathLib/LinAlg/UnifiedMatrixSetters.cpp
index 436f104c696..18985bf4239 100644
--- a/MathLib/LinAlg/UnifiedMatrixSetters.cpp
+++ b/MathLib/LinAlg/UnifiedMatrixSetters.cpp
@@ -97,7 +97,7 @@ void addToMatrix(PETScMatrix& m,
} // namespace MathLib
-#elif defined(OGS_USE_EIGEN)
+#else
// Sparse global EigenMatrix/EigenVector //////////////////////////////////////////
@@ -171,4 +171,4 @@ void addToMatrix(EigenMatrix& m,
} // namespace MathLib
-#endif // OGS_USE_EIGEN
+#endif
diff --git a/MathLib/LinAlg/UnifiedMatrixSetters.h b/MathLib/LinAlg/UnifiedMatrixSetters.h
index 0c9e1763544..21a519f666b 100644
--- a/MathLib/LinAlg/UnifiedMatrixSetters.h
+++ b/MathLib/LinAlg/UnifiedMatrixSetters.h
@@ -42,7 +42,7 @@ void setMatrix(PETScMatrix& m,
} // namespace MathLib
-#elif defined(OGS_USE_EIGEN)
+#else
// Sparse global EigenMatrix/EigenVector //////////////////////////////////////////
@@ -68,4 +68,4 @@ void addToMatrix(EigenMatrix& m,
} // namespace MathLib
-#endif // OGS_USE_EIGEN
+#endif
diff --git a/Tests/MathLib/TestGlobalMatrixInterface.cpp b/Tests/MathLib/TestGlobalMatrixInterface.cpp
index 1b72216955a..74375c582aa 100644
--- a/Tests/MathLib/TestGlobalMatrixInterface.cpp
+++ b/Tests/MathLib/TestGlobalMatrixInterface.cpp
@@ -21,7 +21,7 @@
#if defined(USE_PETSC)
#include "MathLib/LinAlg/PETSc/PETScMatrix.h"
-#elif defined(OGS_USE_EIGEN)
+#else
#include "MathLib/LinAlg/Eigen/EigenMatrix.h"
#endif
@@ -228,7 +228,7 @@ TEST(MPITest_Math, CheckInterface_PETSc_Rectangular_Matrix_Global_Size)
checkGlobalRectangularMatrixInterfaceMPI(A, x);
}
-#elif defined(OGS_USE_EIGEN)
+#else
TEST(Math, CheckInterface_EigenMatrix)
{
MathLib::EigenMatrix m(10);
diff --git a/Tests/MathLib/TestGlobalVectorInterface.cpp b/Tests/MathLib/TestGlobalVectorInterface.cpp
index f61b2e94bbb..e1bc1429fc3 100644
--- a/Tests/MathLib/TestGlobalVectorInterface.cpp
+++ b/Tests/MathLib/TestGlobalVectorInterface.cpp
@@ -20,7 +20,7 @@
#if defined(USE_PETSC)
#include "MathLib/LinAlg/PETSc/PETScVector.h"
-#elif defined(OGS_USE_EIGEN)
+#else
#include "MathLib/LinAlg/Eigen/EigenVector.h"
#endif
@@ -282,7 +282,7 @@ TEST(MPITest_Math, CheckInterface_PETScVector)
{
checkGlobalVectorInterfacePETSc<MathLib::PETScVector >();
}
-#elif defined(OGS_USE_EIGEN)
+#else
TEST(Math, CheckInterface_EigenVector)
{
checkGlobalVectorInterface<MathLib::EigenVector >();
diff --git a/Tests/MathLib/TestLinearSolver.cpp b/Tests/MathLib/TestLinearSolver.cpp
index 8677e34f0b7..d6c50f84e3e 100644
--- a/Tests/MathLib/TestLinearSolver.cpp
+++ b/Tests/MathLib/TestLinearSolver.cpp
@@ -20,13 +20,11 @@
#include "MathLib/LinAlg/FinalizeMatrixAssembly.h"
#include "MathLib/LinAlg/LinAlg.h"
-#ifdef OGS_USE_EIGEN
#include "MathLib/LinAlg/Eigen/EigenMatrix.h"
#include "MathLib/LinAlg/Eigen/EigenVector.h"
#include "MathLib/LinAlg/Eigen/EigenLinearSolver.h"
-#endif
-#if defined(OGS_USE_EIGEN) && defined(USE_LIS)
+#if defined(USE_LIS)
#include "MathLib/LinAlg/EigenLis/EigenLisLinearSolver.h"
#endif
@@ -219,7 +217,6 @@ void checkLinearSolverInterface(T_MATRIX& A, T_VECTOR& b,
} // end namespace
-#ifdef OGS_USE_EIGEN
TEST(Math, CheckInterface_Eigen)
{
// set solver options using Boost property tree
@@ -239,9 +236,8 @@ TEST(Math, CheckInterface_Eigen)
checkLinearSolverInterface<MathLib::EigenMatrix, MathLib::EigenVector,
MathLib::EigenLinearSolver, IntType>(A, conf);
}
-#endif
-#if defined(OGS_USE_EIGEN) && defined(USE_LIS)
+#if defined(USE_LIS)
TEST(Math, CheckInterface_EigenLis)
{
// set solver options using Boost property tree
diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake
index f8e4a40b50f..f5ad062bc82 100644
--- a/scripts/cmake/test/AddTest.cmake
+++ b/scripts/cmake/test/AddTest.cmake
@@ -14,7 +14,7 @@
# TESTER <diff|vtkdiff|gmldiff|memcheck> # optional
# REQUIREMENTS # optional simple boolean expression which has to be true to
# enable the test, e.g.
-# OGS_USE_PETSC AND (OGS_USE_EIGEN OR OGS_USE_LIS)
+# OGS_USE_PETSC AND (FOO OR BAR)
# PYTHON_PACKAGES package_x=1.2.3 package_y=0.1.x # optional
# VIS <vtu output file(s)> # optional for documentation
# RUNTIME <in seconds> # optional for optimizing ctest duration
diff --git a/scripts/cmake/test/MeshTest.cmake b/scripts/cmake/test/MeshTest.cmake
index aaa6fc21cab..0240f963dfa 100644
--- a/scripts/cmake/test/MeshTest.cmake
+++ b/scripts/cmake/test/MeshTest.cmake
@@ -11,7 +11,7 @@
# WRAPPER_ARGS <arguments> # optional
# REQUIREMENTS # optional simple boolean expression which has to be true to
# enable the test, e.g.
-# OGS_USE_PETSC AND (OGS_USE_EIGEN OR OGS_USE_LIS)
+# OGS_USE_PETSC AND (FOO OR BAR)
# RUNTIME <in seconds> # optional for optimizing ctest duration
# values should be taken from envinf1 serial job
# )
--
GitLab