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 159a27b..0ae10c7 100644 --- a/env/cil_test_demos.yml +++ b/env/cil_test_demos.yml @@ -4,17 +4,17 @@ channels: - nvidia - https://software.repos.intel.com/python/conda dependencies: - # base (vis. recipe/conda_build_config.yaml) - - python >=3.10,<3.13 - - numpy >=1.23,<2 - - libgomp # [linux] - - ccpi::cil=25.0.0 + # base (vis. CIL's recipe.yaml) + - python >=3.10 + - numpy >=1.23,<3 + - libgomp # [linux] + - ccpi::cil=26.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