Skip to content

Commit

Permalink
Merge branch 'devel' into SPSL_add_constraints
Browse files Browse the repository at this point in the history
  • Loading branch information
niharika2999 authored Sep 16, 2024
2 parents 8155b90 + b2c20ce commit c06a2bb
Show file tree
Hide file tree
Showing 94 changed files with 11,925 additions and 1,092 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@
[submodule "plugins/BayCal"]
path = plugins/BayCal
url = https://github.com/idaholab/BayCal.git
[submodule "plugins/POEM"]
path = plugins/POEM
url = https://github.com/idaholab/POEM.git
7 changes: 4 additions & 3 deletions dependencies.xml
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.9</scipy>
<scikit-learn>1.0</scikit-learn>
<pandas/>
Expand All @@ -47,7 +47,7 @@ Note all install methods after "main" take
<netcdf4 source="pip">1.6</netcdf4>
<matplotlib>3.5</matplotlib>
<statsmodels>0.13</statsmodels>
<cloudpickle>3.0</cloudpickle>
<cloudpickle/>
<tensorflow source="pip">2.13</tensorflow>
<grpcio source="pip" />
<!-- conda is really slow on windows if the version is not specified.-->
Expand All @@ -70,7 +70,6 @@ Note all install methods after "main" take
<!-- redis is needed by ray, but on windows, this seems to need to be explicitly stated -->
<redis source="pip" os='windows'/>
<imageio source="pip">2.22</imageio>
<smt machine='x86_64'/> <!-- not available on macos arm64 -->
<line_profiler optional='True'/>
<!-- <ete3 optional='True'/> -->
<statsforecast/>
Expand All @@ -90,6 +89,8 @@ Note all install methods after "main" take
<!-- source="mamba" are the ones installed when mamba is installed -->
<mamba source="mamba" skip_check='True'/>
<serpentTools optional='True' source="pip"/>
<pydmd source="pip"/>
<ezyrb source="pip"/>
</main>
<alternate name="pip">
<hdf5>remove</hdf5>
Expand Down
Loading

0 comments on commit c06a2bb

Please sign in to comment.