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

merged 30 commits into from
Sep 12, 2023

Conversation

paskino
Copy link
Contributor

@paskino paskino commented Mar 15, 2023

closes #812

@KrisThielemans
Copy link
Member

I've merged master. Possibly the tags are again already out-of-date of course.

KrisThielemans
KrisThielemans requested changes May 24, 2023
View reviewed changes
Copy link
Member

@KrisThielemans KrisThielemans left a comment

Choose a reason for hiding this comment

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

please update CHANGES.md

@KrisThielemans
Copy link
Member

CIL_regularisation tests failing with stuff like

  File "/home/runner/work/SIRF-SuperBuild/SIRF-SuperBuild/build/sources/CCPi-Regularisation-Toolkit/test/test_run_test.py", line 389, in test_TGV_CPU_vs_GPU
    (tgv_gpu, info_vec_gpu) = TGV(pars['input'],
  File "/home/runner/install/python/ccpi/filters/regularisers.py", line 117, in TGV
    return TGV_GPU(inputData,
NameError: name 'TGV_GPU' is not defined

@KrisThielemans KrisThielemans added this to the v3.6 milestone Jun 8, 2023
KrisThielemans
KrisThielemans reviewed Jul 21, 2023
View reviewed changes
SuperBuild/External_CCPi-Regularisation-Toolkit.cmake
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

KrisThielemans and others added 22 commits September 11, 2023 16:59
@KrisThielemans @paskino
[docker] remove obsolete copying of gadgetron.xml
21ce6de 
Fixes #815
@KrisThielemans @paskino
[GHA] clean-up some disk space first
7e285c3
@KrisThielemans @paskino
[GHA] clear more docker images before saving
a9e5d55
@paskino
use environment.yml from SIRF-Exercise
d46a296 
Uses environment.yml from SIRF-Exercises if using conda, and it is found. Defaults to requirements.txt if not found or not using conda.
@paskino
Update CHANGES.md
2e295c7
@KrisThielemans @paskino
Use value of BUILD_TESTING_Gadgetron
42e5771 
we forced BUILD_TESTING=ON for some reason. Now we use the value
of our own CMake variable

Fixes #824
@KrisThielemans @paskino
remove python requirement for patching Gadgetron
523d2b6 
we're no longer patching it
@KrisThielemans @paskino
remove CMAKE_INCLUDE/LIBRARY_PATH in Gadgetron
053bdae 
should never have been here. The CMAKE_INCLUDE_PATH should
not point to CMAKE_INSTALL_PREFIX/include, as it should be
used for CMake files
@casperdcl @paskino
fix mamba install
59c9f4b 
- fixes #826
@casperdcl @paskino
suppress pip warning
5004488
@paskino
Update version_config.cmake
cfc92dd
@paskino
Update CHANGES.md
92e0da6
@paskino
Update VM_version.txt
998e31b
@paskino
Update Vagrantfile
fef68c6
@paskino
disable CCPi regularisation unittests of CIL
84798be
@paskino
disable build of CCPi Regularisation with CIL by default
2c1f7f8
@paskino
[ci skip] Update CHANGES.md
cdce881
@paskino
remove comments
893a655
@KrisThielemans @paskino
[CMAKE] default DISABLE_MATLAB to ON
3fc68fa 
SIRF Matlab support is out-of-date and could generate conflicts with Python shared libraries.
@KrisThielemans @paskino
remove obsolete version restriction for SciPy
160a02e
@paskino
Add SIRF/CIL integration tests
cfa66b4
@paskino
Update CIL version
e04bd69
KrisThielemans
KrisThielemans approved these changes Sep 11, 2023
View reviewed changes
Copy link
Member

@KrisThielemans KrisThielemans left a comment

Choose a reason for hiding this comment

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

let's squash-merge this one. No idea why there are so many commits here!

@paskino paskino merged commit d858fda into master Sep 12, 2023
@paskino paskino deleted the update_ccpi_repos_tags branch September 12, 2023 08:23
casperdcl pushed a commit that referenced this pull request Oct 11, 2023
@paskino @casperdcl
Update TomoPhantom and CCPi regularisation tags (#813)
0155e30 
* Update TomoPhantom and CCPi regularisation tags
closes #812
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KrisThielemans KrisThielemans KrisThielemans approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v3.6
Development

Successfully merging this pull request may close these issues.

Update CCPi Regularisation and TomoPhantom tags
3 participants
@paskino @KrisThielemans @casperdcl