-
Notifications
You must be signed in to change notification settings - Fork 525
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add support for scip 8 #2409
Add support for scip 8 #2409
Conversation
@@ -10,6 +10,7 @@ | |||
# ___________________________________________________________________________ | |||
|
|||
import os | |||
import os.path |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this necessary?
@sebuer - This is a lovely PR, thank you. Could you possibly add some tests so we can ensure the functionality works as intended (and to safeguard against future changes)? Our test suite runs for Linux, MacOS, and Windows (more information can be found here: https://pyomo.readthedocs.io/en/stable/contribution_guide.html#testing) Current tests for NOTE: PR #2419 resolves a testing failure related to a newer version of |
Codecov Report
@@ Coverage Diff @@
## main #2409 +/- ##
==========================================
+ Coverage 85.89% 85.94% +0.05%
==========================================
Files 617 618 +1
Lines 76198 76438 +240
==========================================
+ Hits 65453 65698 +245
+ Misses 10745 10740 -5
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
@sebuer - The codecov failure is unrelated (and a known issue: codecov/codecov-action#745). Thank you for this PR! We appreciate your contribution. |
Fixes # .
#2226
Summary/Motivation:
SCIP 8.0 integrates the AMPl interface into the main SCIP executable with slight changes to the command line arguments. Starting from that version, the
scipampl
executable is no longer provided, which is currently used by pyomo. This pull request adds support for the newer SCIP versions. I tested the changes with precompiledscip
8.0.0 and self compiledscipampl
7.0.3 on Ubuntu 20.04.I also noticed the missing check of the _timelimit property as it is performed in
GLPKSHELL
. These changes also add a corresponding solver option to the options file.Changes proposed in this PR:
GLPKSHELL
.scip
do not allow for a non-default path for the solver setting if the-AMPL
option is used. The working directory is now set optionally in thesubprocess.run
call ofSystemCallSolver
.Legal Acknowledgement
By contributing to this software project, I have read the contribution guide and agree to the following terms and conditions for my contribution: