Migrate netdes harness invocations to generic_cylinders.py#661
Open
DLWoodruff wants to merge 1 commit intoPyomo:mainfrom
Open
Migrate netdes harness invocations to generic_cylinders.py#661DLWoodruff wants to merge 1 commit intoPyomo:mainfrom
DLWoodruff wants to merge 1 commit intoPyomo:mainfrom
Conversation
netdes.py exposes scenario_creator, scenario_names_creator, kw_creator, inparser_adder, scenario_denouement, and sample_tree_scen_creator, so the generic driver can run it. - Archive examples/netdes/netdes_ef.py (no callers), netdes_ph.py (no callers), drivertest.py (developer scratch), and netdes_extension.py (referenced only from a commented-out line in netdes_ph.py) under examples/netdes/archive/. - run_all.py: add a generic_cylinders invocation paralleling the retained netdes_cylinders.py entry. --slammax, --cross-scenario-cuts, and --obbt are not wired through generic_cylinders, so the new entry uses --subgradient-hub + --xhatshuffle + --presolve instead; the options unique to the custom driver are still covered by the netdes_cylinders.py entry above. - doc/src/examples.rst: reword the netdes section to say runs go through the generic driver by default and that netdes_cylinders.py is retained as the cross-scen-cuts/slammax worked example. Retained: netdes.py (model), netdes_cylinders.py (rst), parse.py (imported by netdes.py and netdes_with_class.py), and netdes_with_class.py (rst + used by generic_tester.py). 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 #661 +/- ##
==========================================
- Coverage 70.71% 70.70% -0.02%
==========================================
Files 153 153
Lines 19005 19005
==========================================
- Hits 13439 13437 -2
- Misses 5566 5568 +2 ☔ 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
examples/netdes/netdes_ef.py(no callers),netdes_ph.py(no callers),drivertest.py(developer scratch), andnetdes_extension.py(only referenced from a commented-out line innetdes_ph.py) underexamples/netdes/archive/.examples/run_all.py: add a parallelgeneric_cylinders.py --module-name netdesentry next to the retainednetdes_cylinders.pyone.--slammax,--cross-scenario-cuts, and the--obbtpresolve flags are not wired throughgeneric_cylinders.py, so the new entry uses--subgradient-hub + --xhatshuffle + --presolveinstead; the options unique to the custom driver are still covered by thenetdes_cylinders.pyentry above.doc/src/examples.rst: reword the netdes section to say runs go through the generic driver by default and thatnetdes_cylinders.pyis retained as the cross-scen-cuts/slammax worked example.Retained in place:
netdes.py(model module),netdes_cylinders.py(rst-referenced),netdes_with_class.py(rst-referenced + used bygeneric_tester.py),parse.py(imported by bothnetdes.pyandnetdes_with_class.py).Test plan
mpiexec -np 2 python -m mpi4py ../../mpisppy/generic_cylinders.py --module-name netdes --max-iterations=3 --instance-name=network-10-20-L-01 --netdes-data-path ./data --rel-gap=0.0 --default-rho=10000 --presolve --subgradient-hub --xhatshuffle --max-solver-threads=2 --solver-name=gurobi_persistent— runs, subgradient hub + xhat spoke terminate cleanlyruff check examples/run_all.py🤖 Generated with Claude Code