Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
Merge #21003
Browse files Browse the repository at this point in the history
  • Loading branch information
mkoeppe committed Jan 3, 2023
2 parents 2114066 + 099c15b commit 48cf104
Show file tree
Hide file tree
Showing 70 changed files with 1,735 additions and 329 deletions.
19 changes: 19 additions & 0 deletions build/pkgs/onetbb/SPKG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
onetbb: oneAPI Threading Building Blocks
========================================

Description
-----------

C++ parallelization library


License
-------

Apache License, Version 2.0


Upstream Contact
----------------

https://github.com/oneapi-src/oneTBB
5 changes: 5 additions & 0 deletions build/pkgs/onetbb/checksums.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
tarball=onetbb-VERSION.tar.gz
sha1=e4be99dc35948052296105d2ae7da6d34e01ba2d
md5=68e617448f71df02d8688c84d53778f6
cksum=1573392748
upstream_url=https://github.com/oneapi-src/oneTBB/archive/refs/tags/vVERSION.tar.gz
1 change: 1 addition & 0 deletions build/pkgs/onetbb/dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
| cmake
1 change: 1 addition & 0 deletions build/pkgs/onetbb/distros/alpine.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
libtbb-dev
1 change: 1 addition & 0 deletions build/pkgs/onetbb/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
intel-oneapi-tbb
1 change: 1 addition & 0 deletions build/pkgs/onetbb/distros/debian.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
libtbb-dev
1 change: 1 addition & 0 deletions build/pkgs/onetbb/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
tbb-devel
1 change: 1 addition & 0 deletions build/pkgs/onetbb/distros/freebsd.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
devel/onetbb
1 change: 1 addition & 0 deletions build/pkgs/onetbb/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dev-cpp/tbb
1 change: 1 addition & 0 deletions build/pkgs/onetbb/distros/homebrew.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
tbb
1 change: 1 addition & 0 deletions build/pkgs/onetbb/distros/macports.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
onetbb
1 change: 1 addition & 0 deletions build/pkgs/onetbb/distros/nix.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
tbb
1 change: 1 addition & 0 deletions build/pkgs/onetbb/distros/void.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
tbb-devel
1 change: 1 addition & 0 deletions build/pkgs/onetbb/package-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2021.7.0
17 changes: 17 additions & 0 deletions build/pkgs/onetbb/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
SAGE_SPKG_CONFIGURE([onetbb], [dnl
AC_MSG_CHECKING([whether oneTBB >= 2018 is available])
rm -rf conftest_srcdir
mkdir conftest_srcdir
cat > conftest_srcdir/CMakeLists.txt <<EOF
cmake_minimum_required (VERSION 3.11.0)
project(dummy)
# from https://github.com/scipopt/papilo/blob/master/CMakeLists.txt
find_package(TBB 2018 COMPONENTS tbb tbbmalloc REQUIRED)
EOF
AS_IF([cmake -S conftest_srcdir -B conftest_srcdir/build >& ]AS_MESSAGE_LOG_FD[ 2>&1], [dnl
AC_MSG_RESULT([yes])
], [dnl
AC_MSG_RESULT([no])
AS_VAR_SET([sage_spkg_install_onetbb], [yes])
])
])
6 changes: 6 additions & 0 deletions build/pkgs/onetbb/spkg-install.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
cd src
mkdir build
cd build
sdh_cmake -DTBB_STRICT=off ..
sdh_make
sdh_make_install
1 change: 1 addition & 0 deletions build/pkgs/onetbb/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
optional
22 changes: 22 additions & 0 deletions build/pkgs/papilo/SPKG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
papilo: Parallel presolve for integer and linear optimization
=============================================================

Description
-----------

parallel presolve routines for (mixed integer) linear programming
problems. The routines are implemented using templates which allows
switching to higher precision or rational arithmetic using the boost
multiprecision package.


License
-------

LGPL 3.0


Upstream Contact
----------------

