Merge branch 'main' into brendt/trace

lanl · Nov 8, 2024 · fa567c5 · fa567c5
2 parents 931f212 + 6ce6a15
commit fa567c5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/.github/workflows/pytest_macos.yml b/.github/workflows/pytest_macos.yml
@@ -41,7 +41,7 @@ jobs:
           path: ${{ env.CONDA }}/envs
           key: conda-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('dev_requirements.txt') }}-${{ env.CACHE_NUMBER }}
         env:
-          CACHE_NUMBER: 1  # Increase this value to force cache reset
+          CACHE_NUMBER: 0  # Increase this value to force cache reset
         id: cache
       # Display environment details
       - name: Display environment details
@@ -57,15 +57,13 @@ jobs:
           pip install pytest-split
           pip install -r requirements.txt
           pip install -r dev_requirements.txt
-          # Temporarily disabled due to svmbir failure with numpy 2.x under Python 3.12
-          # conda install -c conda-forge svmbir>=0.3.3
-          conda install -c astra-toolbox astra-toolbox
-          conda install -c conda-forge pyyaml
-          pip install --upgrade --force-reinstall scipy>=1.6.0  # Temporary fix for GLIBCXX_3.4.30 not found in conda forge version
           pip install bm3d>=4.0.0
           pip install bm4d>=4.0.0
           pip install "ray[tune]>=2.5.0"
           pip install hyperopt
+          conda install -c conda-forge svmbir>=0.4.0
+          conda install -c astra-toolbox astra-toolbox
+          conda install -c conda-forge pyyaml
       # Install package to be tested
       - name: Install package to be tested
         run: pip install -e .

diff --git a/.github/workflows/pytest_ubuntu.yml b/.github/workflows/pytest_ubuntu.yml
@@ -41,7 +41,7 @@ jobs:
           path: ${{ env.CONDA }}/envs
           key: conda-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('dev_requirements.txt') }}-${{ env.CACHE_NUMBER }}
         env:
-          CACHE_NUMBER: 1  # Increase this value to force cache reset
+          CACHE_NUMBER: 0  # Increase this value to force cache reset
         id: cache
       # Display environment details
       - name: Display environment details
@@ -60,15 +60,13 @@ jobs:
           pip install pytest-split
           pip install -r requirements.txt
           pip install -r dev_requirements.txt
-          # svmbir install temporarily disabled due to import errors
-          #conda install -c conda-forge svmbir>=0.3.3
-          conda install -c conda-forge astra-toolbox
-          conda install -c conda-forge pyyaml
-          pip install --upgrade --force-reinstall scipy>=1.6.0  # Temporary fix for GLIBCXX_3.4.30 not found in conda forge version
-          pip install bm3d>=4.0.0
           pip install bm4d>=4.2.2
+          pip install bm3d>=4.0.0
           pip install "ray[tune]>=2.5.0"
           pip install hyperopt
+          conda install -c conda-forge svmbir>=0.4.0
+          conda install -c conda-forge astra-toolbox
+          conda install -c conda-forge pyyaml
       # Install package to be tested
       - name: Install package to be tested
         run: pip install -e .

diff --git a/examples/examples_requirements.txt b/examples/examples_requirements.txt
@@ -1,7 +1,7 @@
 -r ../requirements.txt
 colorama
 colour_demosaicing
-svmbir>=0.3.3
+svmbir>=0.4.0
 astra-toolbox
 xdesign>=0.5.5
 ray[tune,train]>=2.5.0