diff --git a/examples/autopoint/CMakeLists.txt b/examples/autopoint/CMakeLists.txt index d96e6dac2..3475a86f7 100644 --- a/examples/autopoint/CMakeLists.txt +++ b/examples/autopoint/CMakeLists.txt @@ -12,7 +12,7 @@ project( VolEsti ) option(DISABLE_NLP_ORACLES "Disable non-linear oracles (used in collocation)" ON) option(BUILTIN_EIGEN "Use eigen from ../external" OFF) option(BUILTIN_AUTODIFF "Use eigen from ../external" OFF) -option(USE_MKL "Use MKL library to build eigen" ON) +option(USE_MKL "Use MKL library to build eigen" OFF) CMAKE_MINIMUM_REQUIRED(VERSION 3.17) @@ -141,7 +141,7 @@ endif() add_definitions(${CMAKE_CXX_FLAGS} "-std=c++17") # enable C++14 standard add_definitions(${CMAKE_CXX_FLAGS} "-O3") # optimization of the compiler add_definitions(${CMAKE_CXX_FLAGS} "-pthread") # optimization of the compiler - + #add_definitions(${CXX_COVERAGE_COMPILE_FLAGS} "-lgsl") add_definitions(${CXX_COVERAGE_COMPILE_FLAGS} "-lm") add_definitions(${CMAKE_CXX_FLAGS} "-DMKL_ILP64") diff --git a/include/preprocess/crhmc/crhmc_utils.h b/include/preprocess/crhmc/crhmc_utils.h index 7e48e88fe..6e8c3f89d 100644 --- a/include/preprocess/crhmc/crhmc_utils.h +++ b/include/preprocess/crhmc/crhmc_utils.h @@ -375,7 +375,7 @@ void set(MatrixType &a, std::vectorconst & idx, const Type c){ } } template -void saxpy(MatrixType &a,MatrixType const &b,MatrixType const& c, std::vectorconst & a_idx, std::vectorconst & b_idx){ +void volesti_saxpy(MatrixType &a,MatrixType const &b,MatrixType const& c, std::vectorconst & a_idx, std::vectorconst & b_idx){ for(int i=0;i class two_sided_barrier { VT c = (ub + lb) / 2; VT bias1=VT::Ones(x2, 1) * unbounded_center_coord; - saxpy(c,lb,bias1,lowerIdx,lowerIdx); + volesti_saxpy(c,lb,bias1,lowerIdx,lowerIdx); VT bias2=-VT::Ones(x1, 1) * unbounded_center_coord; - saxpy(c,ub,bias2,upperIdx,upperIdx); + volesti_saxpy(c,ub,bias2,upperIdx,upperIdx); set(c, freeIdx, 0.0); center = c; diff --git a/include/preprocess/crhmc/weighted_two_sided_barrier.h b/include/preprocess/crhmc/weighted_two_sided_barrier.h index 09f5eb798..4df8cc967 100644 --- a/include/preprocess/crhmc/weighted_two_sided_barrier.h +++ b/include/preprocess/crhmc/weighted_two_sided_barrier.h @@ -143,9 +143,9 @@ template class weighted_two_sided_barrier { VT c = (ub + lb) / 2; VT bias1=VT::Ones(x2, 1) * unbounded_center_coord; - saxpy(c,lb,bias1,lowerIdx,lowerIdx); + volesti_saxpy(c,lb,bias1,lowerIdx,lowerIdx); VT bias2=-VT::Ones(x1, 1) * unbounded_center_coord; - saxpy(c,ub,bias2,upperIdx,upperIdx); + volesti_saxpy(c,ub,bias2,upperIdx,upperIdx); set(c, freeIdx, 0.0); center = c; diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4482d3b9d..3bde869d2 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -191,6 +191,7 @@ add_definitions(${CMAKE_CXX_FLAGS} "-g") # enable debuger #add_definitions(${CMAKE_CXX_FLAGS} "-Wall") add_definitions(${CMAKE_CXX_FLAGS} "-O3") # optimization of the compiler +add_definitions(${CMAKE_CXX_FLAGS} "-std=c++17") #enable the c++17 support needed by autodiff #add_definitions(${CXX_COVERAGE_COMPILE_FLAGS} "-lgsl") add_definitions(${CXX_COVERAGE_COMPILE_FLAGS} "-lm") add_definitions(${CXX_COVERAGE_COMPILE_FLAGS} "-ldl")