-
-
Notifications
You must be signed in to change notification settings - Fork 522
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Trac #31329: Update scipoptsuite to 8.0.2 (now open source!), rename …
…to scip scipoptsuite 8.0.2 was re-released as open source (Apache 2.0) on 2022-11-04 - https://www.scipopt.org/ https://www.scipopt.org/doc/html/md_INSTALL.php It includes its own fork of bliss - see discussion in mkoeppe/bliss#3 Previous update in #24662. URL: https://trac.sagemath.org/31329 Reported by: mkoeppe Ticket author(s): Matthias Koeppe Reviewer(s): Dima Pasechnik
- Loading branch information
Showing
22 changed files
with
97 additions
and
265 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
scip: Mixed integer programming solver | ||
====================================== | ||
|
||
Description | ||
----------- | ||
|
||
SCIP is currently one of the fastest open source mixed integer | ||
programming (MIP) solvers. It is also a framework for constraint integer | ||
programming and branch-cut-and-price. It allows total control of the | ||
solution process and the access of detailed information down to the guts | ||
of the solver. | ||
|
||
License | ||
------- | ||
|
||
Apache 2.0 | ||
|
||
|
||
Upstream Contact | ||
---------------- | ||
|
||
https://scipopt.org/#scipoptsuite | ||
|
||
|
||
Dependencies | ||
------------ | ||
|
||
scip brings its own patched version of the bliss library. | ||
This will conflict with the optional package bliss. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
tarball=scip-VERSION.tar.gz | ||
sha1=2637767428e285b6ddda8c462f1cc31d66833d80 | ||
md5=b657369986ecd9b2944206d11ecce2e4 | ||
cksum=967379932 | ||
upstream_url=https://github.com/scipopt/scip/archive/refs/tags/vVERSION.tar.gz |
2 changes: 1 addition & 1 deletion
2
build/pkgs/scipoptsuite/dependencies → build/pkgs/scip/dependencies
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
$(MP_LIBRARY) bliss readline | cmake | ||
$(MP_LIBRARY) readline soplex papilo zlib | cmake | ||
|
||
---------- | ||
All lines of this file are ignored except the first. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
scip |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
802 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
commit eaff18abb55c86e90d44583731550c874dc3c3e0 | ||
Author: Matthias Koeppe <mkoeppe@math.ucdavis.edu> | ||
Date: Sun Nov 27 14:12:32 2022 -0800 | ||
|
||
CMakeLists.txt: Remove hardcoded RPATH settings | ||
|
||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | ||
index 8629ace18b..db2505d74b 100644 | ||
--- a/src/CMakeLists.txt | ||
+++ b/src/CMakeLists.txt | ||
@@ -3,8 +3,7 @@ | ||
# | ||
function(setLibProperties targetname outputname) | ||
set_target_properties(${targetname} PROPERTIES | ||
- OUTPUT_NAME ${outputname} | ||
- MACOSX_RPATH "${CMAKE_INSTALL_PREFIX}/lib") | ||
+ OUTPUT_NAME ${outputname}) | ||
endfunction(setLibProperties) | ||
|
||
set(CMAKE_C_STANDARD 99) | ||
@@ -1092,7 +1091,6 @@ add_dependencies(scip scip_update_githash) | ||
set_target_properties(libscip PROPERTIES | ||
VERSION ${SCIP_VERSION_MAJOR}.${SCIP_VERSION_MINOR}.${SCIP_VERSION_PATCH}.${SCIP_VERSION_SUB} | ||
SOVERSION ${SCIP_VERSION_MAJOR}.${SCIP_VERSION_MINOR} | ||
- INSTALL_RPATH_USE_LINK_PATH TRUE | ||
CXX_VISIBILITY_PRESET hidden | ||
C_VISIBILITY_PRESET hidden | ||
VISIBILITY_INLINES_HIDDEN 1) | ||
@@ -1102,11 +1100,6 @@ target_include_directories(scip PUBLIC | ||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> | ||
$<INSTALL_INTERFACE:include>) | ||
|
||
-# set the install rpath to the installed destination | ||
-set_target_properties(scip PROPERTIES | ||
- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib" | ||
- INSTALL_RPATH_USE_LINK_PATH TRUE) | ||
- | ||
# install the header files of scip | ||
install(FILES ${lpiheaders} DESTINATION include/lpi) | ||
install(FILES ${dijkstraheaders} DESTINATION include/dijkstra) |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
cd src | ||
mkdir build | ||
cd build | ||
sdh_cmake -DCMAKE_INSTALL_LIBDIR=lib \ | ||
-DCMAKE_VERBOSE_MAKEFILE=ON \ | ||
-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON \ | ||
-DGMP_DIR="${SAGE_GMP_PREFIX}" \ | ||
-DReadline_ROOT_DIR=$(pkg-config --variable=prefix readline) \ | ||
-DHistory_ROOT_DIR=$(pkg-config --variable=prefix readline) \ | ||
-DIPOPT=off \ | ||
-DPAPILO=on -DPAPILO_DIR="${SAGE_LOCAL}" \ | ||
-DZIMPL=off \ | ||
-DAMPL=off \ | ||
-DSYM=bliss \ | ||
.. | ||
sdh_make | ||
sdh_make_install |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
optional |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Empty file.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
77 changes: 0 additions & 77 deletions
77
build/pkgs/scipoptsuite/patches/0001-added-cmake-ipopt-patch.patch
This file was deleted.
Oops, something went wrong.
26 changes: 0 additions & 26 deletions
26
...pkgs/scipoptsuite/patches/0002-ZIMPL-cmake-scripts-Put-ZIMPL-includes-first-to-avoi.patch
This file was deleted.
Oops, something went wrong.
24 changes: 0 additions & 24 deletions
24
build/pkgs/scipoptsuite/patches/0003-use-INSTALL_NAME_DIR-fix-for-libscip.patch
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
$(MP_LIBRARY) mpfr boost_cropped zlib | cmake | ||
$(MP_LIBRARY) mpfr boost_cropped zlib papilo | cmake |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters