From ee3ea5bfad0e520ee3826df43a286a8e7760d847 Mon Sep 17 00:00:00 2001 From: Zhaoyang Lv Date: Thu, 13 Nov 2014 21:14:07 -0500 Subject: [PATCH] reverse to previous MKL_BLAS defined order --- gtsam/3rdparty/gtsam_eigen_includes.h.in | 14 +++++--------- gtsam_unstable/timing/timeSFMExpressions.cpp | 8 ++++---- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/gtsam/3rdparty/gtsam_eigen_includes.h.in b/gtsam/3rdparty/gtsam_eigen_includes.h.in index fa09b4aaa..f53e37f07 100644 --- a/gtsam/3rdparty/gtsam_eigen_includes.h.in +++ b/gtsam/3rdparty/gtsam_eigen_includes.h.in @@ -17,6 +17,10 @@ #pragma once +#ifndef MKL_BLAS +#define MKL_BLAS MKL_DOMAIN_BLAS +#endif + #cmakedefine EIGEN_USE_MKL_ALL // This is also defined in config.h #include <@GTSAM_EIGEN_INCLUDE_PREFIX@Eigen/Dense> #include <@GTSAM_EIGEN_INCLUDE_PREFIX@Eigen/QR> @@ -24,14 +28,6 @@ #include <@GTSAM_EIGEN_INCLUDE_PREFIX@Eigen/SVD> #include <@GTSAM_EIGEN_INCLUDE_PREFIX@Eigen/Geometry> -#ifdef MKL_DOMAIN_BLAS -#define EIGEN_MKL_DOMAIN_BLAS MKL_DOMAIN_BLAS -#else -#define EIGEN_MKL_DOMAIN_BLAS MKL_BLAS -#endif - -#ifndef MKL_BLAS -#define MKL_BLAS MKL_DOMAIN_BLAS -#endif + diff --git a/gtsam_unstable/timing/timeSFMExpressions.cpp b/gtsam_unstable/timing/timeSFMExpressions.cpp index fc2a8d97e..678e4db60 100644 --- a/gtsam_unstable/timing/timeSFMExpressions.cpp +++ b/gtsam_unstable/timing/timeSFMExpressions.cpp @@ -47,15 +47,15 @@ int main() { // Create values Values values; values.insert(Symbol('K', 0), Cal3_S2()); - for (int i = 0; i < M; i++) + for (size_t i = 0; i < M; i++) values.insert(Symbol('x', i), Pose3()); - for (int j = 0; j < N; j++) + for (size_t j = 0; j < N; j++) values.insert(Symbol('p', j), Point3(0, 0, 1)); long timeLog = clock(); NonlinearFactorGraph graph; - for (int i = 0; i < M; i++) { - for (int j = 0; j < N; j++) { + for (size_t i = 0; i < M; i++) { + for (size_t j = 0; j < N; j++) { NonlinearFactor::shared_ptr f = boost::make_shared< ExpressionFactor > #ifdef TERNARY