Skip to content

Commit 79bd539

Browse files
TolisChalTolisChal
authored
Update boost integration (#158)
* fix boost in tests and examples folders * drop g++4.8 test
1 parent 0ce5001 commit 79bd539

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

‎.github/workflows/cmake-gcc.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
compilers: [g++-4.8, g++-5, g++-6, g++-7, g++-8, g++-9, g++-10]
18+
compilers: [g++-5, g++-6, g++-7, g++-8, g++-9, g++-10]
1919
runs-on: ubuntu-18.04
2020
steps:
2121
- uses: actions/checkout@v1

‎examples/Boost.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ function(GetBoost)
44

55
if (NOT BOOST_DIR)
66

7-
set(BOOST_URL "https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.bz2" CACHE STRING "Boost download URL")
8-
set(BOOST_URL_SHA256 "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb" CACHE STRING "Boost download URL SHA256 checksum")
7+
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")
8+
set(BOOST_URL_SHA256 "f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41" CACHE STRING "Boost download URL SHA256 checksum")
99

1010
include(FetchContent)
1111
FetchContent_Declare(

‎examples/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ else ()
110110
#add_definitions( "-O3 -lgsl -lm -ldl -lgslcblas" )
111111

112112
add_subdirectory(logconcave)
113-
add_subdirectory(spectrahedra)
113+
#add_subdirectory(spectrahedra)
114114
add_subdirectory(hpolytope-volume)
115115

116116
add_executable (vpolytopevolume vpolytope-volume/vpolytopevolume.cpp)

‎examples/hpolytope-volume/hpolytopeVolume.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void calculateVolumes(const HPOLYTOPE &HP) {
3535
NT e=0.1;
3636

3737
// Calculating volume of the passed polytope
38-
NT volume1 = volume_cooling_balls<BallWalk, RNGType, HPOLYTOPE>(HP, e, walk_len);
38+
NT volume1 = volume_cooling_balls<BallWalk, RNGType, HPOLYTOPE>(HP, e, walk_len).second;
3939
NT volume2 = volume_cooling_gaussians<GaussianBallWalk, RNGType>(HP, e, walk_len);
4040
NT volume3 = volume_sequence_of_balls<BallWalk, RNGType>(HP, e, walk_len);
4141

‎examples/logconcave/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,11 @@ else ()
129129
add_executable (simple_sde simple_sde.cpp)
130130
add_executable (high_dimensional_hmc high_dimensional_hmc.cpp)
131131
add_executable (high_dimensional_hmc_rand_poly high_dimensional_hmc_rand_poly.cpp)
132-
add_executable (adaptive_step_size adaptive_step_size.cpp)
132+
#add_executable (adaptive_step_size adaptive_step_size.cpp)
133133

134134
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")
135135
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")
136-
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")
136+
#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")
137137
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")
138138
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")
139139
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")

‎examples/vpolytope-volume/vpolytopevolume.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void calculateVolumes(const VPOLYTOPE &VP) {
3434
NT e=0.1;
3535

3636
// Calculating volume of the passed polytope
37-
NT volume1 = volume_cooling_balls<BallWalk, RNGType, VPOLYTOPE>(VP, e, walk_len);
37+
NT volume1 = volume_cooling_balls<BallWalk, RNGType, VPOLYTOPE>(VP, e, walk_len).second;
3838
NT volume2 = volume_cooling_gaussians<GaussianBallWalk, RNGType>(VP, e, walk_len);
3939

4040
std::cout<<"\t Using Cooling Balls method: "<<volume1<<"\n";

‎test/Boost.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ function(GetBoost)
44

55
if (NOT BOOST_DIR)
66

7-
set(BOOST_URL "https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.bz2" CACHE STRING "Boost download URL")
8-
set(BOOST_URL_SHA256 "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb" CACHE STRING "Boost download URL SHA256 checksum")
7+
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")
8+
set(BOOST_URL_SHA256 "f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41" CACHE STRING "Boost download URL SHA256 checksum")
99

1010
include(FetchContent)
1111
FetchContent_Declare(

0 commit comments

Comments
 (0)