Enable c++17 support in tests and fix saxpy calls

vfisikop · Mar 6, 2024 · 3b8e6d6 · 3b8e6d6
1 parent b2b5c06
commit 3b8e6d6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git 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
@@ -375,7 +375,7 @@ void set(MatrixType &a, std::vector<IndexType>const & idx, const Type c){
   }
 }
 template<typename MatrixType, typename IndexType>
-void saxpy(MatrixType &a,MatrixType const &b,MatrixType const& c, std::vector<IndexType>const & a_idx, std::vector<IndexType>const & b_idx){
+void volesti_saxpy(MatrixType &a,MatrixType const &b,MatrixType const& c, std::vector<IndexType>const & a_idx, std::vector<IndexType>const & b_idx){
 for(int i=0;i<b_idx.size();i++){
   a(a_idx[i])=b(b_idx[i])+c(i);
 }

diff --git a/include/preprocess/crhmc/two_sided_barrier.h b/include/preprocess/crhmc/two_sided_barrier.h
@@ -73,9 +73,9 @@ template <typename Point> 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
@@ -143,9 +143,9 @@ template <class Point> 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
@@ -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")