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 defect ensemble model (with Code) and genetic algorithm #2317

Merged
merged 19 commits into from
May 16, 2024
Merged

Fix defect ensemble model (with Code) and genetic algorithm #2317

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a0ea3b5
Closes #2304
alfoa May 8, 2024
e9feed6
added test
alfoa May 8, 2024
336bae3
Update tests/framework/Optimizers/GeneticAlgorithms/continuous/uncons…
alfoa May 8, 2024
da32086
removed trailing
alfoa May 8, 2024
70a5354
Merge branch 'alfoa/genetic_ensemble_model' of github.com:idaholab/ra…
alfoa May 8, 2024
6077f56
added missing input file
alfoa May 8, 2024
c7f27bf
Update tests/framework/Optimizers/GeneticAlgorithms/continuous/uncons…
alfoa May 8, 2024
af23869
isinstance
alfoa May 9, 2024
ee2f53f
fixed parallel execution
alfoa May 9, 2024
7fba807
readded heron and baycal?
alfoa May 9, 2024
9f077b8
removed trailing spaces
alfoa May 9, 2024
ab60b73
some cleaning
alfoa May 9, 2024
54f43a4
fixed test name and rook error message
alfoa May 9, 2024
a522493
module ensemble doc
alfoa May 10, 2024
5856f6b
Apply suggestions from code review
alfoa May 13, 2024
f83fb30
removed trailing whitespaces
alfoa May 13, 2024
91a23d9
Merge branch 'devel' into alfoa/genetic_ensemble_model
alfoa May 13, 2024
d3c7069
fix for 'cvxpy'...this is not a very maintainable way to handle such …
alfoa May 13, 2024
7ff7659
changed approach
alfoa May 13, 2024
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
4 changes: 3 additions & 1 deletion scripts/library_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
# some bad actors can't use the metadata correctly
# and so need special treatment
# -> see findLibAndVersion
metaExceptions = ['pyside2', 'AMSC', 'PIL']
metaExceptions = ['pyside2', 'AMSC', 'PIL', 'cvxpy']
Copy link
Collaborator Author

@alfoa alfoa May 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

'cvxpy' is added via FARM plugin. It cannot be checked with the metadata. I followed the approach in the library_handler but this should be revised since it is not easily maintainable (overall for plugins). @mandd @wangcj05 @joshua-cogliati-inl . I wonder why the regression system (for PR) did not catch this.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It seems this is due to an update of the library in conda-forge 2 days ago (see https://anaconda.org/conda-forge/cvxpy-base/files).

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

'cvxpy' is added via FARM plugin. It cannot be checked with the metadata. I followed the approach in the library_handler but this should be revised since it is not easily maintainable (overall for plugins). @mandd @wangcj05 @joshua-cogliati-inl . I wonder why the regression system (for PR) did not catch this.

I changed the approach..if a library through a metadata is not found, we try the "slow approach".

Copy link
Contributor

Choose a reason for hiding this comment

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

skip_check is another way to fix this. Example: <hdf5 skip_check='True'/> I have no objection to fixing it in metaExceptions however.


# load up the ravenrc if it's present
## TODO we only want to do this once, but does it need to get updated?
Expand Down Expand Up @@ -215,6 +215,8 @@ def findLibAndVersion(lib, version=None):
return findLibAndVersionSubprocess('AMSC')
elif lib == 'PIL':
return findLibAndVersionSubprocess('PIL')
elif lib == 'cvxpy':
return findLibAndVersionSubprocess('cvxpy')
else:
raise NotImplementedError('Library "{}" on exception list, but no exception implemented!'.format(lib))
return found, output, foundVersion
Expand Down