Revert to conda install of svmbir

lanl · Nov 6, 2024 · d2ed7be · d2ed7be
1 parent 097eb0b
commit d2ed7be
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 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: 2  # 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
@@ -61,8 +61,7 @@ jobs:
           pip install bm4d>=4.0.0
           pip install "ray[tune]>=2.5.0"
           pip install hyperopt
-          pip install svmbir>=0.4.0
-          #conda install -c conda-forge svmbir>=0.4.0
+          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

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: 2  # 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
@@ -64,8 +64,7 @@ jobs:
           pip install bm3d>=4.0.0
           pip install "ray[tune]>=2.5.0"
           pip install hyperopt
-          pip install svmbir>=0.4.0
-          #conda install -c conda-forge svmbir>=0.4.0
+          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