New reduced costs fixer#691
Draft
mkhraijah wants to merge 2 commits into
Draft
Conversation
…ifacts (Pyomo#688) Three small loose ends bundled into one PR. * mpisppy/tests/test_admmWrapper.py, mpisppy/tests/test_stoch_admmWrapper.py: test_values in both files fails when run via pytest's subprocess capture (returncode=1, empty stdout AND stderr) but works identically when launched from a bare Python script or shell. The subprocess seems to die before producing any output — likely a pytest stdio-capture / file-descriptor interaction with Open MPI's I/O forwarding. Mark both tests with @unittest.skip and a clear reason pointing at the example bash scripts as the manual workaround until the root cause is diagnosed. * doc/src/generic_admm.rst: the file documents consensus_vars_creator twice (once for --admm, once for --stoch-admm), which produced a Sphinx "duplicate object description" warning. Add :no-index: to the --stoch-admm directive so only one ends up in the index. * .gitignore: add conservative patterns for mpi-sppy runtime artifacts that have been accumulating untracked in many users' working trees — per-rank iteration summaries, _delme*/delete_me* scratch dirs, specific.csv_* exports, example output files (ef.txt, hub.log, solution_*.txt, *_full_solution/, *_pickles/, *_cyl_nonants.npy). Leaves ambiguous patterns (e.g., archive/, CI/, *.perf.csv) untouched. Tests: 42 passed, 2 skipped (the two test_values). Doc build: 4 warnings -> 3 warnings (dup-description warning gone). Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #691 +/- ##
===========================================
- Coverage 70.80% 45.76% -25.04%
===========================================
Files 154 146 -8
Lines 19252 18091 -1161
===========================================
- Hits 13631 8280 -5351
- Misses 5621 9811 +4190 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR adds a new extension for variable fixing to the progressive hedging algorithm and a new problem called stochastic fixed-charge capacitated multicommodity network design problem (SCMND) with 9 instances.
The main changes are:
New file extensions/reduced_costs_fixer_converger.py: constains the extension to fix and unfix variables
New folder examples/scmnd: contains the model and data for SCMND problems
Modify config.py: add configuration option for the new fixer extension
Modify cfg_vanilla.py: add two functions (1) to add an option dics for the new fixer extension, and (2) to add an option dice for reduced_costs_spoke, without calling the existing fixer extension
Modify generic/decomp.py: replace add_reduced_costs_fixer with add_reduced_costs to call the reduced_costs_spoke
Modify generic/extensions.py: call the option dics for the new fixer extension