GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-04-23 01:59:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove EIGEN_MPL2_ONLY guards around code re-licensed from LGPL to MPL2 in 2ca1e73239

Browse Source
This commit is contained in:
Rasmus Munk Larsen 2019-03-05 10:24:54 -08:00
parent efb5080d31
commit 0318fc7f44
5 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Eigen/OrderingMethods
View File

@ -63,10 +63,7 @@
* \endcode * \endcode
*/ */
#ifndef EIGEN_MPL2_ONLY
#include "src/OrderingMethods/Amd.h" #include "src/OrderingMethods/Amd.h"
#endif
#include "src/OrderingMethods/Ordering.h" #include "src/OrderingMethods/Ordering.h"
#include "src/Core/util/ReenableStupidWarnings.h" #include "src/Core/util/ReenableStupidWarnings.h"

2
Eigen/Sparse
View File

@ -25,9 +25,7 @@
#include "SparseCore" #include "SparseCore"
#include "OrderingMethods" #include "OrderingMethods"
#ifndef EIGEN_MPL2_ONLY
#include "SparseCholesky" #include "SparseCholesky"
#endif
#include "SparseLU" #include "SparseLU"
#include "SparseQR" #include "SparseQR"
#include "IterativeLinearSolvers" #include "IterativeLinearSolvers"

8
Eigen/SparseCholesky
View File

@ -30,16 +30,8 @@
* \endcode * \endcode
*/ */
#ifdef EIGEN_MPL2_ONLY
#error The SparseCholesky module has nothing to offer in MPL2 only mode
#endif
#include "src/SparseCholesky/SimplicialCholesky.h" #include "src/SparseCholesky/SimplicialCholesky.h"
#ifndef EIGEN_MPL2_ONLY
#include "src/SparseCholesky/SimplicialCholesky_impl.h" #include "src/SparseCholesky/SimplicialCholesky_impl.h"
#endif
#include "src/Core/util/ReenableStupidWarnings.h" #include "src/Core/util/ReenableStupidWarnings.h"
#endif // EIGEN_SPARSECHOLESKY_MODULE_H #endif // EIGEN_SPARSECHOLESKY_MODULE_H

9
Eigen/src/IterativeLinearSolvers/IncompleteLUT.h
View File

@ -225,7 +225,6 @@ void IncompleteLUT<Scalar,StorageIndex>::analyzePattern(const _MatrixType& amat)
// Compute the Fill-reducing permutation // Compute the Fill-reducing permutation
// Since ILUT does not perform any numerical pivoting, // Since ILUT does not perform any numerical pivoting,
// it is highly preferable to keep the diagonal through symmetric permutations. // it is highly preferable to keep the diagonal through symmetric permutations.
#ifndef EIGEN_MPL2_ONLY
// To this end, let's symmetrize the pattern and perform AMD on it. // To this end, let's symmetrize the pattern and perform AMD on it.
SparseMatrix<Scalar,ColMajor, StorageIndex> mat1 = amat; SparseMatrix<Scalar,ColMajor, StorageIndex> mat1 = amat;
SparseMatrix<Scalar,ColMajor, StorageIndex> mat2 = amat.transpose(); SparseMatrix<Scalar,ColMajor, StorageIndex> mat2 = amat.transpose();
@ -235,14 +234,6 @@ void IncompleteLUT<Scalar,StorageIndex>::analyzePattern(const _MatrixType& amat)
AMDOrdering<StorageIndex> ordering; AMDOrdering<StorageIndex> ordering;
ordering(AtA,m_P); ordering(AtA,m_P);
m_Pinv = m_P.inverse(); // cache the inverse permutation m_Pinv = m_P.inverse(); // cache the inverse permutation
#else
// If AMD is not available, (MPL2-only), then let's use the slower COLAMD routine.
SparseMatrix<Scalar,ColMajor, StorageIndex> mat1 = amat;
COLAMDOrdering<StorageIndex> ordering;
ordering(mat1,m_Pinv);
m_P = m_Pinv.inverse();
#endif
m_analysisIsOk = true; m_analysisIsOk = true;
m_factorizationIsOk = false; m_factorizationIsOk = false;
m_isInitialized = true; m_isInitialized = true;

4
Eigen/src/OrderingMethods/Ordering.h
View File

@ -38,8 +38,6 @@ void ordering_helper_at_plus_a(const MatrixType& A, MatrixType& symmat)
} }
#ifndef EIGEN_MPL2_ONLY
/** \ingroup OrderingMethods_Module /** \ingroup OrderingMethods_Module
* \class AMDOrdering * \class AMDOrdering
* *
@ -81,8 +79,6 @@ class AMDOrdering
} }
}; };
#endif // EIGEN_MPL2_ONLY
/** \ingroup OrderingMethods_Module /** \ingroup OrderingMethods_Module
* \class NaturalOrdering * \class NaturalOrdering
* *