Update boost integration (#158)

* fix boost in tests and examples folders * drop g++4.8 test
GeomScale · May 5, 2021 · 79bd539 · 79bd539
1 parent 0ce5001
commit 79bd539
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/cmake-gcc.yml b/.github/workflows/cmake-gcc.yml
@@ -15,7 +15,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- compilers: [g++-4.8, g++-5, g++-6, g++-7, g++-8, g++-9, g++-10]
+ compilers: [g++-5, g++-6, g++-7, g++-8, g++-9, g++-10]
  runs-on: ubuntu-18.04
  steps:
  - uses: actions/checkout@v1

diff --git a/examples/Boost.cmake b/examples/Boost.cmake
@@ -4,8 +4,8 @@ function(GetBoost)
 
  if (NOT BOOST_DIR) 
 
- set(BOOST_URL "https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.bz2" CACHE STRING "Boost download URL")
- set(BOOST_URL_SHA256 "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb" CACHE STRING "Boost download URL SHA256 checksum")
+ set(BOOST_URL "https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2" CACHE STRING "Boost download URL")
+ set(BOOST_URL_SHA256 "f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41" CACHE STRING "Boost download URL SHA256 checksum")
 
  include(FetchContent)
  FetchContent_Declare(

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -110,7 +110,7 @@ else ()
  #add_definitions( "-O3 -lgsl -lm -ldl -lgslcblas" )
 
  add_subdirectory(logconcave)
- add_subdirectory(spectrahedra)
+ #add_subdirectory(spectrahedra)
  add_subdirectory(hpolytope-volume)
 
  add_executable (vpolytopevolume vpolytope-volume/vpolytopevolume.cpp)

diff --git a/examples/hpolytope-volume/hpolytopeVolume.cpp b/examples/hpolytope-volume/hpolytopeVolume.cpp
@@ -35,7 +35,7 @@ void calculateVolumes(const HPOLYTOPE &HP) {
  NT e=0.1;
 
  // Calculating volume of the passed polytope
- NT volume1 = volume_cooling_balls<BallWalk, RNGType, HPOLYTOPE>(HP, e, walk_len);
+ NT volume1 = volume_cooling_balls<BallWalk, RNGType, HPOLYTOPE>(HP, e, walk_len).second;
  NT volume2 = volume_cooling_gaussians<GaussianBallWalk, RNGType>(HP, e, walk_len);
  NT volume3 = volume_sequence_of_balls<BallWalk, RNGType>(HP, e, walk_len);
 

diff --git a/examples/logconcave/CMakeLists.txt b/examples/logconcave/CMakeLists.txt
@@ -129,11 +129,11 @@ else ()
  add_executable (simple_sde simple_sde.cpp)
  add_executable (high_dimensional_hmc high_dimensional_hmc.cpp)
  add_executable (high_dimensional_hmc_rand_poly high_dimensional_hmc_rand_poly.cpp)
- add_executable (adaptive_step_size adaptive_step_size.cpp)
+ #add_executable (adaptive_step_size adaptive_step_size.cpp)
 
  TARGET_LINK_LIBRARIES(high_dimensional_hmc_rand_poly ${LP_SOLVE} ${BLAS} "-L${MKLROOT}/lib/intel64 -Wl,--no-as-needed -lmkl_intel_ilp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lm -ldl")
  TARGET_LINK_LIBRARIES(high_dimensional_hmc ${LP_SOLVE} ${BLAS} "-L${MKLROOT}/lib/intel64 -Wl,--no-as-needed -lmkl_intel_ilp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lm -ldl")
- TARGET_LINK_LIBRARIES(adaptive_step_size ${LP_SOLVE} ${BLAS} "-L${MKLROOT}/lib/intel64 -Wl,--no-as-needed -lmkl_intel_ilp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lm -ldl")
+ #TARGET_LINK_LIBRARIES(adaptive_step_size ${LP_SOLVE} ${BLAS} "-L${MKLROOT}/lib/intel64 -Wl,--no-as-needed -lmkl_intel_ilp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lm -ldl")
  TARGET_LINK_LIBRARIES(simple_ode ${LP_SOLVE} ${BLAS} "-L${MKLROOT}/lib/intel64 -Wl,--no-as-needed -lmkl_intel_ilp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lm -ldl")
  TARGET_LINK_LIBRARIES(simple_sde ${LP_SOLVE} ${BLAS} "-L${MKLROOT}/lib/intel64 -Wl,--no-as-needed -lmkl_intel_ilp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lm -ldl")
  TARGET_LINK_LIBRARIES(simple_uld ${LP_SOLVE} ${BLAS} "-L${MKLROOT}/lib/intel64 -Wl,--no-as-needed -lmkl_intel_ilp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lm -ldl")

diff --git a/examples/vpolytope-volume/vpolytopevolume.cpp b/examples/vpolytope-volume/vpolytopevolume.cpp
@@ -34,7 +34,7 @@ void calculateVolumes(const VPOLYTOPE &VP) {
  NT e=0.1;
 
  // Calculating volume of the passed polytope
- NT volume1 = volume_cooling_balls<BallWalk, RNGType, VPOLYTOPE>(VP, e, walk_len);
+ NT volume1 = volume_cooling_balls<BallWalk, RNGType, VPOLYTOPE>(VP, e, walk_len).second;
  NT volume2 = volume_cooling_gaussians<GaussianBallWalk, RNGType>(VP, e, walk_len);
 
  std::cout<<"\t Using Cooling Balls method: "<<volume1<<"\n";

diff --git a/test/Boost.cmake b/test/Boost.cmake
@@ -4,8 +4,8 @@ function(GetBoost)
 
  if (NOT BOOST_DIR) 
 
- set(BOOST_URL "https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.bz2" CACHE STRING "Boost download URL")
- set(BOOST_URL_SHA256 "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb" CACHE STRING "Boost download URL SHA256 checksum")
+ set(BOOST_URL "https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2" CACHE STRING "Boost download URL")
+ set(BOOST_URL_SHA256 "f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41" CACHE STRING "Boost download URL SHA256 checksum")
 
  include(FetchContent)
  FetchContent_Declare(