Skip to content

Commit 8fc2206

Browse files
benlorenzbenlorenz
committed
[SCIP, SCIP_PaPILO] use bliss_jll and enable boost
1 parent f8eea3f commit 8fc2206

File tree

4 files changed

+103
-5
lines changed

4 files changed

+103
-5
lines changed

‎S/SCIP/build_tarballs.jl

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
using BinaryBuilder, Pkg
44

55
name = "SCIP"
6-
version = v"800.0.300"
6+
version = v"800.0.301"
77

88
# Collection of sources required to complete build
99
sources = [
1010
ArchiveSource("https://scipopt.org/download/release/scipoptsuite-8.0.3.tgz", "5ad50eb42254c825d96f5747d8f3568dcbff0284dfbd1a727910c5a7c2899091"),
11+
DirectorySource("./bundled"),
1112
]
1213

1314
# Bash recipe for building across all platforms
@@ -17,9 +18,15 @@ script = raw"""
1718
# remove when CMake accounts for this
1819
if [[ "${target}" == *86*-linux-gnu ]]; then
1920
export LDFLAGS="-lrt"
21+
elif [[ "${target}" == *-mingw* ]]; then
22+
# this is required to link to bliss on mingw
23+
export LDFLAGS=-L${libdir}
2024
fi
2125
2226
cd scipoptsuite*
27+
28+
atomic_patch -p1 ${WORKSPACE}/srcdir/patches/findbliss.patch
29+
2330
mkdir build
2431
cd build/
2532
cmake -DCMAKE_INSTALL_PREFIX=$prefix\
@@ -30,10 +37,12 @@ cmake -DCMAKE_INSTALL_PREFIX=$prefix\
3037
-DGCG=0\
3138
-DUG=0\
3239
-DAMPL=0\
33-
-DBOOST=off\
40+
-DBOOST=ON\
3441
-DSYM=bliss\
3542
-DTPI=tny\
36-
-DIPOPT_DIR=${prefix} -DIPOPT_LIBRARIES=${libdir} ..
43+
-DIPOPT_DIR=${prefix} -DIPOPT_LIBRARIES=${libdir} \
44+
-DBLISS_INCLUDE_DIR=${includedir} -DBLISS_LIBRARY=bliss \
45+
..
3746
make -j${nproc}
3847
make install
3948

‎S/SCIP/bundled/patches/findbliss.patch

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
diff --git a/scip/CMakeLists.txt b/scip/CMakeLists.txt
2+
index f7831d9ce8..54915b438f 100644
3+
--- a/scip/CMakeLists.txt
4+
+++ b/scip/CMakeLists.txt
5+
@@ -125,24 +125,18 @@ unset(BLISS_TARGET)
6+
if(SYM STREQUAL "bliss")
7+
message(STATUS "Support SYM: bliss")
8+
set(sym symmetry/compute_symmetry_bliss.cpp)
9+
-
10+
- # modify configuration for bliss
11+
- set(BUILD_SHARED_LIBS OFF)
12+
- set(TMPFLAGS ${CMAKE_C_FLAGS})
13+
- set(TMXFLAGS ${CMAKE_CXX_FLAGS})
14+
- set(CMAKE_C_FLAGS -w)
15+
- set(CMAKE_CXX_FLAGS -w)
16+
-
17+
- add_subdirectory(src/bliss)
18+
-
19+
- # undo modification
20+
- set(CMAKE_C_FLAGS ${TMPFLAGS})
21+
- set(CMAKE_CXX_FLAGS ${TMXFLAGS})
22+
- set(BUILD_SHARED_LIBS ${SHARED})
23+
-
24+
- set(BLISS_TARGET libbliss)
25+
- set(SYM_LIBRARIES libbliss)
26+
- set(SYM_PIC_LIBRARIES libbliss)
27+
+ find_package(BLISS)
28+
+ if(BLISS_FOUND)
29+
+ message(STATUS "BLISS found")
30+
+ include_directories(${BLISS_INCLUDE_DIRS})
31+
+ set(SYM_LIBRARIES ${BLISS_LIBRARIES})
32+
+ set(SYM_PIC_LIBRARIES ${BLISS_LIBRARIES})
33+
+ if(BLISS_DEFINITIONS STREQUAL "")
34+
+ add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:${BLISS_DEFINITIONS}>")
35+
+ endif()
36+
+ else()
37+
+ message(FATAL_ERROR "BLISS not found, not using vendored BLISS")
38+
+ endif()
39+
elseif(SYM STREQUAL "none")
40+
message(STATUS "Support SYM: OFF")
41+
set(sym symmetry/compute_symmetry_none.cpp)

‎S/SCIP_PaPILO/build_tarballs.jl

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,19 @@ using BinaryBuilder, Pkg
44

55
name = "SCIP_PaPILO"
66

7-
version = v"800.0.300"
7+
version = v"800.0.301"
88

99
sources = [
1010
ArchiveSource("https://scipopt.org/download/release/scipoptsuite-8.0.3.tgz", "5ad50eb42254c825d96f5747d8f3568dcbff0284dfbd1a727910c5a7c2899091"),
11+
DirectorySource("./bundled"),
1112
]
1213

1314
# Bash recipe for building across all platforms
1415
script = raw"""
1516
cd scipoptsuite*
17+
18+
atomic_patch -p1 ${WORKSPACE}/srcdir/patches/findbliss.patch
19+
1620
mkdir build
1721
cd build/
1822
cmake -DCMAKE_INSTALL_PREFIX=$prefix\
@@ -22,9 +26,12 @@ cmake -DCMAKE_INSTALL_PREFIX=$prefix\
2226
-DUG=0\
2327
-DAMPL=0\
2428
-DGCG=0\
29+
-DBOOST=ON\
2530
-DSYM=bliss\
2631
-DTPI=tny\
27-
-DIPOPT_DIR=${prefix} -DIPOPT_LIBRARIES=${libdir} ..
32+
-DIPOPT_DIR=${prefix} -DIPOPT_LIBRARIES=${libdir} \
33+
-DBLISS_INCLUDE_DIR=${includedir} -DBLISS_LIBRARY=bliss \
34+
..
2835
make -j${nproc} scip
2936
make papilo-executable
3037

