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

Test different HERON libraries #2410

Open
wants to merge 29 commits into
base: devel
Choose a base branch
from
Open

Test different HERON libraries #2410

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
a47ec44
Updating to scipy 1.12
joshua-cogliati-inl Jan 24, 2024
8eb0b5e
Scikitlearn 1.0 is incompatible with scipy 1.12, so updating to 1.1
joshua-cogliati-inl Jan 25, 2024
2ade198
Sometimes only a 1d array is returned.
joshua-cogliati-inl Jan 25, 2024
d2c5317
Merge remote-tracking branch 'origin/devel' into scipy_1_12
joshua-cogliati-inl Dec 5, 2024
eb93d44
Removing testing kulsinski metric.
joshua-cogliati-inl Dec 5, 2024
2d9c229
simps is deprecated so switching to simpson
joshua-cogliati-inl Dec 5, 2024
2640624
Handle change from https://github.com/scikit-learn/scikit-learn/pull/…
joshua-cogliati-inl Dec 6, 2024
9a695a2
Improving test to classify better.
joshua-cogliati-inl Dec 6, 2024
e3955f2
Regold due to scikit change
joshua-cogliati-inl Dec 6, 2024
e352a56
Regold PolyExponential files (had rel err of 1e-03 or less)
joshua-cogliati-inl Dec 6, 2024
938e8be
Make timestep uniform for scipy update.
joshua-cogliati-inl Dec 11, 2024
200c8f4
Regolding because of changes in scipy 1.12
joshua-cogliati-inl Dec 11, 2024
3e25a8c
Increase limits to improve convergence.
joshua-cogliati-inl Dec 11, 2024
e6ae39c
Unpinning xarray and updating numpy
joshua-cogliati-inl Dec 6, 2024
57b28e9
Updating various libraries.
joshua-cogliati-inl Dec 6, 2024
91c6e8f
Fix working with newer tensorflow.
joshua-cogliati-inl Dec 11, 2024
cbbd615
Values need to be switched to tuples for hstack in numpy 1.26
joshua-cogliati-inl Dec 11, 2024
7d8b673
Updating to new ray version.
joshua-cogliati-inl Dec 12, 2024
c3a0e39
The deque size can be bigger in python 3.11
joshua-cogliati-inl Dec 12, 2024
94b7ea1
Report difference in row lengths, instead of crashing OrderedCSVDiffer.
joshua-cogliati-inl Dec 12, 2024
1851ed2
Remove Fourier__signal_f__period10.0__phase
joshua-cogliati-inl Dec 12, 2024
9544362
Regolding changes to ROM/TimeSeries/DMD/BOPDMD because of library cha…
joshua-cogliati-inl Dec 12, 2024
d38449a
Support xarray 2024.7 and newer.
joshua-cogliati-inl Dec 12, 2024
91bb9c4
Fixing long line.
joshua-cogliati-inl Dec 16, 2024
b7b22a0
Increasing zero threshold because of change in libraries.
joshua-cogliati-inl Dec 16, 2024
4242b78
Remove version from setuptools since ray updated.
joshua-cogliati-inl Dec 16, 2024
6cccb51
Optimizing persistence in BayesianMatyas.
joshua-cogliati-inl Dec 17, 2024
8b3f3bb
Testing different libraries with HERON.
joshua-cogliati-inl Dec 17, 2024
9549b79
Leave dill at previous version.
joshua-cogliati-inl Dec 17, 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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/devel' into scipy_1_12
  • Loading branch information
@joshua-cogliati-inl
joshua-cogliati-inl committed Dec 5, 2024
commit d2c53173037c799783f7435eedac7a5bbe479f77
2 changes: 1 addition & 1 deletion dependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Note all install methods after "main" take
<dependencies>
<main>
<h5py/>
<numpy>1.22</numpy>
<numpy>1.24</numpy>
<scipy>1.12</scipy>
<scikit-learn>1.1</scikit-learn>
<pandas/>
Expand Down
1 change: 0 additions & 1 deletion ravenframework/Metrics/metrics/ScipyMetric.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ class ScipyMetric(MetricInterface):
availMetrics['boolean']['dice'] = spatialDistance.dice
availMetrics['boolean']['hamming'] = spatialDistance.hamming
availMetrics['boolean']['jaccard'] = spatialDistance.jaccard
availMetrics['boolean']['kulsinski'] = spatialDistance.kulczynski1
availMetrics['boolean']['russellrao'] = spatialDistance.russellrao
availMetrics['boolean']['sokalmichener'] = spatialDistance.sokalmichener
availMetrics['boolean']['sokalsneath'] = spatialDistance.sokalsneath
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.