Mandd/gawithcustomsampler #2084

mandd · 2023-02-24T19:53:18Z

Pull Request Description

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

Closes #2060

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

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.

mandd · 2023-02-24T21:32:34Z

@aalfonsi this PR addresses your issue #2060

aalfonsi · 2023-02-24T21:35:06Z

Thanks a lot!

moosebuild · 2023-02-24T21:57:16Z

Job Test Fedora 31 on 36d81f6 : invalidated by @mandd

moosebuild · 2023-02-24T21:57:21Z

Job Test Ubuntu 18-2 Python 3 on 36d81f6 : invalidated by @mandd

moosebuild · 2023-02-24T22:31:21Z

Job Test Ubuntu 18-2 Python 3 on 36d81f6 : invalidated by @mandd

wangcj05 · 2023-02-25T18:09:58Z

ravenframework/CodeInterfaceClasses/MooseBasedApp/MooseInputParser.py

@@ -106,7 +107,9 @@ def getpotToInputTree(getpot):
      #------------------
      # attributes and values
      elif '=' in line:
+        print('HERE')


Fixed, edit for a different issue

wangcj05

I have a coupe of minor comments for you to consider. @mandd

wangcj05 · 2023-02-25T18:10:07Z

ravenframework/CodeInterfaceClasses/MooseBasedApp/MooseInputParser.py

        attribute, value = (x.strip() for x in line.split('=', maxsplit=1))
+        print(attribute, value)


Fixed, edit for a different issue

wangcj05 · 2023-02-25T18:10:12Z

ravenframework/CodeInterfaceClasses/MooseBasedApp/MooseInputParser.py

@@ -124,6 +127,7 @@ def getpotToInputTree(getpot):
            # DO NOT continue, keep going until multiline is closed
            continue
        else:
+          print('HERE1')


Fixed, edit for a different issue

wangcj05 · 2023-02-25T18:11:55Z

ravenframework/Optimizers/Optimizer.py

@@ -208,7 +208,8 @@ def _localGenerateAssembler(self, initDict):
    self.assemblerDict['DataObjects'] = []
    self.assemblerDict['Distributions'] = []
    self.assemblerDict['Functions'] = []
-    for mainClass in ['DataObjects', 'Distributions', 'Functions']:
+    self.assemblerDict['Files'] = []
+    for mainClass in ['DataObjects', 'Distributions', 'Functions', 'Files']:


maybe define a validAssembler list which can be used in multiple places.

wangcj05 · 2023-02-25T18:12:47Z

...amework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwRep_custom_sampler.xml

+      <objective>ans</objective>
+      <TargetEvaluation class="DataObjects" type="PointSet">optOut</TargetEvaluation>
+    <Sampler class="Samplers" type="CustomSampler">restartSampler</Sampler>
+    <!--Sampler class="Samplers" type="MonteCarlo">MC_samp</Sampler-->


wangcj05 · 2023-02-25T18:13:20Z

...amework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwRep_custom_sampler.xml

+    <MonteCarlo name="MC_samp">
+      <samplerInit>
+        <limit>10</limit>
+        <initialSeed>20021986</initialSeed>
+      </samplerInit>
+      <variable name="x1">
+        <distribution>uniform_dist_Repl_1</distribution>
+      </variable>
+      <variable name="x2">
+        <distribution>uniform_dist_Repl_1</distribution>
+      </variable>
+      <variable name="x3">
+        <distribution>uniform_dist_Repl_1</distribution>
+      </variable>
+    </MonteCarlo>


remove? Not used.

moosebuild · 2023-02-27T16:50:32Z

Job Test mac on 0473401 : invalidated by @mandd

moosebuild · 2023-02-27T16:50:53Z

Job Test CentOS 7 on 0473401 : invalidated by @mandd

wangcj05 · 2023-02-27T18:51:56Z

ravenframework/Optimizers/Optimizer.py

@@ -401,7 +405,7 @@ def _initializeInitSampler(self, externalSeeding):
    self._initSampler = sampler
    # initialize sampler
    samplerInit = {}
-    for entity in ['Distributions', 'Functions', 'DataObjects']:
+    for entity in ['Distributions', 'Functions', 'DataObjects','Files']:


Could you change the list to use self.optAssemblerList here?

wangcj05 · 2023-02-27T18:52:25Z

ravenframework/Optimizers/Optimizer.py

    needDict['Distributions'] = [(None,'all')]
    needDict['Functions'    ] = [(None,'all')]
    needDict['DataObjects'  ] = [(None,'all')]
+    needDict['Files'        ] = [(None,'all')]


It seems we can do a loop over self.optAssemblerList here.

