Merge pull request #1919 from endJunction/EigenDontVectorize

Disable eigen vectorization by default.

CMakeLists.txt

@@ -90,6 +90,13 @@ 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)
 
+# We assume that it's save to use vectorization with Eigen < 3.3 (strictly smaller than 3.3.!).
+# At least we only observed vectorization issues with Eigen 3.3.x.
+# If you want to use Eigen vectorization, make sure that you run all the ctests several times, e.g.:
+# $ ctest --repeat-until-fail 50
+# You might also want to take a look at https://github.com/ufz/ogs/issues/1881.
+option(EIGEN_DONT_VECTORIZE "Disables explicit vectorization when defined." ON)
+
 set(OGS_EIGEN_DYNAMIC_SHAPE_MATRICES "Default" CACHE STRING "Use dynamically allocated shape matrices")
 set_property(CACHE OGS_EIGEN_DYNAMIC_SHAPE_MATRICES
              PROPERTY STRINGS "Default" "ON" "OFF")
@@ -192,6 +199,11 @@ 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()

ProcessLib/HydroMechanics/Tests.cmake

@@ -89,7 +89,7 @@ AddTest(
     WRAPPER time
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
-    ABSTOL 5e-14 RELTOL 1e-16
+    ABSTOL 1e-13 RELTOL 1e-16
     DIFF_DATA
     expected_square_1e2_UC_late_pcs_0_ts_10_t_1000.000000.vtu square_1e2_UC_late_pcs_0_ts_10_t_1000.000000.vtu displacement displacement
     expected_square_1e2_UC_late_pcs_0_ts_10_t_1000.000000.vtu square_1e2_UC_late_pcs_0_ts_10_t_1000.000000.vtu pressure pressure

Tests/NumLib/TestComponentNorms.cpp

@@ -143,7 +143,7 @@ TEST(MPITest_NumLib, ComponentNormMultiComponent1)
     unsigned const num_components = 3;
     auto const norm_type = MathLib::VecNormType::NORM1;
     auto const tolerance =
-        num_components * 600 * std::numeric_limits<double>::epsilon();
+        num_components * 1700 * std::numeric_limits<double>::epsilon();
 
     do_test(num_components, norm_type, tolerance,
             [](double n_total, double n) { return n_total + n; },
@@ -159,7 +159,7 @@ TEST(MPITest_NumLib, ComponentNormMultiComponent2)
     unsigned const num_components = 3;
     auto const norm_type = MathLib::VecNormType::NORM2;
     auto const tolerance =
-        num_components * 20 * std::numeric_limits<double>::epsilon();
+        num_components * 22 * std::numeric_limits<double>::epsilon();
 
     do_test(num_components, norm_type, tolerance,
             [](double n_total, double n) { return n_total + n*n; },