Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
e552439
Add first draft of SCIP persistent solving
Opt-Mucca Mar 18, 2024
6a14f10
Add SCIPPersistent to docs
Opt-Mucca Mar 18, 2024
c107909
Add SCIp to Github action scripts
Opt-Mucca Mar 19, 2024
e00ded8
Remove 5.0.0 specific version. Add conda to workflow
Opt-Mucca Mar 19, 2024
a0b6250
Standardise string formatting to fstring
Opt-Mucca Mar 19, 2024
d0816eb
Add parameter link to docstring
Opt-Mucca Mar 19, 2024
0e11f11
Remove redundant second objective sense check
Opt-Mucca Mar 19, 2024
068ec99
Clean up _post_solve with a helper function for status handling
Opt-Mucca Mar 19, 2024
63af6d8
Remove individual skip_test option
Opt-Mucca Mar 19, 2024
4075d9a
Update pyomo/solvers/plugins/solvers/scip_persistent.py
Opt-Mucca Mar 19, 2024
f55fcc5
Update from the black command
Opt-Mucca Mar 19, 2024
e2b49b2
Merge remote-tracking branch 'origin/main'
Opt-Mucca Mar 19, 2024
91eae7b
Fix typos
Opt-Mucca Mar 19, 2024
5ee2007
Replace trySol via more safe checkSol
Opt-Mucca Mar 19, 2024
f6ff092
Adds support for partial solution loading
Opt-Mucca Mar 20, 2024
e7ac980
Add error handling for setting non-linear objective
Opt-Mucca Mar 21, 2024
c90bb23
Merge branch 'main' into main
Opt-Mucca Apr 10, 2024
2540f65
Remove dual and rc loading for SCIP. Fix bug of ranged rows
Opt-Mucca Apr 19, 2024
9e5d944
Add safe con.body.constant check
Opt-Mucca Apr 19, 2024
f90dfad
Remove slack loading for SCIP
Opt-Mucca Apr 29, 2024
f703d1f
Remove dual loading test for SCIP
Opt-Mucca Apr 29, 2024
5c02d32
Remove slack for suffix in tests
Opt-Mucca Apr 29, 2024
8ebcf88
Remove TODO for nonlinear handling
Opt-Mucca Apr 29, 2024
236427f
Merge branch 'main' into main
mrmundt Apr 30, 2024
30d8cc6
Skip LP_trivial_constraints for SCIP persistent
Opt-Mucca Jun 13, 2024
8d787ae
Merge branch 'main' into main
Opt-Mucca Jun 13, 2024
30e5e65
Add transformation for add_cons with non float/int rhs e.g. np.int
Opt-Mucca Jun 13, 2024
9104a92
Add warning if type is converted. Tidy up logic
Opt-Mucca Jun 13, 2024
a0324af
Merge branch 'main' into main
blnicho Aug 6, 2024
cbcb96d
Merge branch 'main' into main
blnicho Oct 15, 2024
fecd201
Merge branch 'main' into main
mrmundt Oct 29, 2024
1a4663d
Merge branch 'main' into pr/3200
blnicho Nov 13, 2024
cadfe5c
Merge branch 'main' into main
blnicho Nov 19, 2024
f3f2d7c
Fix num. vars and cons from transformed. Silent warm start fail
Opt-Mucca Nov 20, 2024
e4cdc6e
Merge branch 'main' into main
blnicho Dec 10, 2024
f326493
Merge branch 'main' into main
blnicho Jan 27, 2025
d0df2fc
Merge branch 'main' into main
blnicho Feb 13, 2025
7b18354
Add minor changes
Opt-Mucca Feb 19, 2025
859a1b2
Merge branch 'main' into main
mrmundt Feb 19, 2025
9a6c3eb
Merge branch 'main' into main
mrmundt Mar 20, 2025
27e3d10
Change copyright 2024 to 2025
Opt-Mucca Mar 21, 2025
e916067
Merge branch 'main' into main
mrmundt Mar 24, 2025
ed2cf25
Merge branch 'main' into main
mrmundt Apr 16, 2025
5ea53cd
Merge branch 'main' into main
mrmundt Apr 22, 2025
5aba506
Merge branch 'main' into main
mrmundt Jun 4, 2025
8caea1c
Merge branch 'main' into main
blnicho Jul 3, 2025
dbe63c0
Merge branch 'main' into main
mrmundt Jul 8, 2025
16ecce0
Merge remote-tracking branch 'opt_mucca/main' into scip
michaelbynum Aug 14, 2025
9e7cd0d
moving scip to contrib solvers
michaelbynum Aug 14, 2025
bf204bb
moving scip to contrib solvers
michaelbynum Aug 14, 2025
dabf031
porting scip interface
michaelbynum Aug 15, 2025
9601768
porting scip interface
michaelbynum Aug 15, 2025
9d2f22a
porting scip interface
michaelbynum Aug 15, 2025
b483729
bugs and tests
michaelbynum Aug 15, 2025
37a31a7
scip direct
michaelbynum Aug 15, 2025
3e3509c
Merge branch 'trivial_constraints' into scip_port
michaelbynum Aug 16, 2025
6603db6
Merge branch 'trivial_constraints' into scip_port
michaelbynum Aug 16, 2025
0b84dcc
more expression types for scip
michaelbynum Aug 18, 2025
865b622
Merge remote-tracking branch 'michaelbynum/scip_port' into scip_port
michaelbynum Aug 18, 2025
efdcd69
Merge branch 'trivial_constraints' into scip_port
michaelbynum Aug 18, 2025
3180462
capture_fd for scip
michaelbynum Aug 20, 2025
b522edd
Merge remote-tracking branch 'michaelbynum/scip_port' into scip_port
michaelbynum Aug 20, 2025
72912e0
working on persistent interface to scip
michaelbynum Aug 22, 2025
cfa1e91
minor fixes
michaelbynum Sep 1, 2025
281ddc3
merge trivial_constraints into scip_port
michaelbynum Oct 5, 2025
e6331df
persistent interface to scip
michaelbynum Oct 6, 2025
98e2c9a
update docs
michaelbynum Oct 6, 2025
f0be4ff
update docs
michaelbynum Oct 6, 2025
7ec95a8
persistent interface to scip
michaelbynum Oct 6, 2025
75903d6
persistent interface to scip
michaelbynum Oct 6, 2025
0051024
updating tests
michaelbynum Oct 6, 2025
b037b9c
forgot to delete/revert some files
michaelbynum Oct 6, 2025
c200e2e
run black
michaelbynum Oct 6, 2025
960c531
typos
michaelbynum Oct 6, 2025
2f99306
merge observer into scip_port
michaelbynum Oct 16, 2025
4487a69
merge main
michaelbynum Dec 12, 2025
3d6f8bb
Merge branch 'trivial_constraints' into scip_port
michaelbynum Dec 18, 2025
879ed3a
update scip interface to use observer
michaelbynum Dec 18, 2025
705ec75
Merge remote-tracking branch 'origin/main' into scip_port
michaelbynum Jan 8, 2026
3bfa5cb
run black
michaelbynum Jan 8, 2026
3898591
Merge branch 'trivial_constraints' into scip_port
michaelbynum Jan 29, 2026
33d490a
Merge branch 'solver_api' into scip_port
michaelbynum Feb 12, 2026
7709a98
Merge branch 'trivial_constraints' into scip_port
michaelbynum Feb 13, 2026
9a581ad
Merge branch 'trivial_constraints' into scip_port
michaelbynum Feb 13, 2026
d725038
merge trivial_constraints into scip_port
michaelbynum Mar 23, 2026
aec0e65
merge trivial_constraints into scip_port
michaelbynum Mar 23, 2026
1ae0890
bug
michaelbynum Mar 23, 2026
70059fa
Merge branch 'trivial_constraints' into scip_port
michaelbynum Mar 23, 2026
045b8ab
Merge branch 'trivial_constraints' into scip_port
michaelbynum Mar 26, 2026
2b6c48e
Merge branch 'trivial_constraints' into scip_port
michaelbynum Apr 9, 2026
25c59ed
merge in main
michaelbynum Apr 15, 2026
8c6e488
run black
michaelbynum Apr 15, 2026
3646b41
fix typos
michaelbynum Apr 15, 2026
73498a8
merge trivial_constraints into scip_port
michaelbynum May 4, 2026
ed194d4
update scip solution loader
michaelbynum May 5, 2026
2a6ae69
update scip persistent interface
michaelbynum May 5, 2026
b8640c6
run black
michaelbynum May 5, 2026
f7820bc
Merge remote-tracking branch 'origin/main' into scip_port
michaelbynum May 11, 2026
885565c
remove comment
michaelbynum May 11, 2026
f91223b
Merge branch 'main' into scip_port
michaelbynum May 12, 2026
dc764da
try removing scip __del__ to prevent segfaults?
michaelbynum May 12, 2026
32935ff
Merge branch 'main' into scip_port
michaelbynum May 12, 2026
d14e035
Merge branch 'main' into scip_port
blnicho May 14, 2026
b11a3b7
Reorganize the scip code to split direct/persistent and add unit-styl…
mrmundt May 15, 2026
cb53be3
Wrong copyright
mrmundt May 15, 2026
993bcc9
Update online docs
mrmundt May 15, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/test_branches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,12 @@ jobs:
|| echo "WARNING: Xpress Community Edition is not available"
python -m pip install --cache-dir cache/pip maingopy \
|| echo "WARNING: MAiNGO is not available"
if [[ ${{matrix.python}} == pypy* ]]; then
echo "skipping SCIP for pypy"
else
python -m pip install --cache-dir cache/pip pyscipopt \
|| echo "WARNING: SCIP is not available"
fi
if [[ ${{matrix.python}} == pypy* ]]; then
echo "skipping wntr for pypy"
else
Expand Down Expand Up @@ -423,7 +429,7 @@ jobs:
else
XPRESS='xpress'
fi
for PKG in "$CPLEX" docplex gurobi "$XPRESS" cyipopt pymumps scip; do
for PKG in "$CPLEX" docplex gurobi "$XPRESS" cyipopt pymumps scip pyscipopt; do
echo ""
echo "*** Install $PKG ***"
echo ""
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/test_pr_and_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,12 @@ jobs:
|| echo "WARNING: Xpress Community Edition is not available"
python -m pip install --cache-dir cache/pip maingopy \
|| echo "WARNING: MAiNGO is not available"
if [[ ${{matrix.python}} == pypy* ]]; then
echo "skipping SCIP for pypy"
else
python -m pip install --cache-dir cache/pip pyscipopt \
|| echo "WARNING: SCIP is not available"
fi
if [[ ${{matrix.python}} == pypy* ]]; then
echo "skipping wntr for pypy"
else
Expand Down Expand Up @@ -470,7 +476,7 @@ jobs:
else
XPRESS='xpress'
fi
for PKG in "$CPLEX" docplex gurobi "$XPRESS" cyipopt pymumps scip; do
for PKG in "$CPLEX" docplex gurobi "$XPRESS" cyipopt pymumps scip pyscipopt; do
echo ""
echo "*** Install $PKG ***"
echo ""
Expand Down
12 changes: 9 additions & 3 deletions doc/OnlineDocs/explanation/experimental/solvers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ with existing interfaces).
* - Ipopt
- ``ipopt``
- ``ipopt_v2``
* - GAMS
- ``gams``
- ``gams_v2``
* - Gurobi (persistent)
- ``gurobi_persistent``
- ``gurobi_persistent_v2``
Expand All @@ -57,9 +60,12 @@ with existing interfaces).
* - KNITRO
- ``knitro_direct``
- ``knitro_direct``
* - GAMS
- ``gams``
- ``gams_v2``
* - SCIP (direct)
- ``scip_direct``
- ``scip_direct``
* - SCIP (persistent)
- ``scip_persistent``
- ``scip_persistent``

