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.

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

Ensemble model fixes for batching #2007

Merged
merged 5 commits into from
Nov 18, 2022
Merged

Ensemble model fixes for batching #2007

merged 5 commits into from
Nov 18, 2022

Conversation

mandd
Copy link
Collaborator

@mandd mandd commented Nov 9, 2022


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?

close #2019


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 mandd changed the title [WIP] Ensemble model fixes for batching Ensemble model fixes for batching Nov 9, 2022
@moosebuild
Copy link

Job Test qsubs sawtooth on ad894b9 : invalidated by @wangcj05

one failed run for tests/cluster_tests/InternalParallel/test_hybrid_model_code

@moosebuild
Copy link

Job Test qsubs sawtooth on ad894b9 : invalidated by @joshua-cogliati-inl

fixed problem on sawtooth

@moosebuild
Copy link

Job Mingw Test on ad894b9 : invalidated by @wangcj05

retesting

Copy link
Collaborator

@wangcj05 wangcj05 left a comment

Choose a reason for hiding this comment

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

@mandd I have some comments for you to consider.

if output.name not in optionalOutputNames:
if output.name not in targetEvaluationNames.keys():
output.addRealization(joinedResponse)
if isinstance(evaluation,dict):
Copy link
Collaborator

Choose a reason for hiding this comment

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

Could you update this line with followings:

    # in the event a batch is run, the evaluations will be a dict as {'RAVEN_isBatch':True, 'realizations': [...]}
    if isinstance(evaluation,dict) and evaluation.get('RAVEN_isBatch',False):

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

added

metadata = kw

if self.parallelStrategy == 1:
jobHandler.addJob((self, myInput, samplerType, kw), self.__class__.evaluateSample, prefix, metadata=metadata,
Copy link
Collaborator

Choose a reason for hiding this comment

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

In addition, we need add a test for this PR to test the GA with ensemble model

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

test added

@wangcj05 wangcj05 added the RAVENv2.3 for RAVEN 2.3 Release label Nov 16, 2022
Copy link
Collaborator

@wangcj05 wangcj05 left a comment

Choose a reason for hiding this comment

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

changes look good.

Copy link
Collaborator

@wangcj05 wangcj05 left a comment

Choose a reason for hiding this comment

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

The missing "classesTested" node in TestInfo causes the XSD schema checks failed. Could you update that? @mandd

<?xml version="1.0" ?>
<Simulation verbosity="debug">
<TestInfo>
<name>framework/Optimizers/GeneticAlgorithms/test_ensemble_withGA</name>
Copy link
Collaborator

Choose a reason for hiding this comment

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

classesTested node is required. Could you add that?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

fixed!

@wangcj05
Copy link
Collaborator

PR looks good and checklist is satisfied.

@wangcj05 wangcj05 merged commit 2a17674 into devel Nov 18, 2022
@wangcj05 wangcj05 deleted the mandd/ensembleModelFixes branch November 18, 2022 20:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
RAVENv2.3 for RAVEN 2.3 Release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[TASK] Enable GA to work with Ensemble Model
3 participants