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

Closes #1493 - Fix Conjugated Gradient #1494

Merged
merged 12 commits into from
Oct 13, 2021
Merged

Closes #1493 - Fix Conjugated Gradient #1494

merged 12 commits into from
Oct 13, 2021

Conversation

alfoa
Copy link
Collaborator

@alfoa alfoa commented Apr 1, 2021


Pull Request Description

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

Closes #1493

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

A debug statement was still in the code. This was not allowing the line-search to be activated.
The Conjugated Gradient basically was not doing what the method was supposed to do.


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.

@moosebuild
Copy link

Job Mingw Test on 51dcdfa : invalidated by @alfoa

PaulTalbot-INL
PaulTalbot-INL previously approved these changes Apr 1, 2021
Copy link
Collaborator

@PaulTalbot-INL PaulTalbot-INL left a comment

Choose a reason for hiding this comment

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

Code changes are fine; I am not familiar enough with CG to say whether it is now working as it should be.

@moosebuild
Copy link

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

restarted civet

JiaZhou-PU
JiaZhou-PU previously approved these changes Apr 1, 2021
Copy link
Collaborator

@JiaZhou-PU JiaZhou-PU left a comment

Choose a reason for hiding this comment

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

Approved

@PaulTalbot-INL
Copy link
Collaborator

I'm seeing the following test failures:

  1. SyntheticHistory.ARMA fails on CentOS 8, Fedora 31/32, Ubuntu 16/18, but passes on Mac, Falcon, and Windows. Do we have any idea if something changed in the libraries on linux (and why Falcon doesn't care)? I doubt this PR directly affects that.
  2. CentOS 7 and OpenSuse Leap seem unresponsive.

These both seem to be common to multiple PRs right now. The difference in SyntheticHistory.ARMA is in a relatively small (but not quite insignificant) value, so perhaps the tolerance could be increased, but I hate doing that without knowing what libraries changed ...

@joshua-cogliati-inl
Copy link
Contributor

2. CentOS 7 and OpenSuse Leap seem unresponsive.

I think CentOS 7 is fixed. Our OpenSuse Leap system is having some weird DNS issue that neither Derek nor I have had time to try and figure out and fix.

@moosebuild
Copy link

Job Test CentOS 7 on 51dcdfa : invalidated by @joshua-cogliati-inl

restarted civet

@alfoa alfoa dismissed stale reviews from JiaZhou-PU and PaulTalbot-INL via 12746c8 April 10, 2021 23:37
@moosebuild
Copy link

Job Test qsubs on 12746c8 : invalidated by @alfoa

?

@moosebuild
Copy link

Job Test CentOS 7 on e22815c : invalidated by @joshua-cogliati-inl

Failed with scripts/establish_conda_env.sh: line 136: /home/civet/civet/build_0/raven/plugins/plugin_directory.xml: Permission denied

@@ -381,7 +381,7 @@ def _startLineSearch(self, lastStepInfo, curPoint, curObjVal, curGrad, curGradMa
# since we've accepted a pivot, we need to store the old pivot and set up the new one
## first grab the savable params
pivot = lastStepInfo.pop('pivot', None)
if True: #pivot is None:
if pivot is None:
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is the only mechanical change in this PR, right?

Copy link
Collaborator

Choose a reason for hiding this comment

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

yes

@wangcj05
Copy link
Collaborator

@aalfonsi Could you address the commends in this week so that we can include these changes in new release?

@aalfonsi
Copy link
Collaborator

@aalfonsi Could you address the commends in this week so that we can include these changes in new release?

addressed @wangcj05 @PaulTalbot-INL

@PaulTalbot-INL PaulTalbot-INL merged commit 4c1a360 into devel Oct 13, 2021
@PaulTalbot-INL PaulTalbot-INL deleted the alfoa/cg_opt branch October 13, 2021 13:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[DEFECT] Conjiugate Gradient does not perform a line search
7 participants