Skip to content

Updates to PyROS Solver Timing System #3198

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

Merged
merged 24 commits into from
Apr 23, 2024

Conversation

shermanjasonaf
Copy link
Contributor

Summary/Motivation:

Update PyROS solver timing system, subordinate solver call routines, and subordinate solver time limit adjustment routines.

Changes proposed in this PR:

  • Standardize calls to subordinate solvers across all PyROS subproblem types
  • When adjusting PyROS subordinate solver time limits, account for user-specified options
  • Add support for SCIP subordinate solver time limit adjustment
  • Start main PyROS solver timer just before argument validation begins, rather than just after argument validation is complete

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:

  1. I agree my contributions are submitted under the BSD license.
  2. I represent I am authorized to make the contributions and grant the license. If my employer has rights to intellectual property that includes these contributions, I represent that I have received permission to make contributions and grant the required license on behalf of that employer.

Copy link

codecov bot commented Mar 18, 2024

Codecov Report

Attention: Patch coverage is 91.89189% with 3 lines in your changes are missing coverage. Please review.

Project coverage is 88.39%. Comparing base (f697791) to head (d9ca987).

Files Patch % Lines
pyomo/contrib/pyros/util.py 88.00% 3 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main    #3198   +/-   ##
=======================================
  Coverage   88.39%   88.39%           
=======================================
  Files         846      846           
  Lines       95153    95127   -26     
=======================================
- Hits        84106    84088   -18     
+ Misses      11047    11039    -8     
Flag Coverage Δ
linux 86.35% <67.56%> (+0.01%) ⬆️
osx 76.18% <67.56%> (+<0.01%) ⬆️
other 86.54% <67.56%> (+0.01%) ⬆️
win 83.83% <67.56%> (+0.03%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@blnicho blnicho requested review from jsiirola and blnicho March 26, 2024 18:44
@blnicho
Copy link
Member

blnicho commented Apr 2, 2024

@shermanjasonaf I cancelled the latest build. I'll relaunch the tests after #3222 is merged in.

Copy link
Member

@jsiirola jsiirola left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to merge once we hear back from @shermanjasonaf on what (if anything) should be done WRT symbolic_solver_labels.

@blnicho blnicho merged commit fb1341c into Pyomo:main Apr 23, 2024
33 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants