From 5cab18976bc2be4f9568777ed81db3d7ed4aba5a Mon Sep 17 00:00:00 2001
From: Gael Guennebaud <g.gael@free.fr>
Date: Wed, 18 Apr 2012 10:09:46 +0200
Subject: cleaning pass: rm unused variables in MKL stuff, fix a few namespace
 issues, MarketIO needs iostream

---
 Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h | 4 ++--
 Eigen/src/Core/products/TriangularMatrixVector_MKL.h | 4 ++--
 Eigen/src/Core/products/TriangularSolverMatrix_MKL.h | 4 ++++
 Eigen/src/Eigenvalues/SelfAdjointEigenSolver_MKL.h   | 2 +-
 Eigen/src/QR/ColPivHouseholderQR_MKL.h               | 2 +-
 Eigen/src/SVD/JacobiSVD_MKL.h                        | 2 +-
 6 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'Eigen/src')

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; \
-- 
cgit v1.2.3