From b8c8bab9d5a089af32dbe4f7cf413a2c13acb19e Mon Sep 17 00:00:00 2001 From: Brendt Wohlberg Date: Wed, 18 Oct 2023 00:24:56 -0600 Subject: [PATCH] Make bm3d and bm4d optional (#458) * Move bm3d and bm4d to examples requirements * Fix submodule * Ensure bm3d is installed for CI --- .github/workflows/pytest_ubuntu.yml | 1 + data | 2 +- examples/examples_requirements.txt | 2 ++ requirements.txt | 2 -- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pytest_ubuntu.yml b/.github/workflows/pytest_ubuntu.yml index b4ace2c86..4c0364cdd 100644 --- a/.github/workflows/pytest_ubuntu.yml +++ b/.github/workflows/pytest_ubuntu.yml @@ -66,6 +66,7 @@ jobs: 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 bm4d>=4.0.0 + pip install bm4d>=4.2.2 pip install "ray[tune]>=2.0.0" pip install hyperopt # Install package to be tested diff --git a/data b/data index 0d9f1fef8..1f1e9f83b 160000 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit 0d9f1fef8df6eebb98d154e1e6d1ab8357914a88 +Subproject commit 1f1e9f83bb52bf9a08115ab71d8bb32a05c4ff0c diff --git a/examples/examples_requirements.txt b/examples/examples_requirements.txt index afb79a816..60b77e7e7 100644 --- a/examples/examples_requirements.txt +++ b/examples/examples_requirements.txt @@ -3,3 +3,5 @@ colour_demosaicing xdesign>=0.5.5 ray[tune]>=2.0.0 hyperopt +bm3d>=4.0.0 +bm4d>=4.2.2 diff --git a/requirements.txt b/requirements.txt index e62fcb7cc..ca4dc28b5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,5 @@ matplotlib jaxlib>=0.4.3,<=0.4.16 jax>=0.4.3,<=0.4.16 flax>=0.6.1,<=0.6.9 -bm3d>=4.0.0 -bm4d>=4.2.2 svmbir>=0.3.3 pyabel>=0.9.0