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

Adding iter0_post_solver_creation callback to extensions object #429

Merged
merged 3 commits into from
Sep 20, 2024
Merged

Adding iter0_post_solver_creation callback to extensions object #429

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1a9a9e
Adding iter0_post_solver_creation callback to extensions object
Sep 20, 2024
aca2bdb
Removing comment, creating an issue
Sep 20, 2024
abb8e36
Merge branch 'main' into newiter0callback
jeanpaulwatson Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions mpisppy/extensions/extension.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,18 @@ def post_solve_loop(self):
pass

def pre_iter0(self):
''' Method called at the end of PH_Prep().
When this method is called, all scenarios have been created, and
''' When this method is called, all scenarios have been created, and
the dual/prox terms have been attached to the objective, but the
solvers have not yet been created.
'''
pass

def iter0_post_solver_creation(self):
''' When this method is called, PH iteration 0 has been initiated and
all solver objects have been created.
'''
pass

def post_iter0(self):
''' Method called after the first PH iteration.
When this method is called, one call to solve_loop() has been
Expand Down
11 changes: 8 additions & 3 deletions mpisppy/phbase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,8 +767,7 @@ def PH_Prep(

Note:
This function constructs an Extension object if one was specified
at the time the PH object was created. It also calls the
`pre_iter0` method of the Extension object.
at the time the PH object was created.
"""

self.attach_Ws_and_prox()
Expand Down Expand Up @@ -827,9 +826,12 @@ def Iter0(self):
stochastic program with the nonanticipativity constraints
removed.
"""

# JPW: the pre iter0 callback should arguably be called not from within
Copy link
Collaborator

Choose a reason for hiding this comment

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

There are multiple pathways to iter0, so I would argue that this is the best place. But, in any event, this comment should probably go somewhere else (e.g. an issue)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fair - corrected (and opened an issue).

# the Iter0() method, but rather from something that calls it.
if (self.extensions is not None):
self.extobject.pre_iter0()

verbose = self.options["verbose"]
dprogress = self.options["display_progress"]
dtiming = self.options["display_timing"]
Expand All @@ -848,6 +850,9 @@ def _vb(msg):
global_toc("Creating solvers")
self._create_solvers()

if (self.extensions is not None):
self.extobject.iter0_post_solver_creation()

teeme = ("tee-rank0-solves" in self.options
and self.options['tee-rank0-solves']
and self.cylinder_rank == 0
Expand Down
Loading