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

Revive clusterEvalMode in ARMA #2035

Merged
merged 3 commits into from
Feb 13, 2023
Merged

Revive clusterEvalMode in ARMA #2035

merged 3 commits into from
Feb 13, 2023

Conversation

joshua-cogliati-inl
Copy link
Contributor

@joshua-cogliati-inl joshua-cogliati-inl commented Jan 5, 2023 •
edited by wangcj05
Loading

Pull Request Description

What issue does this change request address?

Closes #2041

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

Allows clusterEvalMode again in ARMA.
This is used by inputs in FORCE like: https://github.com/idaholab/FORCE/blob/main/use_cases/2020_12/train/carbontax/oh_carbontax_train.xml
See also commit 16b5f26

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.

@joshua-cogliati-inl joshua-cogliati-inl changed the title Revert code removal from 16b5f2689b30a60f2b7cb3dea1b2571943bd06fd Revive clusterEvalMode in ARMA Jan 16, 2023
@moosebuild
Copy link

Job Mingw Test on 22dbde7 : invalidated by @joshua-cogliati-inl

failed in fetch

1 similar comment
@moosebuild
Copy link

Job Mingw Test on 22dbde7 : invalidated by @joshua-cogliati-inl

failed in fetch

wangcj05
wangcj05 reviewed Jan 17, 2023
View reviewed changes
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.

@joshua-cogliati-inl I have one comment for you to consider.

ravenframework/SupervisedLearning/ARMA.py Outdated
Comment on lines 255 to 259

clusterEvalModeEnum = InputTypes.makeEnumType('clusterEvalModeEnum', 'clusterEvalModeType', ['clustered', 'truncated', 'full'])
specs.addSub(InputData.parameterInputFactory('clusterEvalMode', contentType=clusterEvalModeEnum)) # for pickled ROMCollection
specs.addSub(InputData.parameterInputFactory('maxCycles', contentType=InputTypes.IntegerType)) # for pickled Interpolated ROMCollection

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 it with descriptions? The following are from pickledRom.py:
image

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Right now the connection to actually use clusterEvalMode in ARMA is broken, so I have other things to do before that part can be usefully merged.

Copy link
Contributor Author

@joshua-cogliati-inl joshua-cogliati-inl Jan 17, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

I split the code for this into a branch: re_add_to_spec_full, which will be a different pull request. Now this pull request just revives the test since pickledROM is being used.
https://github.com/joshua-cogliati-inl/raven/tree/re_add_to_spec_full

@moosebuild
Copy link

Job Mingw Test on c543937 : invalidated by @wangcj05

fetch failed

@moosebuild
Copy link

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

failed

wangcj05
wangcj05 approved these changes Feb 13, 2023
View reviewed changes
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.

@wangcj05
Copy link
Collaborator

PR checklist is satisfied, and PR can be merged.

@wangcj05 wangcj05 merged commit d107d8d into idaholab:devel Feb 13, 2023
@joshua-cogliati-inl joshua-cogliati-inl deleted the re_add_to_spec branch February 13, 2023 22:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wangcj05 wangcj05 wangcj05 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[TASK] test clusterEvalMode
3 participants
@joshua-cogliati-inl @moosebuild @wangcj05