diff options
-rw-r--r-- | Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h | 4 | ||||
-rw-r--r-- | Eigen/src/Core/products/TriangularMatrixVector_MKL.h | 4 | ||||
-rw-r--r-- | Eigen/src/Core/products/TriangularSolverMatrix_MKL.h | 4 | ||||
-rw-r--r-- | Eigen/src/Eigenvalues/SelfAdjointEigenSolver_MKL.h | 2 | ||||
-rw-r--r-- | Eigen/src/QR/ColPivHouseholderQR_MKL.h | 2 | ||||
-rw-r--r-- | Eigen/src/SVD/JacobiSVD_MKL.h | 2 | ||||
-rw-r--r-- | unsupported/Eigen/SparseExtra | 2 | ||||
-rw-r--r-- | unsupported/Eigen/src/SparseExtra/MarketIO.h | 4 | ||||
-rw-r--r-- | unsupported/Eigen/src/SparseExtra/MatrixMarketIterator.h | 7 |
9 files changed, 20 insertions, 11 deletions
diff --git a/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h b/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h index 1322a4d1a..870037ee2 100644 --- a/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h +++ b/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h @@ -133,7 +133,7 @@ struct product_triangular_matrix_matrix_trmm<EIGTYPE,Index,Mode,true, \ char side = 'L', transa, uplo, diag = 'N'; \ EIGTYPE *b; \ const EIGTYPE *a; \ - MKL_INT m, n, k, lda, ldb, ldc; \ + MKL_INT m, n, lda, ldb; \ MKLTYPE alpha_; \ \ /* Set alpha_*/ \ @@ -247,7 +247,7 @@ struct product_triangular_matrix_matrix_trmm<EIGTYPE,Index,Mode,false, \ char side = 'R', transa, uplo, diag = 'N'; \ EIGTYPE *b; \ const EIGTYPE *a; \ - MKL_INT m, n, k, lda, ldb, ldc; \ + MKL_INT m, n, lda, ldb, ldc; \ MKLTYPE alpha_; \ \ /* Set alpha_*/ \ diff --git a/Eigen/src/Core/products/TriangularMatrixVector_MKL.h b/Eigen/src/Core/products/TriangularMatrixVector_MKL.h index eb9e6ff25..2d3732136 100644 --- a/Eigen/src/Core/products/TriangularMatrixVector_MKL.h +++ b/Eigen/src/Core/products/TriangularMatrixVector_MKL.h @@ -105,7 +105,7 @@ struct triangular_matrix_vector_product_trmv<Index,Mode,EIGTYPE,ConjLhs,EIGTYPE, /* Square part handling */\ \ char trans, uplo, diag; \ - MKL_INT m, n, k, lda, incx, incy; \ + MKL_INT m, n, lda, incx, incy; \ EIGTYPE const *a; \ MKLTYPE alpha_, beta_; \ assign_scalar_eig2mkl<MKLTYPE, EIGTYPE>(alpha_, alpha); \ @@ -190,7 +190,7 @@ struct triangular_matrix_vector_product_trmv<Index,Mode,EIGTYPE,ConjLhs,EIGTYPE, /* Square part handling */\ \ char trans, uplo, diag; \ - MKL_INT m, n, k, lda, incx, incy; \ + MKL_INT m, n, lda, incx, incy; \ EIGTYPE const *a; \ MKLTYPE alpha_, beta_; \ assign_scalar_eig2mkl<MKLTYPE, EIGTYPE>(alpha_, alpha); \ diff --git a/Eigen/src/Core/products/TriangularSolverMatrix_MKL.h b/Eigen/src/Core/products/TriangularSolverMatrix_MKL.h index 3ba20cdda..47699f210 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix_MKL.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix_MKL.h @@ -33,6 +33,8 @@ #ifndef EIGEN_TRIANGULAR_SOLVER_MATRIX_MKL_H #define EIGEN_TRIANGULAR_SOLVER_MATRIX_MKL_H +namespace Eigen { + namespace internal { // implements LeftSide op(triangular)^-1 * general @@ -148,4 +150,6 @@ EIGEN_MKL_TRSM_R(scomplex, MKL_Complex8, c) } // end namespace internal +} // end namespace Eigen + #endif // EIGEN_TRIANGULAR_SOLVER_MATRIX_MKL_H diff --git a/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_MKL.h b/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_MKL.h index 4877716c7..5ebcd08e1 100644 --- a/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_MKL.h +++ b/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_MKL.h @@ -66,7 +66,7 @@ SelfAdjointEigenSolver<Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW> >::compute(c \ lda = matrix.outerStride(); \ matrix_order=MKLCOLROW; \ - char jobz, uplo='L', range='A'; \ + char jobz, uplo='L'/*, range='A'*/; \ jobz = computeEigenvectors ? 'V' : 'N'; \ \ info = LAPACKE_##MKLNAME( matrix_order, jobz, uplo, n, (MKLTYPE*)m_eivec.data(), lda, (MKLRTYPE*)m_eivalues.data() ); \ diff --git a/Eigen/src/QR/ColPivHouseholderQR_MKL.h b/Eigen/src/QR/ColPivHouseholderQR_MKL.h index 645f309eb..0ad66d3f8 100644 --- a/Eigen/src/QR/ColPivHouseholderQR_MKL.h +++ b/Eigen/src/QR/ColPivHouseholderQR_MKL.h @@ -58,7 +58,7 @@ ColPivHouseholderQR<Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW, Dynamic, Dynami m_hCoeffs.resize(size);\ \ m_colsTranspositions.resize(cols);\ - Index number_of_transpositions = 0;\ + /*Index number_of_transpositions = 0;*/ \ \ m_nonzero_pivots = 0; \ m_maxpivot = RealScalar(0);\ diff --git a/Eigen/src/SVD/JacobiSVD_MKL.h b/Eigen/src/SVD/JacobiSVD_MKL.h index 0afab4dc9..1eeafca49 100644 --- a/Eigen/src/SVD/JacobiSVD_MKL.h +++ b/Eigen/src/SVD/JacobiSVD_MKL.h @@ -49,7 +49,7 @@ JacobiSVD<Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW, Dynamic, Dynamic>, ColPiv typedef MatrixType::RealScalar RealScalar; \ allocate(matrix.rows(), matrix.cols(), computationOptions); \ \ - const RealScalar precision = RealScalar(2) * NumTraits<Scalar>::epsilon(); \ + /*const RealScalar precision = RealScalar(2) * NumTraits<Scalar>::epsilon();*/ \ m_nonzeroSingularValues = m_diagSize; \ \ lapack_int lda = matrix.outerStride(), ldu, ldvt; \ diff --git a/unsupported/Eigen/SparseExtra b/unsupported/Eigen/SparseExtra index 2cc14bbe1..340c34736 100644 --- a/unsupported/Eigen/SparseExtra +++ b/unsupported/Eigen/SparseExtra @@ -39,9 +39,7 @@ #if !defined(_WIN32) #include <dirent.h> -namespace Eigen { #include "src/SparseExtra/MatrixMarketIterator.h" -} #endif #include "../../Eigen/src/Core/util/ReenableStupidWarnings.h" diff --git a/unsupported/Eigen/src/SparseExtra/MarketIO.h b/unsupported/Eigen/src/SparseExtra/MarketIO.h index d034d8e2f..ef5dcf9f0 100644 --- a/unsupported/Eigen/src/SparseExtra/MarketIO.h +++ b/unsupported/Eigen/src/SparseExtra/MarketIO.h @@ -26,6 +26,8 @@ #ifndef EIGEN_SPARSE_MARKET_IO_H #define EIGEN_SPARSE_MARKET_IO_H +#include <iostream> + namespace Eigen { namespace internal @@ -117,7 +119,7 @@ namespace internal out << value.real << " " << value.imag()<< "\n"; } -} +} // end namepsace internal inline bool getMarketHeader(const std::string& filename, int& sym, bool& iscomplex, bool& isvector) { diff --git a/unsupported/Eigen/src/SparseExtra/MatrixMarketIterator.h b/unsupported/Eigen/src/SparseExtra/MatrixMarketIterator.h index 322780ef9..5a50bc5bc 100644 --- a/unsupported/Eigen/src/SparseExtra/MatrixMarketIterator.h +++ b/unsupported/Eigen/src/SparseExtra/MatrixMarketIterator.h @@ -2,7 +2,7 @@ // This file is part of Eigen, a lightweight C++ template library // for linear algebra. // -// Copyright (C) 2012 +// Copyright (C) 2012 Desire NUENTSA WAKAM <desire.nuentsa_wakam@inria.fr> // // Eigen is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -22,9 +22,12 @@ // 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/>. + #ifndef EIGEN_BROWSE_MATRICES_H #define EIGEN_BROWSE_MATRICES_H +namespace Eigen { + enum { SPD = 0x100, NonSymmetric = 0x0 @@ -227,4 +230,6 @@ class MatrixMarketIterator }; +} // end namespace Eigen + #endif |