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

Adding a KerasMLPRegression class to go with the KerasMLPClassifier. #1707

Merged

Conversation

joshua-cogliati-inl
Copy link
Contributor

@joshua-cogliati-inl joshua-cogliati-inl commented Nov 4, 2021

This allows regression to be done for non-timeseries data.


Pull Request Description

What issue does this change request address?

Closes #1706

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

Adds a Keras MLP Regression class, and fixes a bug in the Keras Regression.


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.

@@ -145,7 +151,6 @@ def evaluate(self,edict):
featureValuesShape = fval.shape
if featureValuesShape != fval.shape:
self.raiseAnError(IOError,'In training set, the number of values provided for feature '+feat+' are not consistent to other features!')
self._localNormalizeData(values,names,feat)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was a bug since it changed the normalization constants based on the evaluation data.

This allows regression to be done for non-timeseries data.
@moosebuild
Copy link

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

Testing server removal of raven_libraries

@moosebuild
Copy link

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

changed civet recipe

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.

PR is good.

@wangcj05
Copy link
Collaborator

wangcj05 commented Nov 9, 2021

Checklist is good with exception about qsub falcon test.
qsub falcon is currently under maintenance, and the qsub test under sawtooth is green. As CCB, I approve this PR and it can be merged into devel.

@wangcj05 wangcj05 merged commit 541cc64 into idaholab:devel Nov 9, 2021
@wangcj05
Copy link
Collaborator

wangcj05 commented Nov 9, 2021

@joshua-cogliati-inl I have merged your PR, and thanks for your contribution.

@wangcj05 wangcj05 added the RAVENv2.2 for RAVENv2.2 Release label Nov 9, 2021
@moosebuild
Copy link

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

checking again

@joshua-cogliati-inl joshua-cogliati-inl deleted the cogljj/keras_regression branch November 11, 2021 17:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
RAVENv2.2 for RAVENv2.2 Release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[TASK] Add Keras Regression for non-timeseries data
4 participants