Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update TomoPhantom and CCPi regularisation tags #813

Merged
merged 30 commits into from
Sep 12, 2023
Merged

Update TomoPhantom and CCPi regularisation tags #813

Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
7b5e56f
Update TomoPhantom and CCPi regularisation tags
paskino Mar 15, 2023
3f18dca
Merge branch 'master' into update_ccpi_repos_tags
KrisThielemans May 24, 2023
dbca236
disable GPU tests
paskino Jul 20, 2023
21ce6de
[docker] remove obsolete copying of gadgetron.xml
KrisThielemans Jun 21, 2023
7e285c3
[GHA] clean-up some disk space first
KrisThielemans Jun 21, 2023
a9e5d55
[GHA] clear more docker images before saving
KrisThielemans Jun 22, 2023
d46a296
use environment.yml from SIRF-Exercise
paskino Jul 11, 2023
2e295c7
Update CHANGES.md
paskino Jul 12, 2023
42e5771
Use value of BUILD_TESTING_Gadgetron
KrisThielemans Jul 14, 2023
523d2b6
remove python requirement for patching Gadgetron
KrisThielemans Jul 14, 2023
053bdae
remove CMAKE_INCLUDE/LIBRARY_PATH in Gadgetron
KrisThielemans Jul 14, 2023
59c9f4b
fix mamba install
casperdcl Aug 9, 2023
5004488
suppress pip warning
casperdcl Aug 9, 2023
cfc92dd
Update version_config.cmake
paskino Jul 20, 2023
92e0da6
Update CHANGES.md
paskino Jul 20, 2023
998e31b
Update VM_version.txt
paskino Jul 20, 2023
fef68c6
Update Vagrantfile
paskino Jul 20, 2023
84798be
disable CCPi regularisation unittests of CIL
paskino Aug 10, 2023
2c1f7f8
disable build of CCPi Regularisation with CIL by default
paskino Aug 10, 2023
cdce881
[ci skip] Update CHANGES.md
paskino Aug 10, 2023
893a655
remove comments
paskino Aug 10, 2023
3fc68fa
[CMAKE] default DISABLE_MATLAB to ON
KrisThielemans Jul 21, 2023
160a02e
remove obsolete version restriction for SciPy
KrisThielemans Aug 15, 2023
cfa66b4
Add SIRF/CIL integration tests
paskino Sep 7, 2023
e04bd69
Update CIL version
paskino Sep 7, 2023
408a142
[ci skip] Update CHANGES.md
paskino Sep 7, 2023
4090d04
Update version_config.cmake
paskino Sep 7, 2023
68f5cec
use new CIL hash
paskino Sep 8, 2023
cc3ea5f
Merge branch 'master' into update_ccpi_repos_tags
paskino Sep 11, 2023
d0ed5b6
update changelog [ci skip]
paskino Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions SuperBuild/External_CCPi-Regularisation-Toolkit.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can't we discover if there's a GPU (I think we have a CMake variable for it)? If not, then this is fine.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have a variable ${${proj}_USE_CUDA} but it only detects if CUDA SDK is present not the availability of a GPU.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At any rate this should be handled upstream, TomographicImaging/CCPi-Regularisation-Toolkit#177

WORKING_DIRECTORY ${${proj}_SOURCE_DIR})

else()
Expand Down
4 changes: 2 additions & 2 deletions version_config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand All @@ -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)
Expand Down