Skip to content

Commit 5cb63d0

Browse files
authored
Merge pull request DGtal-team#1197 from elcerdo/fixEigenBuild
Fix eigen build
2 parents e3fc559 + 31564a3 commit 5cb63d0

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@
102102
[#1193](https://github.com/DGtal-team/DGtal/pull/1193))
103103

104104
- *DEC Package*
105+
- Fix compatibility with eigen 3.2.8 by changing default index type for sparse matrix.
106+
(Pierre Gueth, [#1197](https://github.com/DGtal-team/DGtal/pull/1197))
105107
- Fixing warnings in DiscreteExteriorCalculus and DiscreteExteriorCalculusFactory.
106108
(Roland Denis, [#1139](https://github.com/DGtal-team/DGtal/pull/1139))
107109

src/DGtal/math/linalg/EigenSupport.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,14 @@
5252
#include <iostream>
5353
#if defined(__GNUG__)
5454
#pragma GCC diagnostic push
55+
#pragma GCC diagnostic ignored "-Wpragmas"
5556
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
57+
#pragma GCC diagnostic ignored "-Wignored-attributes"
5658
#endif
5759
#if defined(__clang__)
5860
#pragma clang diagnostic push
5961
#pragma clang diagnostic ignored "-Wdocumentation"
62+
#pragma clang diagnostic ignored "-Wignored-attributes"
6063
#endif
6164
#include <Eigen/Dense>
6265
#include <Eigen/Sparse>
@@ -96,7 +99,7 @@ struct EigenLinearAlgebraBackend
9699
typedef Eigen::MatrixXd DenseMatrix;
97100

98101
typedef Eigen::Triplet<double> Triplet;
99-
typedef Eigen::SparseMatrix<DenseVector::Scalar, Eigen::ColMajor> SparseMatrix;
102+
typedef Eigen::SparseMatrix<DenseVector::Scalar, Eigen::ColMajor, long int> SparseMatrix;
100103

101104
typedef Eigen::SimplicialLLT<SparseMatrix> SolverSimplicialLLT;
102105
typedef Eigen::SimplicialLDLT<SparseMatrix> SolverSimplicialLDLT;

0 commit comments

Comments
 (0)