Using the new interfaces through the legacy interface
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down
7 changes: 6 additions & 1 deletion doc/OnlineDocs/getting_started/solvers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,16 @@ the license requirements for their desired solver.
- ``conda install ‑c conda‑forge pymumps``
- `License <https://github.com/PyMumps/pymumps/blob/master/LICENSE.txt>`__
`Docs <https://github.com/pymumps/pymumps>`__
* - SCIP
* - SCIP (Command-line)
- N/A
- ``conda install ‑c conda‑forge scip``
- `License <https://www.scipopt.org/scip/doc/html/LICENSE.php>`__
`Docs <https://www.scipopt.org/index.php#download>`__
* - SCIP (Python)
- ``pip install pyscipopt``
- ``conda install ‑c conda‑forge pyscipopt``
- `License <https://www.scipopt.org/scip/doc/html/LICENSE.php>`__
`Docs <https://www.scipopt.org/index.php#download>`__
* - XPRESS
- ``pip install xpress``
- ``conda install ‑c fico‑xpress xpress``
Expand Down
3 changes: 3 additions & 0 deletions pyomo/contrib/solver/common/solution_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
from pyomo.core.staleflag import StaleFlagManager
from pyomo.core.base.suffix import Suffix
from .util import NoSolutionError
import logging

logger = logging.getLogger(__name__)