‎S/SCIP_PaPILO/bundled/patches/findbliss.patch

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
diff --git a/scip/CMakeLists.txt b/scip/CMakeLists.txt
2+
index f7831d9ce8..54915b438f 100644
3+
--- a/scip/CMakeLists.txt
4+
+++ b/scip/CMakeLists.txt
5+
@@ -125,24 +125,18 @@ unset(BLISS_TARGET)
6+
if(SYM STREQUAL "bliss")
7+
message(STATUS "Support SYM: bliss")
8+
set(sym symmetry/compute_symmetry_bliss.cpp)
9+
-
10+
- # modify configuration for bliss
11+
- set(BUILD_SHARED_LIBS OFF)
12+
- set(TMPFLAGS ${CMAKE_C_FLAGS})
13+
- set(TMXFLAGS ${CMAKE_CXX_FLAGS})
14+
- set(CMAKE_C_FLAGS -w)
15+
- set(CMAKE_CXX_FLAGS -w)
16+
-
17+
- add_subdirectory(src/bliss)
18+
-
19+
- # undo modification
20+
- set(CMAKE_C_FLAGS ${TMPFLAGS})
21+
- set(CMAKE_CXX_FLAGS ${TMXFLAGS})
22+
- set(BUILD_SHARED_LIBS ${SHARED})
23+
-
24+
- set(BLISS_TARGET libbliss)
25+
- set(SYM_LIBRARIES libbliss)
26+
- set(SYM_PIC_LIBRARIES libbliss)
27+
+ find_package(BLISS)
28+
+ if(BLISS_FOUND)
29+
+ message(STATUS "BLISS found")
30+
+ include_directories(${BLISS_INCLUDE_DIRS})
31+
+ set(SYM_LIBRARIES ${BLISS_LIBRARIES})
32+
+ set(SYM_PIC_LIBRARIES ${BLISS_LIBRARIES})
33+
+ if(BLISS_DEFINITIONS STREQUAL "")
34+
+ add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:${BLISS_DEFINITIONS}>")
35+
+ endif()
36+
+ else()
37+
+ message(FATAL_ERROR "BLISS not found, not using vendored BLISS")
38+
+ endif()
39+
elseif(SYM STREQUAL "none")
40+
message(STATUS "Support SYM: OFF")
41+
set(sym symmetry/compute_symmetry_none.cpp)

0 commit comments

Comments
 (0)