Add generic_cylinders.py path for aircond; archive aircond_ef.py#662
Open
DLWoodruff wants to merge 1 commit intoPyomo:mainfrom
Open
Add generic_cylinders.py path for aircond; archive aircond_ef.py#662DLWoodruff wants to merge 1 commit intoPyomo:mainfrom
DLWoodruff wants to merge 1 commit intoPyomo:mainfrom
Conversation
aircond.py (model module at mpisppy/tests/examples/aircond.py) already exposes scenario_creator, scenario_names_creator, kw_creator, inparser_adder, scenario_denouement, and sample_tree_scen_creator, so the generic driver can run it. This is a conservative migration — aircond is heavily rst-documented (examples.rst, properbundles.rst, amalgamator.rst, seqsamp.rst) and also referenced from the external https://github.com/DLWoodruff/aircond companion repo — so existing driver filenames stay put. - Archive examples/aircond/aircond_ef.py (no callers anywhere) under examples/aircond/archive/. - run_all.py: add a generic_cylinders entry paralleling the existing aircond_cylinders.py invocation. generic_cylinders enforces --stage2EFsolvern for multistage xhatshuffle and aircond.py doesn't register that option, so the parallel entry uses --xhatxbar instead; the xhatshuffle path is still covered by the custom driver above. - doc/src/examples.rst: expand the aircond blurb to say runs can go through generic_cylinders.py too; keep aircond_cylinders.py as the starting-point / bundles worked example. Retained: aircond_cylinders.py, aircond_ama.py, aircond_seqsampling.py, bundle_pickler.py (all rst-referenced), and all bash/slurm scripts. 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 #662 +/- ##
==========================================
+ Coverage 70.71% 70.72% +0.01%
==========================================
Files 153 153
Lines 19005 19005
==========================================
+ Hits 13439 13442 +3
+ Misses 5566 5563 -3 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
bknueven
approved these changes
Apr 19, 2026
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
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.
Summary
Conservative migration — aircond is heavily rst-documented (examples.rst, properbundles.rst, amalgamator.rst, seqsamp.rst) and also referenced from the external DLWoodruff/aircond companion repo, so existing driver filenames are preserved.
examples/aircond/aircond_ef.py(no callers anywhere) underexamples/aircond/archive/.examples/run_all.py: add a parallelgeneric_cylinders.py --module-name ../../mpisppy/tests/examples/aircondinvocation next to the existingaircond_cylinders.pyentry.generic_cylindersasserts--stage2EFsolvernfor multistage--xhatshuffleandaircond.pydoesn't register that option, so the parallel entry uses--xhatxbarinstead; the xhatshuffle path stays covered by the custom driver above.doc/src/examples.rst: expand the aircond section to note that runs can go through the generic driver too (pointing--module-nameatmpisppy/tests/examples/aircond);aircond_cylinders.pystays the rst's starting-point / bundles worked example.Retained in place:
aircond_cylinders.py,aircond_ama.py,aircond_seqsampling.py,bundle_pickler.py(all rst-referenced), and every bash/slurm script.Test plan
mpiexec -np 3 python -m mpi4py ../../mpisppy/generic_cylinders.py --module-name ../../mpisppy/tests/examples/aircond --branching-factors '4 3 2' --max-iterations=5 --default-rho=1 --lagrangian --xhatxbar --solver-name=gurobi_persistent— runs, lagrangian + xhatxbar converge to ~3.7% cylinder gap after 5 itersruff check examples/run_all.py🤖 Generated with Claude Code