Eigen::MappedSparseMatrix -> Eigen::Map<Eigen::SparseMatrix> Eigen::MappedSparseMatrix has been deprecated and removed from Eigen at HEAD. Thanks to rmlarsen@ for fixing this. Change-Id: I34f3b0dda2bb91ee8cc65a20e53a3d7de6929221
diff --git a/internal/ceres/covariance_impl.cc b/internal/ceres/covariance_impl.cc index 5498cb3..93cf41b 100644 --- a/internal/ceres/covariance_impl.cc +++ b/internal/ceres/covariance_impl.cc
@@ -826,7 +826,7 @@ // Convert the matrix to column major order as required by SparseQR. EigenSparseMatrix sparse_jacobian = - Eigen::MappedSparseMatrix<double, Eigen::RowMajor>( + Eigen::Map<Eigen::SparseMatrix<double, Eigen::RowMajor>>( jacobian.num_rows, jacobian.num_cols, static_cast<int>(jacobian.values.size()),
diff --git a/internal/ceres/dynamic_sparse_normal_cholesky_solver.cc b/internal/ceres/dynamic_sparse_normal_cholesky_solver.cc index d31c422..87cc904 100644 --- a/internal/ceres/dynamic_sparse_normal_cholesky_solver.cc +++ b/internal/ceres/dynamic_sparse_normal_cholesky_solver.cc
@@ -123,12 +123,13 @@ EventLogger event_logger("DynamicSparseNormalCholeskySolver::Eigen::Solve"); - Eigen::MappedSparseMatrix<double, Eigen::RowMajor> a(A->num_rows(), - A->num_cols(), - A->num_nonzeros(), - A->mutable_rows(), - A->mutable_cols(), - A->mutable_values()); + Eigen::Map<Eigen::SparseMatrix<double, Eigen::RowMajor>> a( + A->num_rows(), + A->num_cols(), + A->num_nonzeros(), + A->mutable_rows(), + A->mutable_cols(), + A->mutable_values()); Eigen::SparseMatrix<double> lhs = a.transpose() * a; Eigen::SimplicialLDLT<Eigen::SparseMatrix<double>> solver;
diff --git a/internal/ceres/eigensparse.cc b/internal/ceres/eigensparse.cc index 22ed2c4..03d7751 100644 --- a/internal/ceres/eigensparse.cc +++ b/internal/ceres/eigensparse.cc
@@ -122,7 +122,7 @@ values_ptr = values_.data(); } - Eigen::MappedSparseMatrix<typename Solver::Scalar, Eigen::ColMajor> + Eigen::Map<Eigen::SparseMatrix<typename Solver::Scalar, Eigen::ColMajor>> eigen_lhs(lhs->num_rows(), lhs->num_rows(), lhs->num_nonzeros(),
diff --git a/internal/ceres/inner_product_computer_test.cc b/internal/ceres/inner_product_computer_test.cc index ac564f4..f65c8a3 100644 --- a/internal/ceres/inner_product_computer_test.cc +++ b/internal/ceres/inner_product_computer_test.cc
@@ -50,7 +50,7 @@ CompressedRowSparseMatrix* actual_product_crsm = \ inner_product_computer->mutable_result(); \ Matrix actual_inner_product = \ - Eigen::MappedSparseMatrix<double, Eigen::ColMajor>( \ + Eigen::Map<Eigen::SparseMatrix<double, Eigen::ColMajor>>( \ actual_product_crsm->num_rows(), \ actual_product_crsm->num_rows(), \ actual_product_crsm->num_nonzeros(), \