Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[WIP] Proper multistage bundles #474

Open
wants to merge 223 commits into
base: main
Choose a base branch
from
Open

[WIP] Proper multistage bundles #474

wants to merge 223 commits into from

Conversation

DLWoodruff
Copy link
Collaborator

@DLWoodruff DLWoodruff commented Dec 28, 2024 •
edited
Loading

The bundles must consume the same number of entire second stage nodes, which results in a two-stage problem.
(As of Dec 28, 2024 this is WIP because I need to clean up a git mess once the agnostic PR is merged)

DLWoodruff and others added 30 commits December 18, 2022 18:57
@DLWoodruff
add some notes about agnostic
f943763
@DLWoodruff
minor edits to txt file
7ac63b3
@DLWoodruff
Merge branch 'main' into agnostic
62ff84e
@DLWoodruff
just getting started; more questions than answers
191027d
@DLWoodruff
[WIP] scenario creator for agnostic object is roughed in but totally …
6ef0c0b 
…untested
@DLWoodruff
starting to make agnostic work
43fe36c
@DLWoodruff
scenario creation executes
537e3ba
@DLWoodruff
starting to modify phbase for agnostic
4423e00
@DLWoodruff
a bash script to be deleted later
ea5f306
@DLWoodruff
WIP; early work on ph callback; starting attach to obj
3fcf43d
@DLWoodruff
WIP; still working on attach_PH_to_objective (need xbars)
159d6e3
@DLWoodruff
ready to start work on solve_one
1dd7c46
@DLWoodruff
starting on solve_one
bfca106
@DLWoodruff
solve_one executes; need to debug _reenable_W
1d4b156
@DLWoodruff
PH is executing; need to write a solution and start working on spokes
440156b
@DLWoodruff
move the example to the examples dir
8c0e510
@DLWoodruff
ready to try xhatter
06754dc
@DLWoodruff
xhatshuffle seems to be working
c24c3be
@DLWoodruff
WIP: debugging W's in lagrangian
6492b8f
@DLWoodruff
debugging output
23e41c1
@DLWoodruff
the ampl version of farmer (stochastic)
64efddb
@DLWoodruff
single scenario farmer works
1ebdba4
@DLWoodruff
examples of amplpy from AMPL
3b88743
@DLWoodruff
lshaped did not yet have the uniform probabiity option
26bd8bf
@DLWoodruff
draft of ampl create scenario written
370fba9
@DLWoodruff
[WIP] almost done with draft of AMPL agnostic; one copy function left
c94cccc
@DLWoodruff
w_ and prox_ disabled do not need a callout
2ae66d7
@DLWoodruff
farmer_ampl_agnostic.py is sort of done, but totally untested
c4ea3c4
@DLWoodruff
[WIP] working on solving
c1d8c7e
@DLWoodruff
solve executes; now we need actual scenarios
a7ec164
@DLWoodruff
added a test for agnostic_cyliners
2870815
@DLWoodruff
Merge branch 'agnostic' of https://github.com/DLWoodruff/mpi-sppy-1 i…
9a61d39 
…nto agnostic
@DLWoodruff
trying to fix a syntax error in the yml file, but I cannot figure out…
515a72a 
… what the error is
@DLWoodruff
Now I am starting to see what was wrong with the yml file
421a57d
@DLWoodruff
fix indentation error in yml file
6f62299
@DLWoodruff
working on missing headers
0d96744
@DLWoodruff
change it so tests will try xpress before cplex
da62617
@DLWoodruff
try to see if using python 3.9 is causing failures
8be93ff
@DLWoodruff
try reverting the yml to see if tests pass
6dcfe30
@DLWoodruff
usoing the agnostic version of the test yml again
4e61fa7
@DLWoodruff
fix a merge error from bcf5e92
864ee1a
@DLWoodruff
add need_solution to args list for callout to solve_one
b917862
@DLWoodruff
The tests are passing on my machine, so try cplex on github
c394100
@DLWoodruff
Merge branch 'main' of https://github.com/DLWoodruff/mpi-sppy-1
3b24ce2
@DLWoodruff
pull conflict
842685c
@DLWoodruff
Merge branch 'main' of https://github.com/DLWoodruff/mpi-sppy-1
0c4c97f
@DLWoodruff
Merge branch 'main' of https://github.com/DLWoodruff/mpi-sppy-1
fa27a43
@DLWoodruff
Merge branch 'main' of https://github.com/DLWoodruff/mpi-sppy-1
e8d1e02
@DLWoodruff
[WIP] first shot at proper multi-stage bundles; ready to test
9310d49
@DLWoodruff
[WIP] add a commant for aircond (no bundles) to generic_cylinders.bas…
1a6e17e 
…h that has unrecognized arguments
@DLWoodruff
aircond runs with generic cylinders. Ready to try bundles
d9ea29d
@DLWoodruff
added a command to pickle just the scenarios; now need to deal with n…
f8610b6 
…um_scens for aircond
@DLWoodruff
the aircond example now sets cfg.num_scens
0ca7556
@DLWoodruff
bash script updated
81d519c
@DLWoodruff
Merge branch 'main' of https://github.com/DLWoodruff/mpi-sppy-1
9a4dd94
@DLWoodruff
Merge branch 'main' into proper_multi
72d0842
@DLWoodruff
adding to the sample runs bash script
f6a3512
@DLWoodruff
proper, multi-stage bundles are supported with some restrictions
998a04f
@DLWoodruff
didcallout needed to be removed as unused
2bb5539
@DLWoodruff DLWoodruff changed the title Proper multistage bundles [WIP] Proper multistage bundles Dec 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@DLWoodruff @bknueven @AymericPCLegros @keeks05