From 02d30f86dccbfe7d0de1c2bd55a8a6e0deb9c5ee Mon Sep 17 00:00:00 2001 From: Edoardo Pasca Date: Mon, 1 Aug 2022 14:48:12 +0100 Subject: [PATCH] Set CIL version to commit before CIL-ASTRA merge (#749) * Set CIL version to commit before CIL-ASTRA merge CIL-ASTRA has been merged (and patched) into CIL code (after a lengthy relicensing procedure), so now, the SuperBuild installs CIL-ASTRA master on top of the right master CIL code, resulting in the error. https://github.com/SyneRBI/SIRF-SuperBuild/runs/7601445525?check_suite_focus=true * add numba dependency --- CHANGES.md | 2 ++ docker/requirements.txt | 1 + docker/requirements_conda_forge.txt | 1 + version_config.cmake | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index a980a666..248ffb6e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,11 +15,13 @@ - VM: - set BUILD_CIL=ON - add CITATION.cff (and remove .zenodo.json) +- added numba as dependency in docker files - updated versions: - SIRF: 3.3.0 - STIR: 5.0.2 - parallelproj: v0.8 - CCPi Regularisation: v21.0.0 + - CIL: v21.4.1 (CIL devel build to commit hash ef66083de231492f9571f5512b33068f6950e877 ) ## v3.2.0 diff --git a/docker/requirements.txt b/docker/requirements.txt index f6d7c517..92d45576 100644 --- a/docker/requirements.txt +++ b/docker/requirements.txt @@ -10,6 +10,7 @@ wget # CIL six # CIL olefile # CIL git+https://github.com/data-exchange/dxchange.git # CIL +numba # CIL pandas tifffile nibabel diff --git a/docker/requirements_conda_forge.txt b/docker/requirements_conda_forge.txt index 8a048aad..8aaf1e61 100644 --- a/docker/requirements_conda_forge.txt +++ b/docker/requirements_conda_forge.txt @@ -8,3 +8,4 @@ tigre tomophantom=1.4.10 python-wget dxchange +numba diff --git a/version_config.cmake b/version_config.cmake index 3529b93b..abcae7ff 100644 --- a/version_config.cmake +++ b/version_config.cmake @@ -200,7 +200,7 @@ if (DEVEL_BUILD) # CCPi CIL set(DEFAULT_CIL_URL https://github.com/TomographicImaging/CIL.git) - set(DEFAULT_CIL_TAG origin/master) + set(DEFAULT_CIL_TAG ef66083de231492f9571f5512b33068f6950e877 ) set(DEFAULT_CIL-ASTRA_URL https://github.com/TomographicImaging/CIL-ASTRA.git) set(DEFAULT_CIL-ASTRA_TAG origin/master)