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

Replace GTSAM_USE_SYSTEM_EIGEN check for householder_qr_inplace_blocked 

The check was based on whether we are using the included version of
Eigen or the system version, but since Eigen v3.2.5, our patches are
included in the upstream Eigen, so check for Eigen version instead.
release/4.3a0
Kartik Mohta 2016-02-09 22:12:01 -05:00
parent 9a7dba75c4
commit 659ffeda02
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam/base/Matrix.cpp
View File

@ -704,11 +704,9 @@ void inplace_QR(Matrix& A){
HCoeffsType hCoeffs(size); HCoeffsType hCoeffs(size);
RowVectorType temp(cols); RowVectorType temp(cols);
#ifdef GTSAM_USE_SYSTEM_EIGEN #if !EIGEN_VERSION_AT_LEAST(3,2,5)
// System-Eigen is used, and MKL is off
Eigen::internal::householder_qr_inplace_blocked<Matrix, HCoeffsType>(A, hCoeffs, 48, temp.data()); Eigen::internal::householder_qr_inplace_blocked<Matrix, HCoeffsType>(A, hCoeffs, 48, temp.data());
#else #else
// Patched Eigen is used, and MKL is either on or off
Eigen::internal::householder_qr_inplace_blocked<Matrix, HCoeffsType>::run(A, hCoeffs, 48, temp.data()); Eigen::internal::householder_qr_inplace_blocked<Matrix, HCoeffsType>::run(A, hCoeffs, 48, temp.data());
#endif #endif