diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2016-05-26 17:29:04 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2016-05-26 17:29:04 +0200 |
| commit | 2a44a7014230398d8ed0e2f776bfea5d9ea75b8f (patch) | |
| tree | 61fde3675097bd59d6640577865ba15125f32180 /Eigen/src/QR/ColPivHouseholderQR_MKL.h | |
| parent | f253e192966fb07a58a975fd442de00f78784d58 (diff) | |
Handle some Index to int conversions in BLAS/LAPACK support.
Diffstat (limited to 'Eigen/src/QR/ColPivHouseholderQR_MKL.h')
| -rw-r--r-- | Eigen/src/QR/ColPivHouseholderQR_MKL.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Eigen/src/QR/ColPivHouseholderQR_MKL.h b/Eigen/src/QR/ColPivHouseholderQR_MKL.h index 1203d0d36..65391a5d2 100644 --- a/Eigen/src/QR/ColPivHouseholderQR_MKL.h +++ b/Eigen/src/QR/ColPivHouseholderQR_MKL.h @@ -65,18 +65,19 @@ ColPivHouseholderQR<Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW, Dynamic, Dynami m_colsPermutation.resize(cols); \ m_colsPermutation.indices().setZero(); \ \ - lapack_int lda = m_qr.outerStride(), i; \ + lapack_int lda = internal::convert_index<lapack_int,Index>(m_qr.outerStride()); \ lapack_int matrix_order = MKLCOLROW; \ - LAPACKE_##MKLPREFIX##geqp3( matrix_order, rows, cols, (MKLTYPE*)m_qr.data(), lda, (lapack_int*)m_colsPermutation.indices().data(), (MKLTYPE*)m_hCoeffs.data()); \ + LAPACKE_##MKLPREFIX##geqp3( matrix_order, internal::convert_index<lapack_int,Index>(rows), internal::convert_index<lapack_int,Index>(cols), \ + (MKLTYPE*)m_qr.data(), lda, (lapack_int*)m_colsPermutation.indices().data(), (MKLTYPE*)m_hCoeffs.data()); \ m_isInitialized = true; \ m_maxpivot=m_qr.diagonal().cwiseAbs().maxCoeff(); \ m_hCoeffs.adjointInPlace(); \ RealScalar premultiplied_threshold = abs(m_maxpivot) * threshold(); \ lapack_int *perm = m_colsPermutation.indices().data(); \ - for(i=0;i<size;i++) { \ + for(Index i=0;i<size;i++) { \ m_nonzero_pivots += (abs(m_qr.coeff(i,i)) > premultiplied_threshold);\ } \ - for(i=0;i<cols;i++) perm[i]--;\ + for(Index i=0;i<cols;i++) perm[i]--;\ \ /*m_det_pq = (number_of_transpositions%2) ? -1 : 1; // TODO: It's not needed now; fix upon availability in Eigen */ \ \ |