diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2012-04-18 18:36:25 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2012-04-18 18:36:25 +0200 |
| commit | 1741dbce1adc1f435c3d0f6a69d3d6ae62b32909 (patch) | |
| tree | 116bd56e310f8882a500209575d77318cad31b03 /Eigen/src/Core/products | |
| parent | 57b5767fe25456f6d80f8c460b45cb1d1cab0da9 (diff) | |
fix more warnings in MKL support
Diffstat (limited to 'Eigen/src/Core/products')
| -rw-r--r-- | Eigen/src/Core/products/GeneralMatrixMatrix_MKL.h | 4 | ||||
| -rw-r--r-- | Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h | 6 | ||||
| -rw-r--r-- | Eigen/src/Core/products/TriangularMatrixVector_MKL.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Eigen/src/Core/products/GeneralMatrixMatrix_MKL.h b/Eigen/src/Core/products/GeneralMatrixMatrix_MKL.h index da985e2d1..060af328e 100644 --- a/Eigen/src/Core/products/GeneralMatrixMatrix_MKL.h +++ b/Eigen/src/Core/products/GeneralMatrixMatrix_MKL.h @@ -58,8 +58,8 @@ static void run(Index rows, Index cols, Index depth, \ const EIGTYPE* _rhs, Index rhsStride, \ EIGTYPE* res, Index resStride, \ EIGTYPE alpha, \ - level3_blocking<EIGTYPE, EIGTYPE>& blocking, \ - GemmParallelInfo<Index>* info = 0) \ + level3_blocking<EIGTYPE, EIGTYPE>& /*blocking*/, \ + GemmParallelInfo<Index>* /*info = 0*/) \ { \ using std::conj; \ \ diff --git a/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h b/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h index 870037ee2..8173da5bb 100644 --- a/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h +++ b/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h @@ -124,7 +124,7 @@ struct product_triangular_matrix_matrix_trmm<EIGTYPE,Index,Mode,true, \ MKL_INT aStride = aa_tmp.outerStride(); \ gemm_blocking_space<ColMajor,EIGTYPE,EIGTYPE,Dynamic,Dynamic,Dynamic> blocking(_rows,_cols,_depth); \ general_matrix_matrix_product<Index,EIGTYPE,LhsStorageOrder,ConjugateLhs,EIGTYPE,RhsStorageOrder,ConjugateRhs,ColMajor>::run( \ - rows, cols, depth, aa_tmp.data(), aStride, _rhs, rhsStride, res, resStride, alpha, blocking); \ + rows, cols, depth, aa_tmp.data(), aStride, _rhs, rhsStride, res, resStride, alpha, blocking, 0); \ \ /*std::cout << "TRMM_L: A is not square! Go to MKL GEMM implementation! " << nthr<<" \n";*/ \ } \ @@ -238,7 +238,7 @@ struct product_triangular_matrix_matrix_trmm<EIGTYPE,Index,Mode,false, \ MKL_INT aStride = aa_tmp.outerStride(); \ gemm_blocking_space<ColMajor,EIGTYPE,EIGTYPE,Dynamic,Dynamic,Dynamic> blocking(_rows,_cols,_depth); \ general_matrix_matrix_product<Index,EIGTYPE,LhsStorageOrder,ConjugateLhs,EIGTYPE,RhsStorageOrder,ConjugateRhs,ColMajor>::run( \ - rows, cols, depth, _lhs, lhsStride, aa_tmp.data(), aStride, res, resStride, alpha, blocking); \ + rows, cols, depth, _lhs, lhsStride, aa_tmp.data(), aStride, res, resStride, alpha, blocking, 0); \ \ /*std::cout << "TRMM_R: A is not square! Go to MKL GEMM implementation! " << nthr<<" \n";*/ \ } \ @@ -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, lda, ldb, ldc; \ + MKL_INT m, n, lda, ldb; \ MKLTYPE alpha_; \ \ /* Set alpha_*/ \ diff --git a/Eigen/src/Core/products/TriangularMatrixVector_MKL.h b/Eigen/src/Core/products/TriangularMatrixVector_MKL.h index 2d3732136..3c2c3049a 100644 --- a/Eigen/src/Core/products/TriangularMatrixVector_MKL.h +++ b/Eigen/src/Core/products/TriangularMatrixVector_MKL.h @@ -138,7 +138,7 @@ struct triangular_matrix_vector_product_trmv<Index,Mode,EIGTYPE,ConjLhs,EIGTYPE, m = rows-size; \ n = size; \ } \ - if (size<cols) { \ + else { \ x += size; \ y = _res; \ a = _lhs + size*lda; \ @@ -223,7 +223,7 @@ struct triangular_matrix_vector_product_trmv<Index,Mode,EIGTYPE,ConjLhs,EIGTYPE, m = rows-size; \ n = size; \ } \ - if (size<cols) { \ + else { \ x += size; \ y = _res; \ a = _lhs + size; \ |