Move SparseColEtree common to SparseLU and SparseQR to SparseCore and fix build issue of sparseqr

This commit is contained in:
Desire NUENTSA 2013-01-14 15:59:46 +01:00
parent 904c2f137b
commit c05848a330
4 changed files with 5 additions and 5 deletions

View File

@ -25,7 +25,7 @@
#include "src/SparseLU/SparseLU_Structs.h" #include "src/SparseLU/SparseLU_Structs.h"
#include "src/SparseLU/SparseLU_Matrix.h" #include "src/SparseLU/SparseLU_Matrix.h"
#include "src/SparseLU/SparseLUBase.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_Memory.h"
#include "src/SparseLU/SparseLU_heap_relax_snode.h" #include "src/SparseLU/SparseLU_heap_relax_snode.h"
#include "src/SparseLU/SparseLU_relax_snode.h" #include "src/SparseLU/SparseLU_relax_snode.h"

View File

@ -21,6 +21,7 @@
* *
*/ */
#include "OrderingMethods" #include "OrderingMethods"
#include "src/SparseCore/SparseColEtree.h"
#include "src/SparseQR/SparseQR.h" #include "src/SparseQR/SparseQR.h"
#include "src/Core/util/ReenableStupidWarnings.h" #include "src/Core/util/ReenableStupidWarnings.h"

View File

@ -28,8 +28,8 @@
* granted, provided the above notices are retained, and a notice that * granted, provided the above notices are retained, and a notice that
* the code was modified is included with the above copyright notice. * the code was modified is included with the above copyright notice.
*/ */
#ifndef SPARSELU_COLETREE_H #ifndef SPARSE_COLETREE_H
#define SPARSELU_COLETREE_H #define SPARSE_COLETREE_H
namespace Eigen { namespace Eigen {
@ -194,4 +194,4 @@ void treePostorder(int n, IndexVector& parent, IndexVector& post)
} // end namespace Eigen } // end namespace Eigen
#endif // SPARSELU_COLETREE_H #endif // SPARSE_COLETREE_H

View File

@ -12,7 +12,6 @@
namespace Eigen { namespace Eigen {
#include "../SparseLU/SparseLU_Coletree.h"
template<typename MatrixType, typename OrderingType> class SparseQR; template<typename MatrixType, typename OrderingType> class SparseQR;
template<typename SparseQRType> struct SparseQRMatrixQReturnType; template<typename SparseQRType> struct SparseQRMatrixQReturnType;