https://github.com/scipopt/papilo/
5 changes: 5 additions & 0 deletions build/pkgs/papilo/checksums.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
tarball=papilo-VERSION.tar.gz
sha1=85d599ac9936aa1ddf687e04273b995522909de5
md5=c41f5aa615ffc9914f8ca924947aa8cb
cksum=1535425476
upstream_url=https://github.com/scipopt/papilo/archive/refs/tags/vVERSION.tar.gz
1 change: 1 addition & 0 deletions build/pkgs/papilo/dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$(MP_LIBRARY) boost_cropped onetbb $(BLAS) gfortran | cmake
1 change: 1 addition & 0 deletions build/pkgs/papilo/package-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.1.1
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 1fc5aecb4eca500917407b008c8c8eb8637a9c27 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Sat, 19 Nov 2022 19:03:37 -0800
Subject: [PATCH] CMakeLists.txt: Do not require boost program_options for the
library

---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7256877..db905aa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,7 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release)
endif()

-find_package(Boost ${BOOST_MIN_VERSION} COMPONENTS program_options REQUIRED)
+find_package(Boost ${BOOST_MIN_VERSION} REQUIRED)

if(GMP)
find_package(GMP)
--
2.37.3

8 changes: 8 additions & 0 deletions build/pkgs/papilo/spkg-install.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
cd src
mkdir build
cd build
sdh_cmake -DPAPILO_NO_BINARIES=1 \
-DBOOST_ROOT="$SAGE_LOCAL" \
..
sdh_make
sdh_make_install
1 change: 1 addition & 0 deletions build/pkgs/papilo/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
optional
22 changes: 22 additions & 0 deletions build/pkgs/pyscipopt/SPKG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
pyscipopt: Python interface and modeling environment for SCIP
=============================================================

Description
-----------

Python interface and modeling environment for SCIP

License
-------

MIT

Upstream Contact
----------------

https://pypi.org/project/PySCIPOpt/

Dependencies
------------

scipoptsuite
5 changes: 5 additions & 0 deletions build/pkgs/pyscipopt/checksums.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
tarball=PySCIPOpt-VERSION.tar.gz
sha1=0c3644ce6a0624774dceaef10694e090e3863ab5
md5=2e4ce8087fb9acac8e806655f20c3d70
cksum=3316817556
upstream_url=https://pypi.io/packages/source/p/pyscipopt/PySCIPOpt-VERSION.tar.gz
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$(MP_LIBRARY) bliss readline | cmake
$(PYTHON) scip | $(PYTHON_TOOLCHAIN)

----------
All lines of this file are ignored except the first.
1 change: 1 addition & 0 deletions build/pkgs/pyscipopt/distros/conda.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pyscipopt
1 change: 1 addition & 0 deletions build/pkgs/pyscipopt/distros/freebsd.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
math/py-PySCIPOpt
1 change: 1 addition & 0 deletions build/pkgs/pyscipopt/install-requires.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PySCIPOpt
1 change: 1 addition & 0 deletions build/pkgs/pyscipopt/package-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4.2.0
3 changes: 3 additions & 0 deletions build/pkgs/pyscipopt/spkg-install.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
cd src
export SCIPOPTDIR="$SAGE_LOCAL"
sdh_pip_install .
1 change: 1 addition & 0 deletions build/pkgs/pyscipopt/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
optional
29 changes: 29 additions & 0 deletions build/pkgs/scip/SPKG.rst
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.
5 changes: 5 additions & 0 deletions build/pkgs/scip/checksums.ini
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
4 changes: 4 additions & 0 deletions build/pkgs/scip/dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
$(MP_LIBRARY) readline soplex papilo zlib | cmake

----------
All lines of this file are ignored except the first.
1 change: 1 addition & 0 deletions build/pkgs/scip/distros/conda.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
scip
1 change: 1 addition & 0 deletions build/pkgs/scip/package-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
802
40 changes: 40 additions & 0 deletions build/pkgs/scip/patches/no_rpath.patch
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.
17 changes: 17 additions & 0 deletions build/pkgs/scip/spkg-install.in
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
1 change: 1 addition & 0 deletions build/pkgs/scip/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
optional
50 changes: 0 additions & 50 deletions build/pkgs/scipoptsuite/SPKG.rst

This file was deleted.

4 changes: 0 additions & 4 deletions build/pkgs/scipoptsuite/checksums.ini

This file was deleted.

Empty file.
1 change: 0 additions & 1 deletion build/pkgs/scipoptsuite/package-version.txt

This file was deleted.

0 comments on commit 48cf104

Please sign in to comment.