Extend Restart to Adaptive samplers #1283

PaulTalbot-INL · 2020-07-16T23:35:08Z

Pull Request Description

What issue does this change request address? (Use "#" before the issue to link it, i.e., #42.)

Closes #1280

What are the significant changes in functionality due to this change request?

Extends expected existing restart mechanics to Adaptive samplers. This can be improved once:

the Sampler's generateInput returns a realization instead of storing on self
we have the Realization instance

For Change Control Board: Change Request Review

The following review must be completed by an authorized member of the Change Control Board.

1. Review all computer code.
2. If any changes occur to the input syntax, there must be an accompanying change to the user manual and xsd schema. If the input syntax change deprecates existing input files, a conversion script needs to be added (see Conversion Scripts).
3. Make sure the Python code and commenting standards are respected (camelBack, etc.) - See on the wiki for details.
4. Automated Tests should pass, including run_tests, pylint, manual building and xsd tests. If there are changes to Simulation.py or JobHandler.py the qsub tests must pass.
5. If significant functionality is added, there must be tests added to check this. Tests should cover all possible options. Multiple short tests are preferred over one large test. If new development on the internal JobHandler parallel system is performed, a cluster test must be added setting, in XML block, the node <internalParallel> to True.
6. If the change modifies or adds a requirement or a requirement based test case, the Change Control Board's Chair or designee also needs to approve the change. The requirements and the requirements test shall be in sync.
7. The merge request must reference an issue. If the issue is closed, the issue close checklist shall be done.
8. If an analytic test is changed/added is the the analytic documentation updated/added?
9. If any test used as a basis for documentation examples (currently found in raven/tests/framework/user_guide and raven/docs/workshop) have been changed, the associated documentation must be reviewed and assured the text matches the example.

PaulTalbot-INL · 2020-07-16T23:36:18Z

@wangcj05 @alfoa for your reviewing pleasure.

Note that the Adaptive MonteCarlo did work fine with the restart, as we believed. You have to look at the solution export, especially exp_restart, which before this fix only had entries 6-15, and now has 1-15.

alfoa · 2020-07-17T16:21:58Z

Test invalidated to get the new modifications in the BasicStats tests (see PR #1282)

moosebuild · 2020-07-17T16:22:03Z

Job Mingw Test on 3c1f0e2 : invalidated by @alfoa

wangcj05

some minor comments

wangcj05 · 2020-07-20T16:25:59Z

framework/Runners/PassthroughRunner.py

+"""
+#for future compatibility with Python 3--------------------------------------------------------------
+from __future__ import division, print_function, unicode_literals, absolute_import
+#End compatibility block for Python 3----------------------------------------------------------------


I think we do not need this import anymore.

I believe the linter will error if it doesn't find this. We should change this globally, as a separate action.

@alfoa I think you are trying to remove the __future__ import, right?

I think we removed the check on that because it is not needed anymore... @joshua-cogliati-inl ???

Yes we removed it. we can remove the "future" (I know we need to do that to the other files too...I will take care of it)

wangcj05 · 2020-07-20T16:56:12Z

framework/Runners/PassthroughRunner.py

+        handler object
+      @ In, args, dict, this is a list of arguments that will be passed as
+        function parameters into whatever method is stored in functionToRun.
+        e.g., functionToRun(*args)


change args to data

wangcj05 · 2020-07-20T17:24:33Z

tests/framework/Samplers/Restart/adaptive_mc.xml

+    <description>
+      Tests restarting an Adaptive Monte Carlo sampling from restart.  \texttt{makeCoarse} samples initial data, then \texttt{makeRestart}
+      makes additional samples, restarting from the first set of samples.  \texttt{makeFine} does all the samples without restart
+      for comparison.  The model for "coarse" always returns a value of 1, while the model for "restart" returns a value of 2, so


use ``'' instead ""?

done, used texttt instead

wangcj05 · 2020-07-20T17:26:36Z

tests/framework/Samplers/Restart/adaptive_mc.xml

+<?xml version="1.0" ?>
+<Simulation verbosity="debug">
+  <TestInfo>
+    <name>framework/Samplers/Restart.AdaptiveMC</name>


change AdaptiveMC to AMC

wangcj05 · 2020-07-20T23:39:35Z

@alfoa Changes are good to me. Do you want to have review on this PR?

alfoa · 2020-07-22T16:02:31Z

framework/Runners/PassthroughRunner.py

+"""
+#for future compatibility with Python 3--------------------------------------------------------------
+from __future__ import division, print_function, unicode_literals, absolute_import
+#End compatibility block for Python 3----------------------------------------------------------------


Yes we removed it. we can remove the "future" (I know we need to do that to the other files too...I will take care of it)

alfoa · 2020-07-23T15:42:35Z

Comments addressed...

Checklist passed...

PR can be merged

PaulTalbot-INL added 9 commits March 31, 2020 09:50

extraneous tracked file?

43c2919

Merge branch 'devel' of github.com:PaulTalbot-INL/raven into devel

a36cbdb

Merge branch 'devel' of github.com:PaulTalbot-INL/raven into devel

857faa0

matching remote devel

148adb6

Merge branch 'devel' of https://github.com/idaholab/raven into devel

311a4a1

Merge branch 'devel' of https://github.com/idaholab/raven into devel

0883db4

Merge branch 'devel' of https://github.com/idaholab/raven into devel

c7f3f82

implemented and tested

bf48a5c

accidental inclusion

85c537c

PaulTalbot-INL added 4 commits July 16, 2020 17:39

reverted heron version

39fe944

right heron version for devel currently

5bb0ca3

typo

b5a941b

add restart to adaptive MC xsd

3c1f0e2

PaulTalbot-INL requested review from alfoa and wangcj05 and removed request for alfoa July 20, 2020 15:43

wangcj05 requested changes Jul 20, 2020

View reviewed changes

review comments

bec534c

wangcj05 approved these changes Jul 20, 2020

View reviewed changes

alfoa requested changes Jul 22, 2020

View reviewed changes

PaulTalbot-INL added 3 commits July 22, 2020 10:50

Merge branch 'devel' of https://github.com/idaholab/raven into devel

a148fc1

pulled devel

6d44d82

review comments

6b67311

alfoa added the RAVENv2.1 All tasks and defects that will go in RAVEN v2.1 label Jul 23, 2020

alfoa mentioned this pull request Jul 23, 2020

[TASK] Improvement on Restart Capability #1280

Closed

10 tasks

alfoa approved these changes Jul 23, 2020

View reviewed changes

alfoa merged commit 82edf0c into idaholab:devel Jul 23, 2020

alfoa mentioned this pull request Jul 27, 2020

Relevant Issues and Features - From RAVEN v2.0 to v2.1 #1225

Closed

4 tasks

PaulTalbot-INL deleted the adaptive_restart branch April 8, 2021 21:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Extend Restart to Adaptive samplers #1283

Extend Restart to Adaptive samplers #1283

PaulTalbot-INL commented Jul 16, 2020 •

edited by alfoa

Loading

PaulTalbot-INL commented Jul 16, 2020

alfoa commented Jul 17, 2020

moosebuild commented Jul 17, 2020

wangcj05 left a comment

wangcj05 Jul 20, 2020

PaulTalbot-INL Jul 20, 2020

wangcj05 Jul 20, 2020

alfoa Jul 22, 2020

alfoa Jul 22, 2020

wangcj05 Jul 20, 2020

PaulTalbot-INL Jul 20, 2020

wangcj05 Jul 20, 2020

PaulTalbot-INL Jul 20, 2020

wangcj05 Jul 20, 2020

PaulTalbot-INL Jul 20, 2020

wangcj05 commented Jul 20, 2020

alfoa Jul 22, 2020

alfoa commented Jul 23, 2020

Extend Restart to Adaptive samplers #1283

Extend Restart to Adaptive samplers #1283

Conversation

PaulTalbot-INL commented Jul 16, 2020 • edited by alfoa Loading

Pull Request Description

What issue does this change request address? (Use "#" before the issue to link it, i.e., #42.)

What are the significant changes in functionality due to this change request?

For Change Control Board: Change Request Review

PaulTalbot-INL commented Jul 16, 2020

alfoa commented Jul 17, 2020

moosebuild commented Jul 17, 2020

wangcj05 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wangcj05 commented Jul 20, 2020

Choose a reason for hiding this comment

alfoa commented Jul 23, 2020

PaulTalbot-INL commented Jul 16, 2020 •

edited by alfoa

Loading