[ci skip] minor changes (not working on mac)

waf_tools/mkl.py

@@ -92,11 +92,11 @@ def check_mkl(conf):
     conf.env.LIBPATH_MKL_TBB = libpath_mkl
     conf.env.LIBPATH_MKL_OMP = libpath_mkl
     conf.env.CXXFLAGS_MKL_SEQ = ["-m64",  "-DEIGEN_USE_MKL_ALL", "-DMKL_BLAS=MKL_DOMAIN_BLAS"]
-    conf.env.LINKFLAGS_MKL_SEQ = [ "-Wl,--no-as-needed" ]
+    #conf.env.LINKFLAGS_MKL_SEQ = [ "-Wl,--no-as-needed" ]
     conf.env.CXXFLAGS_MKL_TBB = ["-m64",  "-DEIGEN_USE_MKL_ALL" , "-DMKL_BLAS=MKL_DOMAIN_BLAS"]
-    conf.env.LINKFLAGS_MKL_TBB = [ "-Wl,--no-as-needed" ]
+    #conf.env.LINKFLAGS_MKL_TBB = [ "-Wl,--no-as-needed" ]
     if  conf.env.CXX_NAME in ["icc", "icpc"]:
         conf.env.CXXFLAGS_MKL_OMP = ["-qopenmp", "-m64",  "-DEIGEN_USE_MKL_ALL", "-DMKL_BLAS=MKL_DOMAIN_BLAS" ]
     else:
         conf.env.CXXFLAGS_MKL_OMP = ["-fopenmp", "-m64",  "-DEIGEN_USE_MKL_ALL", "-DMKL_BLAS=MKL_DOMAIN_BLAS"]
-    conf.env.LINKFLAGS_MKL_OMP = [ "-Wl,--no-as-needed" ]
+    #conf.env.LINKFLAGS_MKL_OMP = [ "-Wl,--no-as-needed" ]

wscript

@@ -158,7 +158,7 @@ def configure(conf):
         Logs.pprint('NORMAL', '[developers] To compile the BO benchmarks: ./waf build_bo_benchmarks')
         Logs.pprint('NORMAL', '[developers] To run the BO benchmarks: ./waf run_bo_benchmarks')
         Logs.pprint('NORMAL', '[developers] To compile the regression benchmarks (requires a json file with the setup): ./waf --regression_benchmarks file.json')
-        Logs.pprint('NORMAL', '[developers] To run the regression benchmarks: ./waf run_regression_benchmarks')
+        Logs.pprint('NORMAL', '[developers] To run the regression benchmarks: ./waf run_regression_benchmarks --regression_benchmarks file.json')
         Logs.pprint('NORMAL', '[developers] To compile the extensive tests: ./waf build_extensive_tests')