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

Alfoa/generic codeinterface fix #844

Merged
merged 20 commits into from
Nov 16, 2018
Merged

Conversation

alfoa
Copy link
Collaborator

@alfoa alfoa commented Nov 13, 2018


Pull Request Description

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

Closes #843

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?

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.

We need to cover this change with a regression test still.

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.

A couple new things.

#"""
#prefix = kwargs.get("prefix")
#uniqueHandler = kwargs.get("uniqueHandler",'any')
#forceThreads = kwargs.get("forceThreads",False)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can we add a comment explaining why we are saving this material, and on what conditions it can be removed?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

removed

## This may look a little weird, but due to how the parallel python library
## works, we are unable to pass a member function as a job because the
## pp library loses track of what self is, so instead we call it from the
## class and pass self in as the first parameter
jobHandler.addJob((self, myInput, samplerType, kwargs), self.__class__.evaluateSample, str(0), modulesToImport=self.mods, forceUseThreads=True)
#jobHandler.addJob((self, myInput, samplerType, kwargs), self.__class__.evaluateSample, str(0), modulesToImport=self.mods, forceUseThreads=True)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Same as above, justification for keeping commented code.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

removed

@alfoa alfoa added the comments addressed used to comunicate that the comments on PRs are addressed label Nov 15, 2018
@alfoa
Copy link
Collaborator Author

alfoa commented Nov 15, 2018

comments addressed

@PaulTalbot-INL PaulTalbot-INL mentioned this pull request Nov 15, 2018
10 tasks
@PaulTalbot-INL
Copy link
Collaborator

Checklists pass, review complete.

Approved for merge provided that tests pass. Note that the qsub tests are currently under revision, and so are not required to pass at the moment.

@alfoa
Copy link
Collaborator Author

alfoa commented Nov 16, 2018

@PaulTalbot-INL fixed the test.

@PaulTalbot-INL
Copy link
Collaborator

New changes approved, tests passing, checklists complete. Merging.

@PaulTalbot-INL PaulTalbot-INL merged commit f31a0a4 into devel Nov 16, 2018
@alfoa alfoa deleted the alfoa/genericCodeinterfaceFix branch November 16, 2018 21:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
comments addressed used to comunicate that the comments on PRs are addressed defect priority_critical
Projects
None yet
Development

Successfully merging this pull request may close these issues.

generic code interface parsing
2 participants