Merge pull request #153 from fabinsch/fix-eigen-transposeInPlace

transposeInPlace only if eigen >= 3.4.0

Author: jcarpent

bindings/python/CMakeLists.txt

@@ -52,7 +52,7 @@ function(CREATE_PYTHON_TARGET target_name COMPILE_OPTIONS dependencies)
   target_compile_definitions(${target_name}
                              PRIVATE PYTHON_MODULE_NAME=${target_name})
   target_include_directories(
-    ${target_name} PRIVATE ${PROJECT_SOURCE_DIR}/external/cereal/include)
+    ${target_name} SYSTEM PRIVATE ${PROJECT_SOURCE_DIR}/external/cereal/include)
   set_target_properties(
     ${target_name}
     PROPERTIES OUTPUT_NAME ${target_name}

include/proxsuite/serialization/eigen.hpp

@@ -16,54 +16,48 @@
 namespace cereal {
 
 // dense matrices
-template<class Archive,
-         class _Scalar,
-         int _Rows,
-         int _Cols,
-         int _Options,
-         int _MaxRows,
-         int _MaxCols>
+template<class Archive, class Derived>
 inline void
-save(
-  Archive& ar,
-  Eigen::Matrix<_Scalar, _Rows, _Cols, _Options, _MaxRows, _MaxCols> const& m)
+save(Archive& ar, Eigen::PlainObjectBase<Derived> const& m)
 {
+  typedef Eigen::PlainObjectBase<Derived> PlainType;
+
   Eigen::Index rows = m.rows();
   Eigen::Index cols = m.cols();
-  ar(rows);
-  ar(cols);
-  ar(_Options);
+  ar(CEREAL_NVP(rows));
+  ar(CEREAL_NVP(cols));
+  bool is_row_major = PlainType::IsRowMajor;
+  ar(CEREAL_NVP(is_row_major));
 
   for (Eigen::Index i = 0; i < m.size(); i++)
     ar(m.data()[i]);
 }
 
-template<class Archive,
-         class _Scalar,
-         int _Rows,
-         int _Cols,
-         int _Options,
-         int _MaxRows,
-         int _MaxCols>
+template<class Archive, class Derived>
 inline void
-load(Archive& ar,
-     Eigen::Matrix<_Scalar, _Rows, _Cols, _Options, _MaxRows, _MaxCols>& m)
+load(Archive& ar, Eigen::PlainObjectBase<Derived>& m)
 {
+  typedef Eigen::PlainObjectBase<Derived> PlainType;
+
   Eigen::Index rows;
   Eigen::Index cols;
-  int _OptionsLoaded;
-  ar(rows);
-  ar(cols);
-  ar(_OptionsLoaded);
+  bool is_row_major;
+  ar(CEREAL_NVP(rows));
+  ar(CEREAL_NVP(cols));
+  ar(CEREAL_NVP(is_row_major));
 
   m.resize(rows, cols);
 
   for (Eigen::Index i = 0; i < m.size(); i++)
     ar(m.data()[i]);
 
   // Account for different storage orders
-  if (!(_OptionsLoaded == _Options)) {
+  if (is_row_major != PlainType::IsRowMajor) {
+#if EIGEN_VERSION_AT_LEAST(3, 4, 0)
     m.transposeInPlace();
+#else
+    m = m.transpose().eval();
+#endif
   }
 }
 

test/CMakeLists.txt

@@ -51,14 +51,13 @@ endmacro(ADD_TEST_CFLAGS)
 
 make_directory("${CMAKE_CURRENT_BINARY_DIR}/serialization-data")
 proxsuite_test(serialization src/serialization.cpp)
-target_compile_definitions(test-cpp-serialization
-                           PRIVATE PROXSUITE_WITH_SERIALIZATION)
 add_test_cflags(
   test-cpp-serialization
   "-DTEST_SERIALIZATION_FOLDER=\\\\\"${CMAKE_CURRENT_BINARY_DIR}/serialization-data\\\\\""
 )
 target_include_directories(
-  test-cpp-serialization PRIVATE ${PROJECT_SOURCE_DIR}/external/cereal/include)
+  test-cpp-serialization SYSTEM
+  PRIVATE ${PROJECT_SOURCE_DIR}/external/cereal/include)
 
 if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT MSVC)
   proxsuite_test(dense_maros_meszaros src/dense_maros_meszaros.cpp)

test/src/serialization.cpp

@@ -113,7 +113,6 @@ DOCTEST_TEST_CASE("test serialization of qp model, results and settings")
 {
   std::cout << "--- serialization ---" << std::endl;
   double sparsity_factor = 0.15;
-  T eps_abs = T(1e-9);
   utils::rand::set_seed(1);
   dense::isize dim = 10;