diff --git a/CHANGES.md b/CHANGES.md index bb8829c9..d7064056 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -23,6 +23,8 @@ - ISMRMRD: v1.13.2 - SIRF: v3.5.0 - CIL: 0ba2f8e2935db66ec3dfe8c88e407e8d0eb5609f + - CCPi-Regularisation: v22.0.0 + - TomoPhantom: v2.0.0 ## v3.4.0 - Removed CIL-ASTRA as it has been merged into CIL code base. diff --git a/SuperBuild/External_CCPi-Regularisation-Toolkit.cmake b/SuperBuild/External_CCPi-Regularisation-Toolkit.cmake index d3643c5b..2124a360 100644 --- a/SuperBuild/External_CCPi-Regularisation-Toolkit.cmake +++ b/SuperBuild/External_CCPi-Regularisation-Toolkit.cmake @@ -98,8 +98,8 @@ if(NOT ( DEFINED "USE_SYSTEM_${externalProjName}" AND "${USE_SYSTEM_${externalPr set(${proj}_ROOT ${${proj}_SOURCE_DIR}) set(${proj}_INCLUDE_DIR ${${proj}_SOURCE_DIR}) - add_test(NAME CIL_REGULARISATION_TEST_1 - COMMAND ${PYTHON_EXECUTABLE} -m unittest discover -s test -p test_*.py + add_test(NAME CIL_REGULARISATION_TEST_CPU + COMMAND ${PYTHON_EXECUTABLE} -m unittest discover -s test -p test_CPU_*.py WORKING_DIRECTORY ${${proj}_SOURCE_DIR}) else() diff --git a/version_config.cmake b/version_config.cmake index 4d2ccf35..7c98925a 100644 --- a/version_config.cmake +++ b/version_config.cmake @@ -124,7 +124,7 @@ set(DEFAULT_astra-toolbox_TAG origin/master) ## TomoPhantom set(DEFAULT_TomoPhantom_URL https://github.com/dkazanc/TomoPhantom ) -set(DEFAULT_TomoPhantom_TAG v1.4) +set(DEFAULT_TomoPhantom_TAG v2.0.0) ## NiftyPET set(DEFAULT_NiftyPET_URL https://github.com/pjmark/NIPET ) @@ -151,7 +151,7 @@ set(DEFAULT_CIL_URL https://github.com/TomographicImaging/CIL.git) set(DEFAULT_CIL_TAG 0ba2f8e2935db66ec3dfe8c88e407e8d0eb5609f) set(DEFAULT_CCPi-Regularisation-Toolkit_URL https://github.com/vais-ral/CCPi-Regularisation-Toolkit.git) -set(DEFAULT_CCPi-Regularisation-Toolkit_TAG "v21.0.0") +set(DEFAULT_CCPi-Regularisation-Toolkit_TAG "v22.0.0") # CERN ROOT set(DEFAULT_ROOT_URL https://github.com/root-project/root)