[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46912] branches/smoke2/extern/Eigen3/ Eigen: Update Eigen3 to latest 3. 1 alpha2 to have support of sparse matrices

Daniel Genrich daniel.genrich at gmx.net
Wed May 23 01:04:19 CEST 2012 

Revision: 46912
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46912
Author:   genscher
Date:     2012-05-22 23:04:18 +0000 (Tue, 22 May 2012)
Log Message:
-----------
Update Eigen3 to latest 3.1 alpha2 to have support of sparse matrices

Modified Paths:
--------------
    branches/smoke2/extern/Eigen3/Eigen/Cholesky
    branches/smoke2/extern/Eigen3/Eigen/Core
    branches/smoke2/extern/Eigen3/Eigen/Eigen2Support
    branches/smoke2/extern/Eigen3/Eigen/Eigenvalues
    branches/smoke2/extern/Eigen3/Eigen/Geometry
    branches/smoke2/extern/Eigen3/Eigen/Householder
    branches/smoke2/extern/Eigen3/Eigen/Jacobi
    branches/smoke2/extern/Eigen3/Eigen/LU
    branches/smoke2/extern/Eigen3/Eigen/LeastSquares
    branches/smoke2/extern/Eigen3/Eigen/QR
    branches/smoke2/extern/Eigen3/Eigen/SVD
    branches/smoke2/extern/Eigen3/Eigen/Sparse
    branches/smoke2/extern/Eigen3/Eigen/src/Cholesky/LDLT.h
    branches/smoke2/extern/Eigen3/Eigen/src/Cholesky/LLT.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/Array.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/ArrayBase.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/ArrayWrapper.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/Assign.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/BandMatrix.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/Block.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/BooleanRedux.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/CommaInitializer.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/CwiseBinaryOp.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/CwiseNullaryOp.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/CwiseUnaryOp.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/CwiseUnaryView.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/DenseBase.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/DenseCoeffsBase.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/DenseStorage.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/Diagonal.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/DiagonalMatrix.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/DiagonalProduct.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/Dot.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/EigenBase.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/Flagged.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/ForceAlignedAccess.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/Functors.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/Fuzzy.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/GenericPacketMath.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/GlobalFunctions.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/IO.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/Map.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/MapBase.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/MathFunctions.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/Matrix.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/MatrixBase.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/NestByValue.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/NoAlias.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/NumTraits.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/PermutationMatrix.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/PlainObjectBase.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/Product.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/ProductBase.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/Random.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/Redux.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/Replicate.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/ReturnByValue.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/Reverse.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/Select.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/SelfAdjointView.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/SolveTriangular.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/StableNorm.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/Stride.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/Swap.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/Transpose.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/Transpositions.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/TriangularMatrix.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/VectorBlock.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/VectorwiseOp.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/Visitor.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/arch/SSE/Complex.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/arch/SSE/PacketMath.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/products/CoeffBasedProduct.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/products/Parallelizer.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/products/SelfadjointProduct.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/products/TriangularSolverVector.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/util/BlasUtil.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/util/Constants.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/util/DisableStupidWarnings.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/util/ForwardDeclarations.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/util/Macros.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/util/Memory.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/util/Meta.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/util/StaticAssert.h
    branches/smoke2/extern/Eigen3/Eigen/src/Core/util/XprHelper.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/Block.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/Cwise.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/CwiseOperators.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/All.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/LU.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/Lazy.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/LeastSquares.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/MathFunctions.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/Memory.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/Meta.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/Minor.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/QR.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/SVD.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/TriangularSolver.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigen2Support/VectorBlock.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigenvalues/RealSchur.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
    branches/smoke2/extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h
    branches/smoke2/extern/Eigen3/Eigen/src/Geometry/AlignedBox.h
    branches/smoke2/extern/Eigen3/Eigen/src/Geometry/AngleAxis.h
    branches/smoke2/extern/Eigen3/Eigen/src/Geometry/EulerAngles.h
    branches/smoke2/extern/Eigen3/Eigen/src/Geometry/Homogeneous.h
    branches/smoke2/extern/Eigen3/Eigen/src/Geometry/Hyperplane.h
    branches/smoke2/extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h
    branches/smoke2/extern/Eigen3/Eigen/src/Geometry/ParametrizedLine.h
    branches/smoke2/extern/Eigen3/Eigen/src/Geometry/Quaternion.h
    branches/smoke2/extern/Eigen3/Eigen/src/Geometry/Rotation2D.h
    branches/smoke2/extern/Eigen3/Eigen/src/Geometry/RotationBase.h
    branches/smoke2/extern/Eigen3/Eigen/src/Geometry/Scaling.h
    branches/smoke2/extern/Eigen3/Eigen/src/Geometry/Transform.h
    branches/smoke2/extern/Eigen3/Eigen/src/Geometry/Translation.h
    branches/smoke2/extern/Eigen3/Eigen/src/Geometry/Umeyama.h
    branches/smoke2/extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h
    branches/smoke2/extern/Eigen3/Eigen/src/Householder/BlockHouseholder.h
    branches/smoke2/extern/Eigen3/Eigen/src/Householder/Householder.h
    branches/smoke2/extern/Eigen3/Eigen/src/Householder/HouseholderSequence.h
    branches/smoke2/extern/Eigen3/Eigen/src/Jacobi/Jacobi.h
    branches/smoke2/extern/Eigen3/Eigen/src/LU/Determinant.h
    branches/smoke2/extern/Eigen3/Eigen/src/LU/FullPivLU.h
    branches/smoke2/extern/Eigen3/Eigen/src/LU/Inverse.h
    branches/smoke2/extern/Eigen3/Eigen/src/LU/PartialPivLU.h
    branches/smoke2/extern/Eigen3/Eigen/src/LU/arch/Inverse_SSE.h
    branches/smoke2/extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR.h
    branches/smoke2/extern/Eigen3/Eigen/src/QR/FullPivHouseholderQR.h
    branches/smoke2/extern/Eigen3/Eigen/src/QR/HouseholderQR.h
    branches/smoke2/extern/Eigen3/Eigen/src/SVD/JacobiSVD.h
    branches/smoke2/extern/Eigen3/Eigen/src/SVD/UpperBidiagonalization.h
    branches/smoke2/extern/Eigen3/Eigen/src/misc/Image.h
    branches/smoke2/extern/Eigen3/Eigen/src/misc/Kernel.h
    branches/smoke2/extern/Eigen3/Eigen/src/misc/Solve.h
    branches/smoke2/extern/Eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h
    branches/smoke2/extern/Eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h

