From ccd116c5889c38cf2fe775259dce2f0e2ff4b0a3 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Thu, 7 Aug 2025 18:16:23 +0100 Subject: [PATCH 1/3] conda: fix compiler --- recipe/meta.yaml | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ab544503e5..2d12a30f1e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -16,6 +16,8 @@ build: test: requires: + - python + - pip - python-wget - cvxpy # [linux] - scikit-image @@ -32,45 +34,37 @@ test: commands: - pip install unittest-parametrize - - python -m unittest discover -v -s Wrappers/Python/test # [win] - - python -m unittest discover -s Wrappers/Python/test -v # [not win] - + - python -m unittest discover -v -s Wrappers/Python/test requirements: build: - - python - - pip - - setuptools >=64 - - setuptools_scm >=8 - - cmake # [not osx] - - cmake >=3.16 # [osx] - - libgcc-ng # [linux] - - libstdcxx-ng # [linux] - - _openmp_mutex # [linux] - - openmp # [osx] - - vc 14 # [win] - - ninja # [not win] + - cmake >=3.16 + - ninja + - {{ compiler('cxx') }} + + host: + - llvm-openmp - ipp-include {{ ipp_version }} - ipp-devel {{ ipp_version }} - ipp {{ ipp_version }} + - python >=3.10,<3.13 + - pip + - setuptools >=64 + - setuptools_scm >=8 - scikit-build-core >=0.10 run: - python - - numpy >=1.23, <2.0.0 + - llvm-openmp + - {{ pin_compatible('ipp', min_pin='x.x', max_pin='x.x') }} + - numpy >=1.23,<2 - scipy >=1.4.0 - h5py - pillow - - libgcc-ng # [linux] - - libstdcxx-ng # [linux] - - _openmp_mutex # [linux] - - openmp # [osx] - - vc 14 # [win] - dxchange - olefile >=0.46 - pywavelets - cil-data >=22 - - {{ pin_compatible('ipp', min_pin='x.x', max_pin='x.x') }} - tqdm - numba From a61e6fef92d338300321308a9614b122d6598ca0 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Thu, 7 Aug 2025 20:37:35 +0100 Subject: [PATCH 2/3] sync scripts <= recipe --- scripts/create_local_env_for_cil_development.sh | 1 + scripts/requirements-test-windows.yml | 7 ++++--- scripts/requirements-test.yml | 10 ++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/create_local_env_for_cil_development.sh b/scripts/create_local_env_for_cil_development.sh index 6159d14e0e..36c473b381 100755 --- a/scripts/create_local_env_for_cil_development.sh +++ b/scripts/create_local_env_for_cil_development.sh @@ -51,6 +51,7 @@ conda_args=(create --name="$name" cmake'>=3.16' dxchange h5py + llvm-openmp ipp'>=2021.10' ipp-devel'>=2021.10' ipp-include'>=2021.10' diff --git a/scripts/requirements-test-windows.yml b/scripts/requirements-test-windows.yml index c563134a63..4f26f58ae5 100644 --- a/scripts/requirements-test-windows.yml +++ b/scripts/requirements-test-windows.yml @@ -18,8 +18,9 @@ channels: - https://software.repos.intel.com/python/conda dependencies: # base (vis. recipe/conda_build_config.yaml) - - python >=3.10 - - numpy >=1.23 + - python >=3.10,<3.13 + - numpy >=1.23,<2 + - llvm-openmp - ccpi::cil-data - ccpi::tigre=2.6 - ccpi::ccpi-regulariser=24.0.1 @@ -30,7 +31,7 @@ dependencies: - scikit-image - packaging - cmake >=3.16 - - setuptools <71 + - setuptools >=64 - ipp-include=2021.12 - ipp-devel=2021.12 - ipp=2021.12 diff --git a/scripts/requirements-test.yml b/scripts/requirements-test.yml index 9abef82307..2c5f24dd7d 100644 --- a/scripts/requirements-test.yml +++ b/scripts/requirements-test.yml @@ -18,8 +18,9 @@ channels: - https://software.repos.intel.com/python/conda dependencies: # base (vis. recipe/conda_build_config.yaml) - - python >=3.10 - - numpy >=1.23 + - python >=3.10,<3.13 + - numpy >=1.23,<2 + - llvm-openmp - ccpi::cil-data - ccpi::tigre=2.6 - ccpi::ccpi-regulariser=24.0.1 @@ -30,7 +31,7 @@ dependencies: - scikit-image - packaging - cmake >=3.16 - - setuptools <71 + - setuptools >=64 - ipp-include=2021.12 - ipp-devel=2021.12 - ipp=2021.12 @@ -39,9 +40,6 @@ dependencies: - matplotlib-base - h5py - pillow - - libgcc-ng # [linux] - - libstdcxx-ng # [linux] - - _openmp_mutex # [linux] - dxchange - olefile - pywavelets From ebb375ac23611cd19bf323f9b2d1055739a8e575 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Fri, 8 Aug 2025 23:37:47 +0100 Subject: [PATCH 3/3] a little more tidy --- recipe/conda_build_config.yaml | 3 --- recipe/meta.yaml | 24 +++++++++--------------- scripts/requirements-test-windows.yml | 23 +++++++++++------------ scripts/requirements-test.yml | 24 ++++++++++++------------ 4 files changed, 32 insertions(+), 42 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 5b2e54387f..44de043847 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -15,13 +15,10 @@ # Authors: # CIL Developers, listed at: https://github.com/TomographicImaging/CIL/blob/master/NOTICE.txt -# Tomas Kulhanek (STFC) -#creates pairs of versions using zip_keys, lists must be the same length ipp_version: - '2021.12' python: - 3.10 - 3.11 - 3.12 - diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2d12a30f1e..79c36e47da 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,11 +8,6 @@ source: build: preserve_egg_dir: False number: {{ GIT_DESCRIBE_NUMBER }} - missing_dso_whitelist: - - /lib64/libc.so.6 # [linux] - - /lib64/libm.so.6 # [linux] - - /lib64/libpthread.so.0 # [linux] - - /lib64/ld-linux-x86-64.so.2 # [linux] test: requires: @@ -21,12 +16,12 @@ test: - python-wget - cvxpy # [linux] - scikit-image - - tomophantom=2.0.0 # [linux] - - tigre=2.6 + - tomophantom 2.0.0 # [linux] + - tigre 2.6 - packaging - - ccpi-regulariser=24.0.1 # [not osx] - - astra-toolbox=2.1=cuda* # [not osx] - - matplotlib-base >=3.3.0 + - ccpi-regulariser 24.0.1 # [not osx] + - astra-toolbox 2.1 cuda* # [not osx] + - matplotlib-base >=3.3 - zenodo_get >=1.6 source_files: @@ -43,10 +38,10 @@ requirements: - {{ compiler('cxx') }} host: - - llvm-openmp + - libgomp # [linux] + - llvm-openmp # [osx] - ipp-include {{ ipp_version }} - ipp-devel {{ ipp_version }} - - ipp {{ ipp_version }} - python >=3.10,<3.13 - pip - setuptools >=64 @@ -55,10 +50,9 @@ requirements: run: - python - - llvm-openmp - - {{ pin_compatible('ipp', min_pin='x.x', max_pin='x.x') }} + - ipp {{ ipp_version }} - numpy >=1.23,<2 - - scipy >=1.4.0 + - scipy >=1.4 - h5py - pillow - dxchange diff --git a/scripts/requirements-test-windows.yml b/scripts/requirements-test-windows.yml index 4f26f58ae5..c317da5368 100644 --- a/scripts/requirements-test-windows.yml +++ b/scripts/requirements-test-windows.yml @@ -20,28 +20,27 @@ dependencies: # base (vis. recipe/conda_build_config.yaml) - python >=3.10,<3.13 - numpy >=1.23,<2 - - llvm-openmp - - ccpi::cil-data - - ccpi::tigre=2.6 - - ccpi::ccpi-regulariser=24.0.1 - - ccpi::tomophantom=2.0.0 - - astra-toolbox=2.1=cuda* + - 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 - python-wget - scikit-image - packaging - cmake >=3.16 - setuptools >=64 - - ipp-include=2021.12 - - ipp-devel=2021.12 - - ipp=2021.12 + - ipp-include 2021.12 + - ipp-devel 2021.12 + - ipp 2021.12 - ipywidgets - - scipy - - matplotlib-base + - scipy >=1.4 + - matplotlib-base >=3.3 - h5py - pillow - dxchange - - olefile + - olefile >=0.46 - pywavelets - numba - tqdm diff --git a/scripts/requirements-test.yml b/scripts/requirements-test.yml index 2c5f24dd7d..03adbe1972 100644 --- a/scripts/requirements-test.yml +++ b/scripts/requirements-test.yml @@ -20,28 +20,28 @@ dependencies: # base (vis. recipe/conda_build_config.yaml) - python >=3.10,<3.13 - numpy >=1.23,<2 - - llvm-openmp - - ccpi::cil-data - - ccpi::tigre=2.6 - - ccpi::ccpi-regulariser=24.0.1 - - ccpi::tomophantom=2.0.0 - - astra-toolbox=2.1=cuda* + - libgomp # [linux] + - 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 - python-wget - scikit-image - packaging - cmake >=3.16 - setuptools >=64 - - ipp-include=2021.12 - - ipp-devel=2021.12 - - ipp=2021.12 + - ipp-include 2021.12 + - ipp-devel 2021.12 + - ipp 2021.12 - ipywidgets - - scipy - - matplotlib-base + - scipy >=1.4 + - matplotlib-base >=3.3 - h5py - pillow - dxchange - - olefile + - olefile >=0.46 - pywavelets - numba - tqdm