Revision: 51345 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51345 Author: genscher Date: 2012-10-15 16:29:23 +0000 (Mon, 15 Oct 2012) Log Message: ----------- Update to stable Eigen 3.1.1
- Fixes several bugs within the Eigen library: http://eigen.tuxfamily.org/index.php?title=ChangeLog#Eigen_3.1.1 Modified Paths: -------------- trunk/blender/extern/Eigen3/Eigen/Cholesky trunk/blender/extern/Eigen3/Eigen/Core trunk/blender/extern/Eigen3/Eigen/Eigen2Support trunk/blender/extern/Eigen3/Eigen/Eigenvalues trunk/blender/extern/Eigen3/Eigen/Geometry trunk/blender/extern/Eigen3/Eigen/Householder trunk/blender/extern/Eigen3/Eigen/Jacobi trunk/blender/extern/Eigen3/Eigen/LU trunk/blender/extern/Eigen3/Eigen/LeastSquares trunk/blender/extern/Eigen3/Eigen/QR trunk/blender/extern/Eigen3/Eigen/SVD trunk/blender/extern/Eigen3/Eigen/Sparse trunk/blender/extern/Eigen3/Eigen/StdDeque trunk/blender/extern/Eigen3/Eigen/StdList trunk/blender/extern/Eigen3/Eigen/StdVector trunk/blender/extern/Eigen3/Eigen/src/Cholesky/LDLT.h trunk/blender/extern/Eigen3/Eigen/src/Cholesky/LLT.h trunk/blender/extern/Eigen3/Eigen/src/Core/Array.h trunk/blender/extern/Eigen3/Eigen/src/Core/ArrayBase.h trunk/blender/extern/Eigen3/Eigen/src/Core/ArrayWrapper.h trunk/blender/extern/Eigen3/Eigen/src/Core/Assign.h trunk/blender/extern/Eigen3/Eigen/src/Core/BandMatrix.h trunk/blender/extern/Eigen3/Eigen/src/Core/Block.h trunk/blender/extern/Eigen3/Eigen/src/Core/BooleanRedux.h trunk/blender/extern/Eigen3/Eigen/src/Core/CommaInitializer.h trunk/blender/extern/Eigen3/Eigen/src/Core/CwiseBinaryOp.h trunk/blender/extern/Eigen3/Eigen/src/Core/CwiseNullaryOp.h trunk/blender/extern/Eigen3/Eigen/src/Core/CwiseUnaryOp.h trunk/blender/extern/Eigen3/Eigen/src/Core/CwiseUnaryView.h trunk/blender/extern/Eigen3/Eigen/src/Core/DenseBase.h trunk/blender/extern/Eigen3/Eigen/src/Core/DenseCoeffsBase.h trunk/blender/extern/Eigen3/Eigen/src/Core/DenseStorage.h trunk/blender/extern/Eigen3/Eigen/src/Core/Diagonal.h trunk/blender/extern/Eigen3/Eigen/src/Core/DiagonalMatrix.h trunk/blender/extern/Eigen3/Eigen/src/Core/DiagonalProduct.h trunk/blender/extern/Eigen3/Eigen/src/Core/Dot.h trunk/blender/extern/Eigen3/Eigen/src/Core/EigenBase.h trunk/blender/extern/Eigen3/Eigen/src/Core/Flagged.h trunk/blender/extern/Eigen3/Eigen/src/Core/ForceAlignedAccess.h trunk/blender/extern/Eigen3/Eigen/src/Core/Functors.h trunk/blender/extern/Eigen3/Eigen/src/Core/Fuzzy.h trunk/blender/extern/Eigen3/Eigen/src/Core/GenericPacketMath.h trunk/blender/extern/Eigen3/Eigen/src/Core/GlobalFunctions.h trunk/blender/extern/Eigen3/Eigen/src/Core/IO.h trunk/blender/extern/Eigen3/Eigen/src/Core/Map.h trunk/blender/extern/Eigen3/Eigen/src/Core/MapBase.h trunk/blender/extern/Eigen3/Eigen/src/Core/MathFunctions.h trunk/blender/extern/Eigen3/Eigen/src/Core/Matrix.h trunk/blender/extern/Eigen3/Eigen/src/Core/MatrixBase.h trunk/blender/extern/Eigen3/Eigen/src/Core/NestByValue.h trunk/blender/extern/Eigen3/Eigen/src/Core/NoAlias.h trunk/blender/extern/Eigen3/Eigen/src/Core/NumTraits.h trunk/blender/extern/Eigen3/Eigen/src/Core/PermutationMatrix.h trunk/blender/extern/Eigen3/Eigen/src/Core/PlainObjectBase.h trunk/blender/extern/Eigen3/Eigen/src/Core/Product.h trunk/blender/extern/Eigen3/Eigen/src/Core/ProductBase.h trunk/blender/extern/Eigen3/Eigen/src/Core/Random.h trunk/blender/extern/Eigen3/Eigen/src/Core/Redux.h trunk/blender/extern/Eigen3/Eigen/src/Core/Replicate.h trunk/blender/extern/Eigen3/Eigen/src/Core/ReturnByValue.h trunk/blender/extern/Eigen3/Eigen/src/Core/Reverse.h trunk/blender/extern/Eigen3/Eigen/src/Core/Select.h trunk/blender/extern/Eigen3/Eigen/src/Core/SelfAdjointView.h trunk/blender/extern/Eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h trunk/blender/extern/Eigen3/Eigen/src/Core/SolveTriangular.h trunk/blender/extern/Eigen3/Eigen/src/Core/StableNorm.h trunk/blender/extern/Eigen3/Eigen/src/Core/Stride.h trunk/blender/extern/Eigen3/Eigen/src/Core/Swap.h trunk/blender/extern/Eigen3/Eigen/src/Core/Transpose.h trunk/blender/extern/Eigen3/Eigen/src/Core/Transpositions.h trunk/blender/extern/Eigen3/Eigen/src/Core/TriangularMatrix.h trunk/blender/extern/Eigen3/Eigen/src/Core/VectorBlock.h trunk/blender/extern/Eigen3/Eigen/src/Core/VectorwiseOp.h trunk/blender/extern/Eigen3/Eigen/src/Core/Visitor.h trunk/blender/extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h trunk/blender/extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h trunk/blender/extern/Eigen3/Eigen/src/Core/arch/Default/Settings.h trunk/blender/extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h trunk/blender/extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h trunk/blender/extern/Eigen3/Eigen/src/Core/arch/SSE/Complex.h trunk/blender/extern/Eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h trunk/blender/extern/Eigen3/Eigen/src/Core/arch/SSE/PacketMath.h trunk/blender/extern/Eigen3/Eigen/src/Core/products/CoeffBasedProduct.h trunk/blender/extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h trunk/blender/extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h trunk/blender/extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h trunk/blender/extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector.h trunk/blender/extern/Eigen3/Eigen/src/Core/products/Parallelizer.h trunk/blender/extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h trunk/blender/extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h trunk/blender/extern/Eigen3/Eigen/src/Core/products/SelfadjointProduct.h trunk/blender/extern/Eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h trunk/blender/extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h trunk/blender/extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector.h trunk/blender/extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h trunk/blender/extern/Eigen3/Eigen/src/Core/products/TriangularSolverVector.h trunk/blender/extern/Eigen3/Eigen/src/Core/util/BlasUtil.h trunk/blender/extern/Eigen3/Eigen/src/Core/util/Constants.h trunk/blender/extern/Eigen3/Eigen/src/Core/util/DisableStupidWarnings.h trunk/blender/extern/Eigen3/Eigen/src/Core/util/ForwardDeclarations.h trunk/blender/extern/Eigen3/Eigen/src/Core/util/Macros.h trunk/blender/extern/Eigen3/Eigen/src/Core/util/Memory.h trunk/blender/extern/Eigen3/Eigen/src/Core/util/Meta.h trunk/blender/extern/Eigen3/Eigen/src/Core/util/StaticAssert.h trunk/blender/extern/Eigen3/Eigen/src/Core/util/XprHelper.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/Block.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/Cwise.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/CwiseOperators.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/All.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/LU.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/Lazy.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/LeastSquares.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/Macros.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/MathFunctions.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/Memory.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/Meta.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/Minor.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/QR.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/SVD.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/TriangularSolver.h trunk/blender/extern/Eigen3/Eigen/src/Eigen2Support/VectorBlock.h trunk/blender/extern/Eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h trunk/blender/extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur.h trunk/blender/extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h trunk/blender/extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h trunk/blender/extern/Eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h trunk/blender/extern/Eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h trunk/blender/extern/Eigen3/Eigen/src/Eigenvalues/RealSchur.h trunk/blender/extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h trunk/blender/extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h trunk/blender/extern/Eigen3/Eigen/src/Geometry/AlignedBox.h trunk/blender/extern/Eigen3/Eigen/src/Geometry/AngleAxis.h trunk/blender/extern/Eigen3/Eigen/src/Geometry/EulerAngles.h trunk/blender/extern/Eigen3/Eigen/src/Geometry/Homogeneous.h trunk/blender/extern/Eigen3/Eigen/src/Geometry/Hyperplane.h trunk/blender/extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h trunk/blender/extern/Eigen3/Eigen/src/Geometry/ParametrizedLine.h trunk/blender/extern/Eigen3/Eigen/src/Geometry/Quaternion.h trunk/blender/extern/Eigen3/Eigen/src/Geometry/Rotation2D.h trunk/blender/extern/Eigen3/Eigen/src/Geometry/RotationBase.h trunk/blender/extern/Eigen3/Eigen/src/Geometry/Scaling.h trunk/blender/extern/Eigen3/Eigen/src/Geometry/Transform.h trunk/blender/extern/Eigen3/Eigen/src/Geometry/Translation.h trunk/blender/extern/Eigen3/Eigen/src/Geometry/Umeyama.h trunk/blender/extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h trunk/blender/extern/Eigen3/Eigen/src/Householder/BlockHouseholder.h trunk/blender/extern/Eigen3/Eigen/src/Householder/Householder.h trunk/blender/extern/Eigen3/Eigen/src/Householder/HouseholderSequence.h trunk/blender/extern/Eigen3/Eigen/src/Jacobi/Jacobi.h trunk/blender/extern/Eigen3/Eigen/src/LU/Determinant.h trunk/blender/extern/Eigen3/Eigen/src/LU/FullPivLU.h trunk/blender/extern/Eigen3/Eigen/src/LU/Inverse.h trunk/blender/extern/Eigen3/Eigen/src/LU/PartialPivLU.h trunk/blender/extern/Eigen3/Eigen/src/LU/arch/Inverse_SSE.h trunk/blender/extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR.h trunk/blender/extern/Eigen3/Eigen/src/QR/FullPivHouseholderQR.h trunk/blender/extern/Eigen3/Eigen/src/QR/HouseholderQR.h trunk/blender/extern/Eigen3/Eigen/src/SVD/JacobiSVD.h trunk/blender/extern/Eigen3/Eigen/src/SVD/UpperBidiagonalization.h trunk/blender/extern/Eigen3/Eigen/src/StlSupport/StdDeque.h trunk/blender/extern/Eigen3/Eigen/src/StlSupport/StdList.h trunk/blender/extern/Eigen3/Eigen/src/StlSupport/StdVector.h trunk/blender/extern/Eigen3/Eigen/src/StlSupport/details.h trunk/blender/extern/Eigen3/Eigen/src/misc/Image.h trunk/blender/extern/Eigen3/Eigen/src/misc/Kernel.h trunk/blender/extern/Eigen3/Eigen/src/misc/Solve.h trunk/blender/extern/Eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h trunk/blender/extern/Eigen3/Eigen/src/plugins/BlockMethods.h trunk/blender/extern/Eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h trunk/blender/extern/Eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h trunk/blender/extern/Eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h trunk/blender/extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h trunk/blender/intern/itasc/CMakeLists.txt Added Paths: ----------- trunk/blender/extern/Eigen3/Eigen/CholmodSupport trunk/blender/extern/Eigen3/Eigen/IterativeLinearSolvers trunk/blender/extern/Eigen3/Eigen/OrderingMethods trunk/blender/extern/Eigen3/Eigen/PaStiXSupport trunk/blender/extern/Eigen3/Eigen/PardisoSupport trunk/blender/extern/Eigen3/Eigen/SparseCholesky trunk/blender/extern/Eigen3/Eigen/SparseCore trunk/blender/extern/Eigen3/Eigen/SuperLUSupport trunk/blender/extern/Eigen3/Eigen/UmfPackSupport trunk/blender/extern/Eigen3/Eigen/src/Cholesky/LLT_MKL.h trunk/blender/extern/Eigen3/Eigen/src/CholmodSupport/ trunk/blender/extern/Eigen3/Eigen/src/CholmodSupport/CholmodSupport.h trunk/blender/extern/Eigen3/Eigen/src/Core/Assign_MKL.h trunk/blender/extern/Eigen3/Eigen/src/Core/GeneralProduct.h trunk/blender/extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular_MKL.h trunk/blender/extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix_MKL.h trunk/blender/extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector_MKL.h trunk/blender/extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix_MKL.h trunk/blender/extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector_MKL.h trunk/blender/extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h trunk/blender/extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector_MKL.h trunk/blender/extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix_MKL.h trunk/blender/extern/Eigen3/Eigen/src/Core/util/MKL_support.h trunk/blender/extern/Eigen3/Eigen/src/Core/util/NonMPL2.h trunk/blender/extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur_MKL.h trunk/blender/extern/Eigen3/Eigen/src/Eigenvalues/RealSchur_MKL.h trunk/blender/extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_MKL.h trunk/blender/extern/Eigen3/Eigen/src/IterativeLinearSolvers/ trunk/blender/extern/Eigen3/Eigen/src/IterativeLinearSolvers/BasicPreconditioners.h trunk/blender/extern/Eigen3/Eigen/src/IterativeLinearSolvers/BiCGSTAB.h trunk/blender/extern/Eigen3/Eigen/src/IterativeLinearSolvers/ConjugateGradient.h trunk/blender/extern/Eigen3/Eigen/src/IterativeLinearSolvers/IncompleteLUT.h trunk/blender/extern/Eigen3/Eigen/src/IterativeLinearSolvers/IterativeSolverBase.h trunk/blender/extern/Eigen3/Eigen/src/LU/PartialPivLU_MKL.h trunk/blender/extern/Eigen3/Eigen/src/OrderingMethods/ trunk/blender/extern/Eigen3/Eigen/src/OrderingMethods/Amd.h trunk/blender/extern/Eigen3/Eigen/src/PaStiXSupport/ trunk/blender/extern/Eigen3/Eigen/src/PaStiXSupport/PaStiXSupport.h trunk/blender/extern/Eigen3/Eigen/src/PardisoSupport/ trunk/blender/extern/Eigen3/Eigen/src/PardisoSupport/PardisoSupport.h trunk/blender/extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR_MKL.h trunk/blender/extern/Eigen3/Eigen/src/QR/HouseholderQR_MKL.h trunk/blender/extern/Eigen3/Eigen/src/SVD/JacobiSVD_MKL.h trunk/blender/extern/Eigen3/Eigen/src/SparseCholesky/ trunk/blender/extern/Eigen3/Eigen/src/SparseCholesky/SimplicialCholesky.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/ trunk/blender/extern/Eigen3/Eigen/src/SparseCore/AmbiVector.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/CompressedStorage.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/ConservativeSparseSparseProduct.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/CoreIterators.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/MappedSparseMatrix.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/SparseAssign.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/SparseBlock.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/SparseCwiseBinaryOp.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/SparseCwiseUnaryOp.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/SparseDenseProduct.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/SparseDiagonalProduct.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/SparseDot.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/SparseFuzzy.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/SparseMatrix.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/SparseMatrixBase.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/SparsePermutation.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/SparseProduct.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/SparseRedux.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/SparseSelfAdjointView.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/SparseSparseProductWithPruning.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/SparseTranspose.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/SparseTriangularView.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/SparseUtil.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/SparseVector.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/SparseView.h trunk/blender/extern/Eigen3/Eigen/src/SparseCore/TriangularSolver.h trunk/blender/extern/Eigen3/Eigen/src/SuperLUSupport/ trunk/blender/extern/Eigen3/Eigen/src/SuperLUSupport/SuperLUSupport.h trunk/blender/extern/Eigen3/Eigen/src/UmfPackSupport/ trunk/blender/extern/Eigen3/Eigen/src/UmfPackSupport/UmfPackSupport.h trunk/blender/extern/Eigen3/Eigen/src/misc/SparseSolve.h trunk/blender/extern/Eigen3/Eigen/src/misc/blas.h Removed Paths: ------------- trunk/blender/extern/Eigen3/Eigen/src/Eigenvalues/EigenvaluesCommon.h trunk/blender/extern/Eigen3/Eigen/src/Sparse/ Modified: trunk/blender/extern/Eigen3/Eigen/Cholesky =================================================================== --- trunk/blender/extern/Eigen3/Eigen/Cholesky 2012-10-15 14:26:14 UTC (rev 51344) +++ trunk/blender/extern/Eigen3/Eigen/Cholesky 2012-10-15 16:29:23 UTC (rev 51345) @@ -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 Added: trunk/blender/extern/Eigen3/Eigen/CholmodSupport =================================================================== --- trunk/blender/extern/Eigen3/Eigen/CholmodSupport (rev 0) +++ trunk/blender/extern/Eigen3/Eigen/CholmodSupport 2012-10-15 16:29:23 UTC (rev 51345) @@ -0,0 +1,45 @@ +#ifndef EIGEN_CHOLMODSUPPORT_MODULE_H +#define EIGEN_CHOLMODSUPPORT_MODULE_H + +#include "SparseCore" + +#include "src/Core/util/DisableStupidWarnings.h" + +extern "C" { + #include <cholmod.h> +} + +/** \ingroup Support_modules + * \defgroup CholmodSupport_Module CholmodSupport module + * + * This module provides an interface to the Cholmod library which is part of the <a href="http://www.cise.ufl.edu/research/sparse/SuiteSparse/">suitesparse</a> package. + * It provides the two following main factorization classes: + * - class CholmodSupernodalLLT: a supernodal LLT Cholesky factorization. + * - class CholmodDecomposiiton: a general L(D)LT Cholesky factorization with automatic or explicit runtime selection of the underlying factorization method (supernodal or simplicial). + * + * For the sake of completeness, this module also propose the two following classes: + * - class CholmodSimplicialLLT + * - class CholmodSimplicialLDLT + * Note that these classes does not bring any particular advantage compared to the built-in + * SimplicialLLT and SimplicialLDLT factorization classes. + * + * \code + * #include <Eigen/CholmodSupport> + * \endcode + * + * In order to use this module, the cholmod headers must be accessible from the include paths, and your binary must be linked to the cholmod library and its dependencies. + * The dependencies depend on how cholmod has been compiled. + * For a cmake based project, you can use our FindCholmod.cmake module to help you in this task. + * + */ + +#include "src/misc/Solve.h" +#include "src/misc/SparseSolve.h" + +#include "src/CholmodSupport/CholmodSupport.h" + + +#include "src/Core/util/ReenableStupidWarnings.h" + +#endif // EIGEN_CHOLMODSUPPORT_MODULE_H + Modified: trunk/blender/extern/Eigen3/Eigen/Core =================================================================== --- trunk/blender/extern/Eigen3/Eigen/Core 2012-10-15 14:26:14 UTC (rev 51344) +++ trunk/blender/extern/Eigen3/Eigen/Core 2012-10-15 16:29:23 UTC (rev 51345) @@ -4,24 +4,9 @@ // Copyright (C) 2008 Gael Guennebaud <gael.guenneb...@inria.fr> // Copyright (C) 2007-2011 Benoit Jacob <jacob.benoi...@gmail.com> // -// Eigen is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 3 of the License, or (at your option) any later version. -// -// Alternatively, you can redistribute it and/or -// modify it under the terms of the GNU General Public License as -// published by the Free Software Foundation; either version 2 of -// the License, or (at your option) any later version. -// -// Eigen is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -// FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License or the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License and a copy of the GNU General Public License along with -// Eigen. If not, see <http://www.gnu.org/licenses/>. +// This Source Code Form is subject to the terms of the Mozilla +// Public License v. 2.0. If a copy of the MPL was not distributed +// with this file, You can obtain one at http://mozilla.org/MPL/2.0/. #ifndef EIGEN_CORE_H #define EIGEN_CORE_H @@ -34,6 +19,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 @@ -136,7 +127,7 @@ #endif // MSVC for windows mobile does not have the errno.h file -#if !(defined(_MSC_VER) && defined(_WIN32_WCE)) +#if !(defined(_MSC_VER) && defined(_WIN32_WCE)) && !defined(__ARMCC_VERSION) #define EIGEN_HAS_ERRNO #endif @@ -146,7 +137,6 @@ #include <cstddef> #include <cstdlib> #include <cmath> -#include <complex> #include <cassert> #include <functional> #include <iosfwd> @@ -175,9 +165,6 @@ #include <new> #endif -// defined in bits/termios.h -#undef B0 - /** \brief Namespace containing all symbols from the %Eigen library. */ namespace Eigen { @@ -201,6 +188,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 +236,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,15 +311,15 @@ #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" +#include "src/Core/products/GeneralBlockPanelKernel.h" #include "src/Core/products/Parallelizer.h" #include "src/Core/products/CoeffBasedProduct.h" -#include "src/Core/products/GeneralBlockPanelKernel.h" #include "src/Core/products/GeneralMatrixVector.h" #include "src/Core/products/GeneralMatrixMatrix.h" +#include "src/Core/SolveTriangular.h" #include "src/Core/products/GeneralMatrixMatrixTriangular.h" #include "src/Core/products/SelfadjointMatrixVector.h" #include "src/Core/products/SelfadjointMatrixMatrix.h" @@ -347,8 +340,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: trunk/blender/extern/Eigen3/Eigen/Eigen2Support =================================================================== --- trunk/blender/extern/Eigen3/Eigen/Eigen2Support 2012-10-15 14:26:14 UTC (rev 51344) +++ trunk/blender/extern/Eigen3/Eigen/Eigen2Support 2012-10-15 16:29:23 UTC (rev 51345) @@ -3,24 +3,9 @@ // // Copyright (C) 2009 Gael Guennebaud <gael.guenneb...@inria.fr> // -// Eigen is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 3 of the License, or (at your option) any later version. -// -// Alternatively, you can redistribute it and/or -// modify it under the terms of the GNU General Public License as -// published by the Free Software Foundation; either version 2 of -// the License, or (at your option) any later version. -// -// Eigen is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -// FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License or the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License and a copy of the GNU General Public License along with -// Eigen. If not, see <http://www.gnu.org/licenses/>. +// This Source Code Form is subject to the terms of the Mozilla +// Public License v. 2.0. If a copy of the MPL was not distributed +// with this file, You can obtain one at http://mozilla.org/MPL/2.0/. #ifndef EIGEN2SUPPORT_H #define EIGEN2SUPPORT_H @@ -31,9 +16,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 +40,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) \ @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs