diff options
| author |  Desire NUENTSA <desire.nuentsa_wakam@inria.fr> | 2013-01-14 15:59:46 +0100 |
|---|---|---|
| committer | Desire NUENTSA <desire.nuentsa_wakam@inria.fr> | 2013-01-14 15:59:46 +0100 |
| commit | c05848a3307e9ae9b355da3adbe874b0ce30e51f (patch) | |
| tree | 238f1c102e8dbca0167af27c1d0bcaf86a86bbb0 | |
| parent | 904c2f137b42f8d6df6d2e309c6a57b5727a7ae7 (diff) | |
Move SparseColEtree common to SparseLU and SparseQR to SparseCore and fix build issue of sparseqr
| -rw-r--r-- | Eigen/SparseLU | 2 | ||||
| -rw-r--r-- | Eigen/SparseQR | 1 | ||||
| -rw-r--r-- | Eigen/src/SparseCore/SparseColEtree.h (renamed from Eigen/src/SparseLU/SparseLU_Coletree.h) | 6 | ||||
| -rw-r--r-- | Eigen/src/SparseQR/SparseQR.h | 1 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Eigen/SparseLU b/Eigen/SparseLU index 92e14de9d..69cc6beca 100644 --- a/Eigen/SparseLU +++ b/Eigen/SparseLU @@ -25,7 +25,7 @@ #include "src/SparseLU/SparseLU_Structs.h" #include "src/SparseLU/SparseLU_Matrix.h" #include "src/SparseLU/SparseLUBase.h" -#include "src/SparseLU/SparseLU_Coletree.h" +#include "src/SparseCore/SparseColEtree.h" #include "src/SparseLU/SparseLU_Memory.h" #include "src/SparseLU/SparseLU_heap_relax_snode.h" #include "src/SparseLU/SparseLU_relax_snode.h" diff --git a/Eigen/SparseQR b/Eigen/SparseQR index 9095f2a1d..8030d641d 100644 --- a/Eigen/SparseQR +++ b/Eigen/SparseQR @@ -21,6 +21,7 @@ * */ #include "OrderingMethods" +#include "src/SparseCore/SparseColEtree.h" #include "src/SparseQR/SparseQR.h" #include "src/Core/util/ReenableStupidWarnings.h" diff --git a/Eigen/src/SparseLU/SparseLU_Coletree.h b/Eigen/src/SparseCore/SparseColEtree.h index 2500079ae..2d7c85a08 100644 --- a/Eigen/src/SparseLU/SparseLU_Coletree.h +++ b/Eigen/src/SparseCore/SparseColEtree.h @@ -28,8 +28,8 @@ * granted, provided the above notices are retained, and a notice that * the code was modified is included with the above copyright notice. */ -#ifndef SPARSELU_COLETREE_H -#define SPARSELU_COLETREE_H +#ifndef SPARSE_COLETREE_H +#define SPARSE_COLETREE_H namespace Eigen { @@ -194,4 +194,4 @@ void treePostorder(int n, IndexVector& parent, IndexVector& post) } // end namespace Eigen -#endif // SPARSELU_COLETREE_H +#endif // SPARSE_COLETREE_H diff --git a/Eigen/src/SparseQR/SparseQR.h b/Eigen/src/SparseQR/SparseQR.h index c1348b320..7fa3e54a5 100644 --- a/Eigen/src/SparseQR/SparseQR.h +++ b/Eigen/src/SparseQR/SparseQR.h @@ -12,7 +12,6 @@ namespace Eigen { -#include "../SparseLU/SparseLU_Coletree.h" template<typename MatrixType, typename OrderingType> class SparseQR; template<typename SparseQRType> struct SparseQRMatrixQReturnType; |