Removed Paths:
-------------
    branches/smoke2/extern/Eigen3/Eigen/src/Sparse/

Modified: branches/smoke2/extern/Eigen3/Eigen/Cholesky
===================================================================
--- branches/smoke2/extern/Eigen3/Eigen/Cholesky	2012-05-22 22:03:41 UTC (rev 46911)
+++ branches/smoke2/extern/Eigen3/Eigen/Cholesky	2012-05-22 23:04:18 UTC (rev 46912)
@@ -5,8 +5,6 @@
 
 #include "src/Core/util/DisableStupidWarnings.h"
 
-namespace Eigen {
-
 /** \defgroup Cholesky_Module Cholesky module
   *
   *
@@ -24,9 +22,10 @@
 #include "src/misc/Solve.h"
 #include "src/Cholesky/LLT.h"
 #include "src/Cholesky/LDLT.h"
+#ifdef EIGEN_USE_LAPACKE
+#include "src/Cholesky/LLT_MKL.h"
+#endif
 
-} // namespace Eigen
-
 #include "src/Core/util/ReenableStupidWarnings.h"
 
 #endif // EIGEN_CHOLESKY_MODULE_H

Modified: branches/smoke2/extern/Eigen3/Eigen/Core
===================================================================
--- branches/smoke2/extern/Eigen3/Eigen/Core	2012-05-22 22:03:41 UTC (rev 46911)
+++ branches/smoke2/extern/Eigen3/Eigen/Core	2012-05-22 23:04:18 UTC (rev 46912)
@@ -34,6 +34,12 @@
 // defined e.g. EIGEN_DONT_ALIGN) so it needs to be done before we do anything with vectorization.
 #include "src/Core/util/Macros.h"
 
+#include <complex>
+
+// this include file manages BLAS and MKL related macros
+// and inclusion of their respective header files
+#include "src/Core/util/MKL_support.h"
+
 // if alignment is disabled, then disable vectorization. Note: EIGEN_ALIGN is the proper check, it takes into
 // account both the user's will (EIGEN_DONT_ALIGN) and our own platform checks
 #if !EIGEN_ALIGN
@@ -146,7 +152,6 @@
 #include <cstddef>
 #include <cstdlib>
 #include <cmath>
-#include <complex>
 #include <cassert>
 #include <functional>
 #include <iosfwd>
@@ -175,9 +180,6 @@
   #include <new>
 #endif
 
-// defined in bits/termios.h
-#undef B0
-
 /** \brief Namespace containing all symbols from the %Eigen library. */
 namespace Eigen {
 
@@ -201,6 +203,8 @@
 #endif
 }
 
+} // end namespace Eigen
+
 #define STAGE10_FULL_EIGEN2_API             10
 #define STAGE20_RESOLVE_API_CONFLICTS       20
 #define STAGE30_FULL_EIGEN3_API             30
