From 659ffeda02b9c40431b8c9fedf3569c3a4c67c8b Mon Sep 17 00:00:00 2001 From: Kartik Mohta Date: Tue, 9 Feb 2016 22:12:01 -0500 Subject: [PATCH] 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. --- gtsam/base/Matrix.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gtsam/base/Matrix.cpp b/gtsam/base/Matrix.cpp index c6af89486..eae3dc48b 100644 --- a/gtsam/base/Matrix.cpp +++ b/gtsam/base/Matrix.cpp @@ -704,11 +704,9 @@ void inplace_QR(Matrix& A){ HCoeffsType hCoeffs(size); RowVectorType temp(cols); -#ifdef GTSAM_USE_SYSTEM_EIGEN - // System-Eigen is used, and MKL is off +#if !EIGEN_VERSION_AT_LEAST(3,2,5) Eigen::internal::householder_qr_inplace_blocked(A, hCoeffs, 48, temp.data()); #else - // Patched Eigen is used, and MKL is either on or off Eigen::internal::householder_qr_inplace_blocked::run(A, hCoeffs, 48, temp.data()); #endif