12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Using struct specialization to select MKL Householder QR in Eigen

release/4.3a0
Richard Roberts 2013-11-27 20:55:53 +00:00
parent 513b5fd8d6
commit 9b8004d780
3 changed files with 64 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gtsam/3rdparty/Eigen/Eigen/src/QR/HouseholderQR.h vendored
View File

@ -251,20 +251,23 @@ void householder_qr_inplace_unblocked(MatrixQR& mat, HCoeffs& hCoeffs, typename
} }
/** \internal */ /** \internal */
template<typename MatrixQR, typename HCoeffs> template<typename MatrixQR, typename HCoeffs, typename Scalar = MatrixQR::Scalar>
void householder_qr_inplace_blocked(MatrixQR& mat, HCoeffs& hCoeffs, struct householder_qr_inplace_blocked
{
// This is specialized for MKL-supported Scalar types in HouseholderQR_MKL.h
static void run(MatrixQR& mat, HCoeffs& hCoeffs,
typename MatrixQR::Index maxBlockSize=32, typename MatrixQR::Index maxBlockSize=32,
typename MatrixQR::Scalar* tempData = 0) typename MatrixQR::Scalar* tempData = 0)
{ {
typedef typename MatrixQR::Index Index; typedef typename MatrixQR::Index Index;
typedef typename MatrixQR::Scalar Scalar; typedef typename MatrixQR::Scalar Scalar;
typedef Block<MatrixQR,Dynamic,Dynamic> BlockType; typedef Block<MatrixQR, Dynamic, Dynamic> BlockType;
Index rows = mat.rows(); Index rows = mat.rows();
Index cols = mat.cols(); Index cols = mat.cols();
Index size = (std::min)(rows, cols); Index size = (std::min)(rows, cols);
typedef Matrix<Scalar,Dynamic,1,ColMajor,MatrixQR::MaxColsAtCompileTime,1> TempType; typedef Matrix<Scalar, Dynamic, 1, ColMajor, MatrixQR::MaxColsAtCompileTime, 1> TempType;
TempType tempVector; TempType tempVector;
if(tempData==0) if(tempData==0)
{ {
@ -272,12 +275,12 @@ void householder_qr_inplace_blocked(MatrixQR& mat, HCoeffs& hCoeffs,
tempData = tempVector.data(); tempData = tempVector.data();
} }
Index blockSize = (std::min)(maxBlockSize,size); Index blockSize = (std::min)(maxBlockSize, size);
Index k = 0; Index k = 0;
for (k = 0; k < size; k += blockSize) for(k = 0; k < size; k += blockSize)
{ {
Index bs = (std::min)(size-k,blockSize); // actual size of the block Index bs = (std::min)(size-k, blockSize); // actual size of the block
Index tcols = cols - k - bs; // trailing columns Index tcols = cols - k - bs; // trailing columns
Index brows = rows-k; // rows of the block Index brows = rows-k; // rows of the block
@ -289,18 +292,19 @@ void householder_qr_inplace_blocked(MatrixQR& mat, HCoeffs& hCoeffs,
// and update [A21^T A22^T]^T using level 3 operations. // and update [A21^T A22^T]^T using level 3 operations.
// Finally, the algorithm continue on A22 // Finally, the algorithm continue on A22
BlockType A11_21 = mat.block(k,k,brows,bs); BlockType A11_21 = mat.block(k, k, brows, bs);
Block<HCoeffs,Dynamic,1> hCoeffsSegment = hCoeffs.segment(k,bs); Block<HCoeffs, Dynamic, 1> hCoeffsSegment = hCoeffs.segment(k, bs);
householder_qr_inplace_unblocked(A11_21, hCoeffsSegment, tempData); householder_qr_inplace_unblocked(A11_21, hCoeffsSegment, tempData);
if(tcols) if(tcols)
{ {
BlockType A21_22 = mat.block(k,k+bs,brows,tcols); BlockType A21_22 = mat.block(k, k+bs, brows, tcols);
apply_block_householder_on_the_left(A21_22,A11_21,hCoeffsSegment.adjoint()); apply_block_householder_on_the_left(A21_22, A11_21, hCoeffsSegment.adjoint());
} }
} }
} }
};
template<typename _MatrixType, typename Rhs> template<typename _MatrixType, typename Rhs>
struct solve_retval<HouseholderQR<_MatrixType>, Rhs> struct solve_retval<HouseholderQR<_MatrixType>, Rhs>
@ -352,7 +356,7 @@ HouseholderQR<MatrixType>& HouseholderQR<MatrixType>::compute(const MatrixType&
m_temp.resize(cols); m_temp.resize(cols);
internal::householder_qr_inplace_blocked(m_qr, m_hCoeffs, 48, m_temp.data()); internal::householder_qr_inplace_blocked<MatrixType, HCoeffsType>::run(m_qr, m_hCoeffs, 48, m_temp.data());
m_isInitialized = true; m_isInitialized = true;
return *this; return *this;

16
gtsam/3rdparty/Eigen/Eigen/src/QR/HouseholderQR_MKL.h vendored
View File

@ -38,24 +38,26 @@
namespace Eigen { namespace Eigen {
namespace internal { namespace internal {
/** \internal Specialization for the data types supported by MKL */ /** \internal Specialization for the data types supported by MKL */
#define EIGEN_MKL_QR_NOPIV(EIGTYPE, MKLTYPE, MKLPREFIX) \ #define EIGEN_MKL_QR_NOPIV(EIGTYPE, MKLTYPE, MKLPREFIX) \
template<typename MatrixQR, typename HCoeffs> \ template<typename MatrixQR, typename HCoeffs> \
void householder_qr_inplace_blocked(MatrixQR& mat, HCoeffs& hCoeffs, \ struct householder_qr_inplace_blocked<MatrixQR, HCoeffs, EIGTYPE> \
typename MatrixQR::Index maxBlockSize=32, \
EIGTYPE* tempData = 0) \
{ \ { \
static void run(MatrixQR& mat, HCoeffs& hCoeffs, \
typename MatrixQR::Index = 32, \
typename MatrixQR::Scalar* = 0) \
{ \
lapack_int m = (lapack_int) mat.rows(); \ lapack_int m = (lapack_int) mat.rows(); \
lapack_int n = (lapack_int) mat.cols(); \ lapack_int n = (lapack_int) mat.cols(); \
lapack_int lda = (lapack_int) mat.outerStride(); \ lapack_int lda = (lapack_int) mat.outerStride(); \
lapack_int matrix_order = (MatrixQR::IsRowMajor) ? LAPACK_ROW_MAJOR : LAPACK_COL_MAJOR; \ lapack_int matrix_order = (MatrixQR::IsRowMajor) ? LAPACK_ROW_MAJOR : LAPACK_COL_MAJOR; \
LAPACKE_##MKLPREFIX##geqrf( matrix_order, m, n, (MKLTYPE*)mat.data(), lda, (MKLTYPE*)hCoeffs.data()); \ LAPACKE_##MKLPREFIX##geqrf( matrix_order, m, n, (MKLTYPE*)mat.data(), lda, (MKLTYPE*)hCoeffs.data()); \
hCoeffs.adjointInPlace(); \ hCoeffs.adjointInPlace(); \
\ } \
} };
EIGEN_MKL_QR_NOPIV(double, double, d) EIGEN_MKL_QR_NOPIV(double, double, d)
EIGEN_MKL_QR_NOPIV(float, float, s) EIGEN_MKL_QR_NOPIV(float, float, s)

2
gtsam/base/Matrix.h
View File

@ -336,7 +336,7 @@ void inplace_QR(MATRIX& A) {
HCoeffsType hCoeffs(size); HCoeffsType hCoeffs(size);
RowVectorType temp(cols); RowVectorType temp(cols);
Eigen::internal::householder_qr_inplace_blocked(A, hCoeffs, 48, temp.data()); Eigen::internal::householder_qr_inplace_blocked<MATRIX, HCoeffsType>::run(A, hCoeffs, 48, temp.data());
zeroBelowDiagonal(A); zeroBelowDiagonal(A);
} }