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

Jump to bottom

Updating to scipy 1.12 #2250

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

Updating to scipy 1.12 #2250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 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
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: 2 additions & 2 deletions dependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ Note all install methods after "main" take
<main>
<h5py/>
<numpy>1.22</numpy>
<scipy>1.9</scipy>
<scikit-learn>1.0</scikit-learn>
<scipy>1.12</scipy>
<scikit-learn>1.1</scikit-learn>
<pandas/>
<!-- Note most versions of xarray work, but some (such as 0.20) don't -->
<xarray>2023</xarray>
Expand Down
2 changes: 1 addition & 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,7 @@ class ScipyMetric(MetricInterface):
availMetrics['boolean']['dice'] = spatialDistance.dice
availMetrics['boolean']['hamming'] = spatialDistance.hamming
availMetrics['boolean']['jaccard'] = spatialDistance.jaccard
availMetrics['boolean']['kulsinski'] = spatialDistance.kulsinski
availMetrics['boolean']['kulsinski'] = spatialDistance.kulczynski1
availMetrics['boolean']['russellrao'] = spatialDistance.russellrao
availMetrics['boolean']['sokalmichener'] = spatialDistance.sokalmichener
availMetrics['boolean']['sokalsneath'] = spatialDistance.sokalsneath
Expand Down
5 changes: 4 additions & 1 deletion ravenframework/SupervisedLearning/ARMA.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1628,7 +1628,10 @@ def getFundamentalFeatures(self, requestedFeatures, featureTemplate=None):
## IND
#most probabble index
if len(group['Ind']):
modeInd = stats.mode(group['Ind'])[0][0]
try:
modeInd = stats.mode(group['Ind'])[0][0]
except IndexError:
modeInd = stats.mode(group['Ind'])[0]
else:
modeInd = 0
ID = 'gp_{}_modeInd'.format(g)
Expand Down