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

reverse to previous MKL_BLAS defined order

release/4.3a0
Zhaoyang Lv 2014-11-13 21:14:07 -05:00
parent c4f3a48bc9
commit ee3ea5bfad
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtsam/3rdparty/gtsam_eigen_includes.h.in vendored
View File

@ -17,6 +17,10 @@
#pragma once #pragma once
#ifndef MKL_BLAS
#define MKL_BLAS MKL_DOMAIN_BLAS
#endif
#cmakedefine EIGEN_USE_MKL_ALL // This is also defined in config.h #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/Dense>
#include <@GTSAM_EIGEN_INCLUDE_PREFIX@Eigen/QR> #include <@GTSAM_EIGEN_INCLUDE_PREFIX@Eigen/QR>
@ -24,14 +28,6 @@
#include <@GTSAM_EIGEN_INCLUDE_PREFIX@Eigen/SVD> #include <@GTSAM_EIGEN_INCLUDE_PREFIX@Eigen/SVD>
#include <@GTSAM_EIGEN_INCLUDE_PREFIX@Eigen/Geometry> #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

8
gtsam_unstable/timing/timeSFMExpressions.cpp
View File

@ -47,15 +47,15 @@ int main() {
// Create values // Create values
Values values; Values values;
values.insert(Symbol('K', 0), Cal3_S2()); 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()); 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)); values.insert(Symbol('p', j), Point3(0, 0, 1));
long timeLog = clock(); long timeLog = clock();
NonlinearFactorGraph graph; NonlinearFactorGraph graph;
for (int i = 0; i < M; i++) { for (size_t i = 0; i < M; i++) {
for (int j = 0; j < N; j++) { for (size_t j = 0; j < N; j++) {
NonlinearFactor::shared_ptr f = boost::make_shared< NonlinearFactor::shared_ptr f = boost::make_shared<
ExpressionFactor<Point2> > ExpressionFactor<Point2> >
#ifdef TERNARY #ifdef TERNARY