Skip to content

Commit

Permalink
Merge pull request #2251 from joshua-cogliati-inl/force_lapack_build
Browse files Browse the repository at this point in the history
Forcing the lapack build.
  • Loading branch information
PaulTalbot-INL authored Jan 26, 2024
2 parents bfb53aa + 068aa18 commit 43ab075
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
5 changes: 5 additions & 0 deletions dependencies.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ Note all install methods after "main" take
<cyipopt optional='True'/>
<pyomo-extensions source="pyomo" skip_check='True' optional='True'/>
<setuptools/>
<!-- This is because liblapack 3.9.0 build 21 is broken (and can probably be removed if there ever is a build 22). This can also be removed when scipy is updated to version 1.12 -->
<liblapack skip_check='True' os='linux'>3.9.0=20_linux64_openblas</liblapack>
<liblapack skip_check='True' os='windows'>3.9.0=20_win64_mkl</liblapack>
<liblapack skip_check='True' os='mac'>3.9.0=20_osx64_openblas</liblapack>
<!-- source="mamba" are the ones installed when mamba is installed -->
<mamba source="mamba" skip_check='True'/>
</main>
Expand All @@ -93,6 +97,7 @@ Note all install methods after "main" take
<python>remove</python>
<nomkl>remove</nomkl>
<numexpr>remove</numexpr>
<liblapack>remove</liblapack>
</alternate>
<alternate name="none">
<hdf5>remove</hdf5>
Expand Down
2 changes: 2 additions & 0 deletions ravenframework/Metrics/metrics/ScipyMetric.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ class ScipyMetric(MetricInterface):
availMetrics['boolean']['dice'] = spatialDistance.dice
availMetrics['boolean']['hamming'] = spatialDistance.hamming
availMetrics['boolean']['jaccard'] = spatialDistance.jaccard
#Note in scipy 1.12 this needs to be changed to
#availMetrics['boolean']['kulsinski'] = spatialDistance.kulczynski1
availMetrics['boolean']['kulsinski'] = spatialDistance.kulsinski
availMetrics['boolean']['russellrao'] = spatialDistance.russellrao
availMetrics['boolean']['sokalmichener'] = spatialDistance.sokalmichener
Expand Down

0 comments on commit 43ab075

Please sign in to comment.