diff options
author | Gael Guennebaud <g.gael@free.fr> | 2009-11-10 12:47:42 +0100 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2009-11-10 12:47:42 +0100 |
commit | 1879403562f453bd981ea45254865f51f6efc5c5 (patch) | |
tree | 6f3bb4b8881ed5c5a91964e9ae53a85a3ab53266 | |
parent | 1333fe651d2b73df92cec8738097f893f698f468 (diff) |
mv the Skyline module to unsupported/
-rw-r--r-- | Eigen/src/Core/util/Constants.h | 2 | ||||
-rw-r--r-- | Eigen/src/Core/util/ForwardDeclarations.h | 3 | ||||
-rw-r--r-- | unsupported/Eigen/Skyline (renamed from Eigen/Skyline) | 0 | ||||
-rw-r--r-- | unsupported/Eigen/src/CMakeLists.txt | 3 | ||||
-rw-r--r-- | unsupported/Eigen/src/Skyline/SkylineInplaceLU.h (renamed from Eigen/src/Skyline/SkylineInplaceLU.h) | 0 | ||||
-rw-r--r-- | unsupported/Eigen/src/Skyline/SkylineMatrix.h (renamed from Eigen/src/Skyline/SkylineMatrix.h) | 2 | ||||
-rw-r--r-- | unsupported/Eigen/src/Skyline/SkylineMatrixBase.h (renamed from Eigen/src/Skyline/SkylineMatrixBase.h) | 2 | ||||
-rw-r--r-- | unsupported/Eigen/src/Skyline/SkylineProduct.h (renamed from Eigen/src/Skyline/SkylineProduct.h) | 0 | ||||
-rw-r--r-- | unsupported/Eigen/src/Skyline/SkylineStorage.h (renamed from Eigen/src/Skyline/SkylineStorage.h) | 2 | ||||
-rw-r--r-- | unsupported/Eigen/src/Skyline/SkylineUtil.h (renamed from Eigen/src/Skyline/SkylineUtil.h) | 4 |
10 files changed, 8 insertions, 10 deletions
diff --git a/Eigen/src/Core/util/Constants.h b/Eigen/src/Core/util/Constants.h index 2ab427274..c9735b6e4 100644 --- a/Eigen/src/Core/util/Constants.h +++ b/Eigen/src/Core/util/Constants.h @@ -201,7 +201,7 @@ enum { AsRequested=0, EnforceAlignedAccess=2 }; enum { ConditionalJumpCost = 5 }; enum CornerType { TopLeft, TopRight, BottomLeft, BottomRight }; enum DirectionType { Vertical, Horizontal, BothDirections }; -enum ProductEvaluationMode { NormalProduct, CacheFriendlyProduct, SparseTimeSparseProduct, SparseTimeDenseProduct, DenseTimeSparseProduct, SkylineTimeDenseProduct }; +enum ProductEvaluationMode { NormalProduct, CacheFriendlyProduct, SparseTimeSparseProduct, SparseTimeDenseProduct, DenseTimeSparseProduct }; enum { /** \internal Equivalent to a slice vectorization for fixed-size matrices having good alignment diff --git a/Eigen/src/Core/util/ForwardDeclarations.h b/Eigen/src/Core/util/ForwardDeclarations.h index af3ad8921..35e6dacf6 100644 --- a/Eigen/src/Core/util/ForwardDeclarations.h +++ b/Eigen/src/Core/util/ForwardDeclarations.h @@ -74,7 +74,6 @@ template<typename DecompositionType> struct ei_image_retval_base; template<typename DecompositionType> struct ei_image_retval; template<typename _Scalar, int Rows=Dynamic, int Cols=Dynamic, int Supers=Dynamic, int Subs=Dynamic, int Options=0> class BandMatrix; -template<typename _Scalar, int Rows=Dynamic, int Cols=Dynamic, int ColsUsed=Dynamic, int Options=0> class ColumnMatrix; template<typename Lhs, typename Rhs> struct ei_product_type; template<typename Lhs, typename Rhs, @@ -150,8 +149,6 @@ template<typename MatrixType,int Direction> class Homogeneous; // Sparse module: template<typename Lhs, typename Rhs, int ProductMode> class SparseProduct; -// Skyline module: -template<typename Lhs, typename Rhs, int ProductMode> class SkylineProduct; #endif // EIGEN_FORWARDDECLARATIONS_H diff --git a/Eigen/Skyline b/unsupported/Eigen/Skyline index 5bcb87c76..5bcb87c76 100644 --- a/Eigen/Skyline +++ b/unsupported/Eigen/Skyline diff --git a/unsupported/Eigen/src/CMakeLists.txt b/unsupported/Eigen/src/CMakeLists.txt index 3a688afd8..195808c59 100644 --- a/unsupported/Eigen/src/CMakeLists.txt +++ b/unsupported/Eigen/src/CMakeLists.txt @@ -2,3 +2,6 @@ ADD_SUBDIRECTORY(IterativeSolvers) ADD_SUBDIRECTORY(BVH) ADD_SUBDIRECTORY(AutoDiff) ADD_SUBDIRECTORY(MoreVectorization) +ADD_SUBDIRECTORY(FFT) +ADD_SUBDIRECTORY(Skyline) +ADD_SUBDIRECTORY(MatrixFunctions) diff --git a/Eigen/src/Skyline/SkylineInplaceLU.h b/unsupported/Eigen/src/Skyline/SkylineInplaceLU.h index feed564c5..feed564c5 100644 --- a/Eigen/src/Skyline/SkylineInplaceLU.h +++ b/unsupported/Eigen/src/Skyline/SkylineInplaceLU.h diff --git a/Eigen/src/Skyline/SkylineMatrix.h b/unsupported/Eigen/src/Skyline/SkylineMatrix.h index 8b3f385f6..5d47d970f 100644 --- a/Eigen/src/Skyline/SkylineMatrix.h +++ b/unsupported/Eigen/src/Skyline/SkylineMatrix.h @@ -400,7 +400,7 @@ public: } /** \returns a reference to a novel non zero coefficient with coordinates \a row x \a col. - + * * \warning This function can be extremely slow if the non zero coefficients * are not inserted in a coherent order. diff --git a/Eigen/src/Skyline/SkylineMatrixBase.h b/unsupported/Eigen/src/Skyline/SkylineMatrixBase.h index 3389a15c0..b90a6f9e9 100644 --- a/Eigen/src/Skyline/SkylineMatrixBase.h +++ b/unsupported/Eigen/src/Skyline/SkylineMatrixBase.h @@ -35,8 +35,6 @@ * * \param Derived * - * - * */ template<typename Derived> class SkylineMatrixBase : public AnyMatrixBase<Derived> { public: diff --git a/Eigen/src/Skyline/SkylineProduct.h b/unsupported/Eigen/src/Skyline/SkylineProduct.h index 85ccacac8..85ccacac8 100644 --- a/Eigen/src/Skyline/SkylineProduct.h +++ b/unsupported/Eigen/src/Skyline/SkylineProduct.h diff --git a/Eigen/src/Skyline/SkylineStorage.h b/unsupported/Eigen/src/Skyline/SkylineStorage.h index 97bdd3636..f725da0bf 100644 --- a/Eigen/src/Skyline/SkylineStorage.h +++ b/unsupported/Eigen/src/Skyline/SkylineStorage.h @@ -1,7 +1,7 @@ // This file is part of Eigen, a lightweight C++ template library // for linear algebra. // -// Copyright (C) 2008 Guillaume Saupin <guillaume.saupin@cea.fr> +// Copyright (C) 2008-2009 Guillaume Saupin <guillaume.saupin@cea.fr> // // Eigen is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/Eigen/src/Skyline/SkylineUtil.h b/unsupported/Eigen/src/Skyline/SkylineUtil.h index 949508994..71563adfb 100644 --- a/Eigen/src/Skyline/SkylineUtil.h +++ b/unsupported/Eigen/src/Skyline/SkylineUtil.h @@ -33,8 +33,8 @@ const unsigned int SkylineBit = 0x1200; template<typename Lhs, typename Rhs, int ProductMode> class SkylineProduct; -enum AdditionalProductEvaluationMode {SkylineTimeSkylineProduct, DenseTimeSkylineProduct}; -enum {IsSkyline = SkylineBit}; +enum AdditionalProductEvaluationMode {SkylineTimeDenseProduct, SkylineTimeSkylineProduct, DenseTimeSkylineProduct}; +enum {IsSkyline = SkylineBit}; #define EIGEN_SKYLINE_INHERIT_ASSIGNMENT_OPERATOR(Derived, Op) \ |