From fa007c3234dd89eb33c733c6332a35f62892981b Mon Sep 17 00:00:00 2001 From: Brendt Wohlberg Date: Tue, 5 Nov 2024 18:21:23 -0700 Subject: [PATCH 1/7] Remove temporary changes from pytest runs --- .github/workflows/pytest_macos.yml | 5 ++--- .github/workflows/pytest_ubuntu.yml | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pytest_macos.yml b/.github/workflows/pytest_macos.yml index 1ab2e88f..e544789d 100644 --- a/.github/workflows/pytest_macos.yml +++ b/.github/workflows/pytest_macos.yml @@ -57,11 +57,10 @@ 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 conda-forge svmbir>=0.4.0 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 --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" diff --git a/.github/workflows/pytest_ubuntu.yml b/.github/workflows/pytest_ubuntu.yml index 2acf3a1b..6d20ab2b 100644 --- a/.github/workflows/pytest_ubuntu.yml +++ b/.github/workflows/pytest_ubuntu.yml @@ -60,11 +60,10 @@ 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 svmbir>=0.4.0 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 --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.5.0" From 242629474b528cc50765d9b7f4e70008e6fc1895 Mon Sep 17 00:00:00 2001 From: Brendt Wohlberg Date: Tue, 5 Nov 2024 18:38:07 -0700 Subject: [PATCH 2/7] Update required svmbir version --- examples/examples_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/examples_requirements.txt b/examples/examples_requirements.txt index 005c6f16..b19087e0 100644 --- a/examples/examples_requirements.txt +++ b/examples/examples_requirements.txt @@ -1,6 +1,6 @@ -r ../requirements.txt colour_demosaicing -svmbir>=0.3.3 +svmbir>=0.4.0 astra-toolbox xdesign>=0.5.5 ray[tune,train]>=2.5.0 From 05fb19edcb27fb0416cf531ff6b494416ae3ca5d Mon Sep 17 00:00:00 2001 From: Brendt Wohlberg Date: Tue, 5 Nov 2024 18:38:44 -0700 Subject: [PATCH 3/7] Clean up --- .github/workflows/pytest_macos.yml | 1 - .github/workflows/pytest_ubuntu.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/pytest_macos.yml b/.github/workflows/pytest_macos.yml index e544789d..f0652ed3 100644 --- a/.github/workflows/pytest_macos.yml +++ b/.github/workflows/pytest_macos.yml @@ -60,7 +60,6 @@ jobs: conda install -c conda-forge svmbir>=0.4.0 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" diff --git a/.github/workflows/pytest_ubuntu.yml b/.github/workflows/pytest_ubuntu.yml index 6d20ab2b..77c2f2de 100644 --- a/.github/workflows/pytest_ubuntu.yml +++ b/.github/workflows/pytest_ubuntu.yml @@ -63,7 +63,6 @@ jobs: conda install -c conda-forge svmbir>=0.4.0 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 "ray[tune]>=2.5.0" From 303ac61371d8eafcc9f712c063b10f90388b1876 Mon Sep 17 00:00:00 2001 From: Brendt Wohlberg Date: Tue, 5 Nov 2024 18:42:25 -0700 Subject: [PATCH 4/7] Force cache reset --- .github/workflows/pytest_macos.yml | 2 +- .github/workflows/pytest_ubuntu.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pytest_macos.yml b/.github/workflows/pytest_macos.yml index f0652ed3..0051e6c0 100644 --- 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: 2 # Increase this value to force cache reset id: cache # Display environment details - name: Display environment details diff --git a/.github/workflows/pytest_ubuntu.yml b/.github/workflows/pytest_ubuntu.yml index 77c2f2de..d786c0bd 100644 --- 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: 2 # Increase this value to force cache reset id: cache # Display environment details - name: Display environment details From 19da63f3737ddb19c90ec9a0335d56234875da62 Mon Sep 17 00:00:00 2001 From: Brendt Wohlberg Date: Wed, 6 Nov 2024 07:02:02 -0700 Subject: [PATCH 5/7] Attempt tpo resolve pytest failure --- .github/workflows/pytest_ubuntu.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pytest_ubuntu.yml b/.github/workflows/pytest_ubuntu.yml index d786c0bd..3e20479c 100644 --- a/.github/workflows/pytest_ubuntu.yml +++ b/.github/workflows/pytest_ubuntu.yml @@ -60,13 +60,14 @@ jobs: pip install pytest-split pip install -r requirements.txt pip install -r dev_requirements.txt - conda install -c conda-forge svmbir>=0.4.0 - conda install -c conda-forge astra-toolbox - conda install -c conda-forge pyyaml - 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 + pip install 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 - name: Install package to be tested run: pip install -e . From 097eb0bb55c17134eb67397cd2f93128be40253e Mon Sep 17 00:00:00 2001 From: Brendt Wohlberg Date: Wed, 6 Nov 2024 07:09:51 -0700 Subject: [PATCH 6/7] Attempt tpo resolve pytest failure --- .github/workflows/pytest_macos.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pytest_macos.yml b/.github/workflows/pytest_macos.yml index 0051e6c0..68003acb 100644 --- a/.github/workflows/pytest_macos.yml +++ b/.github/workflows/pytest_macos.yml @@ -57,13 +57,14 @@ jobs: pip install pytest-split pip install -r requirements.txt pip install -r dev_requirements.txt - conda install -c conda-forge svmbir>=0.4.0 - conda install -c astra-toolbox astra-toolbox - conda install -c conda-forge pyyaml pip install bm3d>=4.0.0 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 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 . From d2ed7be0634f1b40b2e9bb470406fa4047fd6f69 Mon Sep 17 00:00:00 2001 From: Brendt Wohlberg Date: Wed, 6 Nov 2024 09:45:03 -0700 Subject: [PATCH 7/7] Revert to conda install of svmbir --- .github/workflows/pytest_macos.yml | 5 ++--- .github/workflows/pytest_ubuntu.yml | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pytest_macos.yml b/.github/workflows/pytest_macos.yml index 68003acb..24d59cfb 100644 --- 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 index 3e20479c..73e9235d 100644 --- 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