From bcabd13d58ecaaa1ac17a7fdbd33fbe8b83b250c Mon Sep 17 00:00:00 2001 From: Edoardo Pasca <14138589+paskino@users.noreply.github.com> Date: Mon, 2 Feb 2026 11:28:43 +0000 Subject: [PATCH 1/2] add env files for local development update dxchange min version fix zenodo_get line --- env/cil_development.yml | 32 ++++++++++++++++++++++++++++++++ env/cil_development_osx.yml | 26 ++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 env/cil_development.yml create mode 100644 env/cil_development_osx.yml diff --git a/env/cil_development.yml b/env/cil_development.yml new file mode 100644 index 0000000..375cbd1 --- /dev/null +++ b/env/cil_development.yml @@ -0,0 +1,32 @@ +name: cil_test +channels: + - conda-forge + - https://software.repos.intel.com/python/conda +dependencies: + - python=3.12 + - pip + - numpy=1.26 + - scipy + - numba + - llvm-openmp + - matplotlib-base >=3.3.0 + - astra-toolbox=2.1=cuda* + - scikit-image + - dxchange >=0.2.1 + - olefile >=0.46 + - cvxpy + - zenodo_get >=1.6 + - h5py + - pillow + - pywavelets + - ccpi::cil-data >=22 + - ccpi::ccpi-regulariser=24.0.1 + - ccpi::tomophantom=2.0.0 + - ccpi::tigre=2.6 + - tqdm + - python-wget + - zenodo_get >=1.6 + - packaging + - pip: + - unittest-parametrize + \ No newline at end of file diff --git a/env/cil_development_osx.yml b/env/cil_development_osx.yml new file mode 100644 index 0000000..cfd2de6 --- /dev/null +++ b/env/cil_development_osx.yml @@ -0,0 +1,26 @@ +name: cil_test +channels: + - conda-forge + - https://software.repos.intel.com/python/conda +dependencies: + - python=3.12 + - pip + - numpy=1.26 + - numba + - llvm-openmp + - matplotlib-base >=3.3.0 + - astra-toolbox=2.1=py* + - scikit-image + - dxchange >=0.2.1 + - olefile >=0.46 + - cvxpy + - zenodo_get >=1.6 + - h5py + - pillow + - pywavelets + - ccpi::cil-data >=22 + - tqdm + - python-wget + - pip: + - unittest-parametrize + \ No newline at end of file From 8a8d870fb251ccc39af150d3f3afb4fd0219437b Mon Sep 17 00:00:00 2001 From: Edoardo Pasca <14138589+paskino@users.noreply.github.com> Date: Mon, 2 Feb 2026 11:50:15 +0000 Subject: [PATCH 2/2] added IPP --- env/cil_development.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/env/cil_development.yml b/env/cil_development.yml index 375cbd1..fb462f5 100644 --- a/env/cil_development.yml +++ b/env/cil_development.yml @@ -9,6 +9,9 @@ dependencies: - scipy - numba - llvm-openmp + - ipp-include 2021.12 + - ipp-devel 2021.12 + - ipp 2021.12 - matplotlib-base >=3.3.0 - astra-toolbox=2.1=cuda* - scikit-image @@ -27,6 +30,7 @@ dependencies: - python-wget - zenodo_get >=1.6 - packaging + - ipywidgets - pip: - unittest-parametrize \ No newline at end of file