class SolutionLoader:
Expand Down
16 changes: 13 additions & 3 deletions pyomo/contrib/solver/plugins.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
from .solvers.gurobi.gurobi_persistent import GurobiPersistent
from .solvers.gurobi.gurobi_direct_minlp import GurobiDirectMINLP
from .solvers.highs import Highs
from .solvers.scip.scip_direct import ScipDirect
from .solvers.scip.scip_persistent import ScipPersistent
from .solvers.gams import GAMS
from .solvers.knitro.direct import KnitroDirectSolver

Expand All @@ -22,6 +24,9 @@ def load():
SolverFactory.register(
name="ipopt", legacy_name="ipopt_v2", doc="The IPOPT NLP solver"
)(Ipopt, LegacyIpoptSolver)
SolverFactory.register(name='gams', legacy_name='gams_v2', doc='Interface to GAMS')(
GAMS
)
SolverFactory.register(
name="gurobi_persistent",
legacy_name="gurobi_persistent_v2",
Expand All @@ -40,11 +45,16 @@ def load():
SolverFactory.register(
name="highs", legacy_name="highs", doc="Persistent interface to HiGHS"
)(Highs)
SolverFactory.register(name='gams', legacy_name='gams_v2', doc='Interface to GAMS')(
GAMS
)
SolverFactory.register(
name="knitro_direct",
legacy_name="knitro_direct",
doc="Direct interface to KNITRO solver",
)(KnitroDirectSolver)
SolverFactory.register(
name='scip_direct', legacy_name='scip_direct', doc='Direct interface pyscipopt'
)(ScipDirect)
SolverFactory.register(
name='scip_persistent',
legacy_name='scip_persistent',
doc='Persistent interface pyscipopt',
)(ScipPersistent)
8 changes: 8 additions & 0 deletions pyomo/contrib/solver/solvers/scip/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# ____________________________________________________________________________________
#
# Pyomo: Python Optimization Modeling Objects
# Copyright (c) 2008-2026 National Technology and Engineering Solutions of Sandia, LLC
# Under the terms of Contract DE-NA0003525 with National Technology and Engineering
# Solutions of Sandia, LLC, the U.S. Government retains certain rights in this
# software. This software is distributed under the 3-clause BSD License.
# ____________________________________________________________________________________
Loading
Loading