From 48624537c5f743cc3731dafb01500171f0091630 Mon Sep 17 00:00:00 2001 From: lauramurgatroyd Date: Wed, 3 Jun 2026 13:54:56 +0000 Subject: [PATCH 1/3] Environment updtes for CIL v26 --- env/cil_test_demos.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/env/cil_test_demos.yml b/env/cil_test_demos.yml index 159a27b..1d4323b 100644 --- a/env/cil_test_demos.yml +++ b/env/cil_test_demos.yml @@ -5,16 +5,15 @@ channels: - https://software.repos.intel.com/python/conda dependencies: # base (vis. recipe/conda_build_config.yaml) - - python >=3.10,<3.13 - - numpy >=1.23,<2 + - python >=3.10 + - numpy >=1.23,<3 - libgomp # [linux] - - ccpi::cil=25.0.0 - ccpi::cil-data >=22 - - ccpi::tigre 2.6 - - ccpi::ccpi-regulariser 24.0.1 - - ccpi::tomophantom 2.0.0 - - astra-toolbox 2.1 cuda* - - cvxpy + - ccpi::tigre 3.1.3 + - ccpi::ccpi-regulariser 25.* cuda* + - httomo::tomophantom 3.1.4 + - astra-toolbox::astra-toolbox 2.4 + - cvxpy!=1.8.2 - python-wget - ipykernel - scikit-image From 9075db1ef62a27c1eb03968f22e7653975bfc296 Mon Sep 17 00:00:00 2001 From: lauramurgatroyd Date: Thu, 4 Jun 2026 12:48:40 +0000 Subject: [PATCH 2/3] Update envs for CIl-Demos --- env/cil_demos.yml | 12 ++++++------ env/cil_demos_cpu.yml | 10 +++++----- env/cil_test_demos.yml | 3 ++- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/env/cil_demos.yml b/env/cil_demos.yml index c0343af..a315644 100644 --- a/env/cil_demos.yml +++ b/env/cil_demos.yml @@ -4,12 +4,12 @@ channels: - https://software.repos.intel.com/python/conda dependencies: - python=3.12 - - ccpi::cil=25.0.0 - - numpy=1.26 - - astra-toolbox=2.1=cuda* - - ccpi::tigre=2.6 - - ccpi::ccpi-regulariser=24.0.1 - - ccpi::tomophantom=2.0.0 + - ccpi::cil=26.0.0 + - numpy=2.4 + - astra-toolbox::astra-toolbox=2.4 + - ccpi::tigre 3.1.3 + - ccpi::ccpi-regulariser 25.* cuda* + - httomo::tomophantom 3.1.4 - ipykernel - ipywidgets - scikit-image diff --git a/env/cil_demos_cpu.yml b/env/cil_demos_cpu.yml index 77f8989..cd9645b 100644 --- a/env/cil_demos_cpu.yml +++ b/env/cil_demos_cpu.yml @@ -4,11 +4,11 @@ channels: - https://software.repos.intel.com/python/conda dependencies: - python=3.12 - - ccpi::cil=25.0.0 - - numpy=1.26 - - conda-forge::astra-toolbox=2.1=py* - - ccpi::ccpi-regulariser=24.0.1 - - ccpi::tomophantom=2.0.0 + - ccpi::cil=26.0.0 + - numpy=2.4 + - astra-toolbox::astra-toolbox=2.4 + - ccpi::ccpi-regulariser 25.* py* + - httomo::tomophantom 3.1.4 - ipykernel - ipywidgets - scikit-image diff --git a/env/cil_test_demos.yml b/env/cil_test_demos.yml index 1d4323b..cab2889 100644 --- a/env/cil_test_demos.yml +++ b/env/cil_test_demos.yml @@ -7,7 +7,8 @@ dependencies: # base (vis. recipe/conda_build_config.yaml) - python >=3.10 - numpy >=1.23,<3 - - libgomp # [linux] + - libgomp # [linux] + - ccpi::cil=26.0.0 - ccpi::cil-data >=22 - ccpi::tigre 3.1.3 - ccpi::ccpi-regulariser 25.* cuda* From f341c1c8ec9f0e52ad4133b3a0a2bfb0dfd4b436 Mon Sep 17 00:00:00 2001 From: lauramurgatroyd Date: Thu, 4 Jun 2026 14:13:36 +0000 Subject: [PATCH 3/3] update comment --- env/cil_test_demos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env/cil_test_demos.yml b/env/cil_test_demos.yml index cab2889..0ae10c7 100644 --- a/env/cil_test_demos.yml +++ b/env/cil_test_demos.yml @@ -4,7 +4,7 @@ channels: - nvidia - https://software.repos.intel.com/python/conda dependencies: - # base (vis. recipe/conda_build_config.yaml) + # base (vis. CIL's recipe.yaml) - python >=3.10 - numpy >=1.23,<3 - libgomp # [linux]