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

Fix ability for plugins to find the crow module #1803

Merged
merged 3 commits into from
Apr 5, 2022

Conversation

dylanjm
Copy link
Collaborator

@dylanjm dylanjm commented Apr 5, 2022


Pull Request Description

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

#1764

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

This just ensures that the crow module path is correctly specified before trying to find the crow module in utils.randomUtils.py


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 e6c63fc : invalidated by @dylanjm

Looks like it got hung up fetching RAVEN

Copy link
Contributor

@joshua-cogliati-inl joshua-cogliati-inl left a comment

Choose a reason for hiding this comment

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

This is tricker code than it looks, so some fixes are needed.

##TODO REMOVE PP3 WHEN RAY IS AVAILABLE FOR WINDOWS
utils.add_path_recursively(os.path.join(frameworkDir,'contrib','pp'))
ravenDir = os.path.dirname(frameworkDir)
if any(os.path.normcase(sp) == os.path.join(ravenDir, 'crow') for sp in sys.path):
Copy link
Contributor

Choose a reason for hiding this comment

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

crow actually is just the c++ build files and so will not be in the path. Also, find_crow does check to see if crow can be imported before adding to the path.

ravenframework/CustomDrivers/DriverUtils.py Show resolved Hide resolved
@dylanjm
Copy link
Collaborator Author

dylanjm commented Apr 5, 2022

@joshua-cogliati-inl All checks passed. Ready for another once over. This PR is needed to merge HERON Framework PR and to also run the parallel case on HPC.

@joshua-cogliati-inl joshua-cogliati-inl merged commit 7403bba into idaholab:devel Apr 5, 2022
@dylanjm dylanjm deleted the find_crow_fix branch January 30, 2023 19:01
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.

3 participants