Bug in wscript. omp instead of openmp

src/limbo/kernel_functions.hpp

@@ -51,7 +51,7 @@ namespace limbo {
     template<typename Params>
     struct SquaredExpARD {
       SquaredExpARD(int dim = 1) : _sf2(0), _ell(dim), _input_dim(dim) {
-        ->set_h_params(Eigen::VectorXd::Ones(_ell.size() + 1) * -1);
+        this->set_h_params(Eigen::VectorXd::Ones(_ell.size() + 1) * -1);
       }
 
       size_t h_params_size() const {
@@ -83,9 +83,11 @@ namespace limbo {
         double z = (x1 - x2).cwiseQuotient(_ell).squaredNorm();
         return _sf2 * exp(-0.5 * z);
       }
+
       const Eigen::VectorXd& ell() const {
         return _ell;
       }
+
      protected:
       double _sf2;
       Eigen::VectorXd _ell;

wscript

@@ -16,11 +16,11 @@ def options(opt):
         opt.load('compiler_c')
         opt.load('eigen')
         opt.load('tbb')
-        opt.load('omp')
         opt.load('mkl')
         opt.load('sferes')
         opt.load('limbo')
-        opt.load('ode')
+        opt.load('openmp')
+        #opt.load('ode')
         opt.add_option('--exp', type='string', help='exp(s) to build, separate by comma', dest='exp')
         opt.add_option('--qsub', type='string', help='config file (json) to submit to torque', dest='qsub')
         opt.add_option('--oar', type='string', help='config file (json) to submit to oar', dest='oar')
@@ -34,7 +34,9 @@ def configure(conf):
         conf.load('compiler_c')
         conf.load('eigen')
         conf.load('tbb')
+        conf.load('mkl')
         conf.load('sferes')
+        conf.load('openmp')
         conf.load('xcode')
 
         if conf.env.CXX_NAME in ["icc", "icpc"]:
@@ -55,7 +57,7 @@ def configure(conf):
         conf.check_openmp()
         conf.check_mkl()
         conf.check_sferes()
-        conf.check_ode()
+        #conf.check_ode()
         if conf.is_defined('USE_TBB'):
                 common_flags += " -DUSE_TBB"