@@ -247,6 +251,10 @@
   * \endcode
   */
 
+/** \defgroup Support_modules Support modules [category]
+  * Category of modules which add support for external libraries.
+  */
+
 #include "src/Core/util/Constants.h"
 #include "src/Core/util/ForwardDeclarations.h"
 #include "src/Core/util/Meta.h"
@@ -318,7 +326,7 @@
 #include "src/Core/CommaInitializer.h"
 #include "src/Core/Flagged.h"
 #include "src/Core/ProductBase.h"
-#include "src/Core/Product.h"
+#include "src/Core/GeneralProduct.h"
 #include "src/Core/TriangularMatrix.h"
 #include "src/Core/SelfAdjointView.h"
 #include "src/Core/SolveTriangular.h"
@@ -347,8 +355,21 @@
 #include "src/Core/ArrayBase.h"
 #include "src/Core/ArrayWrapper.h"
 
-} // namespace Eigen
+#ifdef EIGEN_USE_BLAS
+#include "src/Core/products/GeneralMatrixMatrix_MKL.h"
+#include "src/Core/products/GeneralMatrixVector_MKL.h"
+#include "src/Core/products/GeneralMatrixMatrixTriangular_MKL.h"
+#include "src/Core/products/SelfadjointMatrixMatrix_MKL.h"
+#include "src/Core/products/SelfadjointMatrixVector_MKL.h"
+#include "src/Core/products/TriangularMatrixMatrix_MKL.h"
+#include "src/Core/products/TriangularMatrixVector_MKL.h"
+#include "src/Core/products/TriangularSolverMatrix_MKL.h"
+#endif // EIGEN_USE_BLAS
 
+#ifdef EIGEN_USE_MKL_VML
+#include "src/Core/Assign_MKL.h"
+#endif
+
 #include "src/Core/GlobalFunctions.h"
 
 #include "src/Core/util/ReenableStupidWarnings.h"

Modified: branches/smoke2/extern/Eigen3/Eigen/Eigen2Support
===================================================================
--- branches/smoke2/extern/Eigen3/Eigen/Eigen2Support	2012-05-22 22:03:41 UTC (rev 46911)
+++ branches/smoke2/extern/Eigen3/Eigen/Eigen2Support	2012-05-22 23:04:18 UTC (rev 46912)
@@ -31,9 +31,8 @@
 
 #include "src/Core/util/DisableStupidWarnings.h"
 
