devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

cleaning pass: rm unused variables in MKL stuff, fix a few namespace issues, MarketIO needs iostream

Browse Source
This commit is contained in:
Gael Guennebaud
2012-04-18 10:09:46 +02:00
parent 1198ca0284
commit 5cab18976b
9 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h
View File

@@ -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_*/ \

4
Eigen/src/Core/products/TriangularMatrixVector_MKL.h
View File

@@ -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); \

4
Eigen/src/Core/products/TriangularSolverMatrix_MKL.h
View File

@@ -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

2
Eigen/src/Eigenvalues/SelfAdjointEigenSolver_MKL.h
View File

@@ -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() ); \

2
Eigen/src/QR/ColPivHouseholderQR_MKL.h
View File

@@ -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);\

2
Eigen/src/SVD/JacobiSVD_MKL.h
View File

@@ -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; \