moosebuild · 2023-02-27T19:57:24Z

Job Test Ubuntu 16 on 0040e2a : invalidated by @mandd

wangcj05 · 2023-02-27T20:04:58Z

ravenframework/Optimizers/Optimizer.py

+    #needDict['Distributions'] = [(None,'all')]
+    #needDict['Functions'    ] = [(None,'all')]
+    #needDict['DataObjects'  ] = [(None,'all')]
+    #needDict['Files'        ] = [(None,'all')]


remove these lines?

doing too many things at the same time

wangcj05

changes look good.

wangcj05 · 2023-02-27T20:31:09Z

Once tests are green, this PR can be merged.

moosebuild · 2023-02-27T22:10:33Z

Job Mingw Test on 7a31828 : invalidated by @wangcj05

fetch failed

moosebuild · 2023-02-27T22:40:15Z

Job Mingw Test on 7a31828 : invalidated by @joshua-cogliati-inl

failed in fetch

moosebuild · 2023-02-27T22:40:15Z

Job Mingw Test on 7a31828 : invalidated by @mandd

moosebuild · 2023-02-28T02:23:39Z

Job Mingw Test on 7a31828 : invalidated by @wangcj05

failed InterpolatedMaxCycles

moosebuild · 2023-02-28T15:47:34Z

Job Mingw Test on 7a31828 : invalidated by @mandd

wangcj05 · 2023-02-28T16:24:08Z

@mandd I guess there is a consistent failure in Windows, which is caused by test InterpolatedMaxCycles. This test has been recently revived in PR#2035. The purpose of the test is test the validity of input structure for ARMA, it is not made for consistent check.

I recommend to increase the rel_err for this test or we do not check the consistency in the csv file, just checkout it produces csv files.

joshua-cogliati-inl · 2023-02-28T18:50:02Z

@mandd I guess there is a consistent failure in Windows, which is caused by test InterpolatedMaxCycles. This test has been recently revived in PR#2035. The purpose of the test is test the validity of input structure for ARMA, it is not made for consistent check.

I recommend to increase the rel_err for this test or we do not check the consistency in the csv file, just checkout it produces csv files.

I agree, change "csv =" to "output =" in this test.

wangcj05 · 2023-02-28T23:53:56Z

PR looks good and checklist is satisfied.

mandd added 4 commits February 24, 2023 12:04

first edits and test file

077aabf

removed redundant line

dd4a043

added gold file

cf5620b

added missing file

36d81f6

mandd requested a review from wangcj05 February 24, 2023 21:30

mandd added priority_normal defect labels Feb 24, 2023

wangcj05 reviewed Feb 25, 2023

View reviewed changes

wangcj05 requested changes Feb 25, 2023

View reviewed changes

addressing comments

0473401

wangcj05 reviewed Feb 27, 2023

View reviewed changes

edit file

0040e2a

wangcj05 reviewed Feb 27, 2023

View reviewed changes

edit file

7a31828

wangcj05 previously approved these changes Feb 27, 2023

View reviewed changes

edit ARMA test

adf714a

mandd dismissed wangcj05’s stale review via adf714a February 28, 2023 20:06

wangcj05 approved these changes Feb 28, 2023

View reviewed changes

wangcj05 merged commit 0309b51 into devel Feb 28, 2023

wangcj05 deleted the mandd/GAwithCustomsampler branch February 28, 2023 23:54

		attribute, value = (x.strip() for x in line.split('=', maxsplit=1))
		print(attribute, value)

Mandd/gawithcustomsampler #2084

Mandd/gawithcustomsampler #2084

Conversation

mandd commented Feb 24, 2023 • edited by wangcj05 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

mandd commented Feb 24, 2023 • edited Loading

aalfonsi commented Feb 24, 2023

moosebuild commented Feb 24, 2023

moosebuild commented Feb 24, 2023

moosebuild commented Feb 24, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

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

moosebuild commented Feb 27, 2023

moosebuild commented Feb 27, 2023

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

moosebuild commented Feb 27, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wangcj05 left a comment

Choose a reason for hiding this comment

wangcj05 commented Feb 27, 2023

moosebuild commented Feb 27, 2023

moosebuild commented Feb 27, 2023

moosebuild commented Feb 27, 2023

moosebuild commented Feb 28, 2023

moosebuild commented Feb 28, 2023

wangcj05 commented Feb 28, 2023

joshua-cogliati-inl commented Feb 28, 2023

wangcj05 commented Feb 28, 2023

mandd commented Feb 24, 2023 •

edited by wangcj05

Loading

mandd commented Feb 24, 2023 •

edited

Loading