-namespace Eigen {
-
-/** \defgroup Eigen2Support_Module Eigen2 support module
+/** \ingroup Support_modules
+  * \defgroup Eigen2Support_Module Eigen2 support module
   * This module provides a couple of deprecated functions improving the compatibility with Eigen2.
   *
   * To use it, define EIGEN2_SUPPORT before including any Eigen header
@@ -56,13 +55,29 @@
 #include "src/Eigen2Support/MathFunctions.h"
 
 
-} // namespace Eigen
-
 #include "src/Core/util/ReenableStupidWarnings.h"
 
 // Eigen2 used to include iostream
 #include<iostream>
 
+#define EIGEN_USING_MATRIX_TYPEDEFS_FOR_TYPE_AND_SIZE(TypeSuffix, SizeSuffix) \
+using Eigen::Matrix##SizeSuffix##TypeSuffix; \
+using Eigen::Vector##SizeSuffix##TypeSuffix; \
+using Eigen::RowVector##SizeSuffix##TypeSuffix;
+
+#define EIGEN_USING_MATRIX_TYPEDEFS_FOR_TYPE(TypeSuffix) \
+EIGEN_USING_MATRIX_TYPEDEFS_FOR_TYPE_AND_SIZE(TypeSuffix, 2) \
+EIGEN_USING_MATRIX_TYPEDEFS_FOR_TYPE_AND_SIZE(TypeSuffix, 3) \
+EIGEN_USING_MATRIX_TYPEDEFS_FOR_TYPE_AND_SIZE(TypeSuffix, 4) \
+EIGEN_USING_MATRIX_TYPEDEFS_FOR_TYPE_AND_SIZE(TypeSuffix, X) \
+
+#define EIGEN_USING_MATRIX_TYPEDEFS \
+EIGEN_USING_MATRIX_TYPEDEFS_FOR_TYPE(i) \
+EIGEN_USING_MATRIX_TYPEDEFS_FOR_TYPE(f) \
+EIGEN_USING_MATRIX_TYPEDEFS_FOR_TYPE(d) \
+EIGEN_USING_MATRIX_TYPEDEFS_FOR_TYPE(cf) \
+EIGEN_USING_MATRIX_TYPEDEFS_FOR_TYPE(cd)
+
 #define USING_PART_OF_NAMESPACE_EIGEN \
 EIGEN_USING_MATRIX_TYPEDEFS \
 using Eigen::Matrix; \

Modified: branches/smoke2/extern/Eigen3/Eigen/Eigenvalues
===================================================================
--- branches/smoke2/extern/Eigen3/Eigen/Eigenvalues	2012-05-22 22:03:41 UTC (rev 46911)
+++ branches/smoke2/extern/Eigen3/Eigen/Eigenvalues	2012-05-22 23:04:18 UTC (rev 46912)
@@ -9,9 +9,8 @@
 #include "Jacobi"
 #include "Householder"
 #include "LU"
+#include "Geometry"
 
-namespace Eigen {
-
 /** \defgroup Eigenvalues_Module Eigenvalues module
   *
   *
@@ -35,9 +34,12 @@
 #include "src/Eigenvalues/ComplexSchur.h"
 #include "src/Eigenvalues/ComplexEigenSolver.h"
 #include "src/Eigenvalues/MatrixBaseEigenvalues.h"
+#ifdef EIGEN_USE_LAPACKE
+#include "src/Eigenvalues/RealSchur_MKL.h"
+#include "src/Eigenvalues/ComplexSchur_MKL.h"
+#include "src/Eigenvalues/SelfAdjointEigenSolver_MKL.h"
+#endif
 
-} // namespace Eigen
-
 #include "src/Core/util/ReenableStupidWarnings.h"
 
 #endif // EIGEN_EIGENVALUES_MODULE_H

Modified: branches/smoke2/extern/Eigen3/Eigen/Geometry
===================================================================
--- branches/smoke2/extern/Eigen3/Eigen/Geometry	2012-05-22 22:03:41 UTC (rev 46911)
+++ branches/smoke2/extern/Eigen3/Eigen/Geometry	2012-05-22 23:04:18 UTC (rev 46912)
@@ -13,8 +13,6 @@
 #define M_PI 3.14159265358979323846
 #endif
 
-namespace Eigen {
-
 /** \defgroup Geometry_Module Geometry module
   *
   *
@@ -58,8 +56,6 @@
 #include "src/Eigen2Support/Geometry/All.h"
 #endif
 
-} // namespace Eigen
-
 #include "src/Core/util/ReenableStupidWarnings.h"
 
 #endif // EIGEN_GEOMETRY_MODULE_H

Modified: branches/smoke2/extern/Eigen3/Eigen/Householder
===================================================================
--- branches/smoke2/extern/Eigen3/Eigen/Householder	2012-05-22 22:03:41 UTC (rev 46911)
+++ branches/smoke2/extern/Eigen3/Eigen/Householder	2012-05-22 23:04:18 UTC (rev 46912)
@@ -5,8 +5,6 @@
 
 #include "src/Core/util/DisableStupidWarnings.h"
 
-namespace Eigen {
-
 /** \defgroup Householder_Module Householder module
   * This module provides Householder transformations.
   *
@@ -19,8 +17,6 @@
 #include "src/Householder/HouseholderSequence.h"
 #include "src/Householder/BlockHouseholder.h"
 
-} // namespace Eigen
-
 #include "src/Core/util/ReenableStupidWarnings.h"
 
 #endif // EIGEN_HOUSEHOLDER_MODULE_H

Modified: branches/smoke2/extern/Eigen3/Eigen/Jacobi
===================================================================
--- branches/smoke2/extern/Eigen3/Eigen/Jacobi	2012-05-22 22:03:41 UTC (rev 46911)
+++ branches/smoke2/extern/Eigen3/Eigen/Jacobi	2012-05-22 23:04:18 UTC (rev 46912)
@@ -5,8 +5,6 @@
 
 #include "src/Core/util/DisableStupidWarnings.h"
 
-namespace Eigen {
-
 /** \defgroup Jacobi_Module Jacobi module
   * This module provides Jacobi and Givens rotations.
   *
@@ -21,8 +19,6 @@
 
 #include "src/Jacobi/Jacobi.h"
 
-} // namespace Eigen
-
 #include "src/Core/util/ReenableStupidWarnings.h"
 
 #endif // EIGEN_JACOBI_MODULE_H

Modified: branches/smoke2/extern/Eigen3/Eigen/LU
===================================================================
--- branches/smoke2/extern/Eigen3/Eigen/LU	2012-05-22 22:03:41 UTC (rev 46911)
+++ branches/smoke2/extern/Eigen3/Eigen/LU	2012-05-22 23:04:18 UTC (rev 46912)
@@ -5,8 +5,6 @@
 
 #include "src/Core/util/DisableStupidWarnings.h"
 
-namespace Eigen {
-
 /** \defgroup LU_Module LU module
   * This module includes %LU decomposition and related notions such as matrix inversion and determinant.
   * This module defines the following MatrixBase methods:
@@ -23,6 +21,9 @@
 #include "src/misc/Image.h"
 #include "src/LU/FullPivLU.h"
 #include "src/LU/PartialPivLU.h"
+#ifdef EIGEN_USE_LAPACKE
+#include "src/LU/PartialPivLU_MKL.h"
+#endif
 #include "src/LU/Determinant.h"
 #include "src/LU/Inverse.h"
 
@@ -34,8 +35,6 @@
   #include "src/Eigen2Support/LU.h"
 #endif
 
-} // namespace Eigen
-
 #include "src/Core/util/ReenableStupidWarnings.h"
 
 #endif // EIGEN_LU_MODULE_H

Modified: branches/smoke2/extern/Eigen3/Eigen/LeastSquares
===================================================================
--- branches/smoke2/extern/Eigen3/Eigen/LeastSquares	2012-05-22 22:03:41 UTC (rev 46911)
+++ branches/smoke2/extern/Eigen3/Eigen/LeastSquares	2012-05-22 23:04:18 UTC (rev 46912)
@@ -15,8 +15,6 @@
 #include "Eigenvalues"
 #include "Geometry"
 
-namespace Eigen {
-
 /** \defgroup LeastSquares_Module LeastSquares module
   * This module provides linear regression and related features.
   *
@@ -27,8 +25,6 @@
 
 #include "src/Eigen2Support/LeastSquares.h"
 
-} // namespace Eigen
-
 #include "src/Core/util/ReenableStupidWarnings.h"
 
 #endif // EIGEN2_SUPPORT

Modified: branches/smoke2/extern/Eigen3/Eigen/QR
===================================================================
--- branches/smoke2/extern/Eigen3/Eigen/QR	2012-05-22 22:03:41 UTC (rev 46911)
+++ branches/smoke2/extern/Eigen3/Eigen/QR	2012-05-22 23:04:18 UTC (rev 46912)
@@ -9,8 +9,6 @@
 #include "Jacobi"
 #include "Householder"
 
-namespace Eigen {
-
 /** \defgroup QR_Module QR module
   *
   *
@@ -28,13 +26,15 @@
 #include "src/QR/HouseholderQR.h"
 #include "src/QR/FullPivHouseholderQR.h"
 #include "src/QR/ColPivHouseholderQR.h"
+#ifdef EIGEN_USE_LAPACKE
+#include "src/QR/HouseholderQR_MKL.h"

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list