From b7bc655945f9f8d016997241fbd803b0c91ad7c9 Mon Sep 17 00:00:00 2001 From: Brendt Wohlberg Date: Fri, 22 Dec 2023 08:21:26 -0700 Subject: [PATCH] Move svmbir dependency to examples dependency list --- .github/workflows/pytest_macos.yml | 4 +++- .github/workflows/pytest_ubuntu.yml | 3 ++- examples/examples_requirements.txt | 1 + requirements.txt | 1 - 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pytest_macos.yml b/.github/workflows/pytest_macos.yml index 0b097029c..82cf74b95 100644 --- a/.github/workflows/pytest_macos.yml +++ b/.github/workflows/pytest_macos.yml @@ -59,11 +59,13 @@ jobs: pip install pytest-split pip install -r requirements.txt pip install -r dev_requirements.txt + mamba install -c conda-forge svmbir>=0.3.3 mamba install -c astra-toolbox astra-toolbox mamba 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.0.0" + pip install "ray[tune]>=2.5.0" pip install hyperopt # Install package to be tested - name: Install package to be tested diff --git a/.github/workflows/pytest_ubuntu.yml b/.github/workflows/pytest_ubuntu.yml index db24830e5..f60c9d4ba 100644 --- a/.github/workflows/pytest_ubuntu.yml +++ b/.github/workflows/pytest_ubuntu.yml @@ -62,12 +62,13 @@ jobs: pip install pytest-split pip install -r requirements.txt pip install -r dev_requirements.txt + mamba install -c conda-forge svmbir>=0.3.3 mamba install -c astra-toolbox astra-toolbox mamba 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 "ray[tune]>=2.0.0" + pip install "ray[tune]>=2.5.0" pip install hyperopt # Install package to be tested - name: Install package to be tested diff --git a/examples/examples_requirements.txt b/examples/examples_requirements.txt index 7f5f41323..15d0a2a1e 100644 --- a/examples/examples_requirements.txt +++ b/examples/examples_requirements.txt @@ -1,6 +1,7 @@ -r ../requirements.txt tifffile colour_demosaicing +svmbir>=0.3.3 astra-toolbox xdesign>=0.5.5 ray[tune,train]>=2.5.0 diff --git a/requirements.txt b/requirements.txt index c4f93b05f..76722063a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,5 +7,4 @@ jaxlib>=0.4.3,<=0.4.23 jax>=0.4.3,<=0.4.23 orbax-checkpoint flax>=0.6.1,<=0.7.5 -svmbir>=0.3.3 pyabel>=0.9.0