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

Fix ability for plugins to find the crow module #1803

Merged
merged 3 commits into from
Apr 5, 2022
Merged

Fix ability for plugins to find the crow module #1803

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0878f6
Fix ability for plugins to find the crow module
dylanjm Apr 5, 2022
e6c63fc
Add check to ensure paths aren't added more than once.
dylanjm Apr 5, 2022
6f4eb8f
Check contrib instead of crow
dylanjm Apr 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ravenframework/CustomDrivers/DriverUtils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def setupCpp():
@ Out, None
"""
frameworkDir = findFramework()
from utils import utils
from ravenframework.utils import utils
utils.find_crow(frameworkDir)
utils.add_path(os.path.join(frameworkDir,'contrib'))
##TODO REMOVE PP3 WHEN RAY IS AVAILABLE FOR WINDOWS
Expand Down
2 changes: 2 additions & 0 deletions ravenframework/utils/randomUtils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

from .utils import findCrowModule
from . import mathUtils
from ..CustomDrivers.DriverUtils import setupCpp

# in general, we will use Crow for now, but let's make it easy to switch just in case it is helpful eventually.
# Numpy stochastic environment can not pass the test as this point
Expand Down Expand Up @@ -87,6 +88,7 @@ def testSampling(self, n=1e5,engine=None):
if stochasticEnv == 'numpy':
npStochEnv = np.random.RandomState()
else:
setupCpp()
joshua-cogliati-inl marked this conversation as resolved.
Show resolved Hide resolved
crowStochEnv = findCrowModule('randomENG').RandomClass()
# this is needed for now since we need to split the stoch environments
distStochEnv = findCrowModule('distribution1D').DistributionContainer.instance()
Expand Down