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

Commits on Mar 15, 2023

  1. Update TomoPhantom and CCPi regularisation tags 

    closes #812
    @paskino
    paskino authored Mar 15, 2023
    Configuration menu
    Copy the full SHA
    7b5e56f View commit details
    Browse the repository at this point in the history

Commits on May 24, 2023

  1. Merge branch 'master' into update_ccpi_repos_tags

    @KrisThielemans
    KrisThielemans committed May 24, 2023
    Configuration menu
    Copy the full SHA
    3f18dca View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. disable GPU tests

    @paskino
    paskino authored Jul 20, 2023
    Configuration menu
    Copy the full SHA
    dbca236 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. [docker] remove obsolete copying of gadgetron.xml 

    Fixes #815
    @KrisThielemans @paskino
    KrisThielemans authored and paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    21ce6de View commit details
    Browse the repository at this point in the history

  2. [GHA] clean-up some disk space first

    @KrisThielemans @paskino
    KrisThielemans authored and paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    7e285c3 View commit details
    Browse the repository at this point in the history

  3. [GHA] clear more docker images before saving

    @KrisThielemans @paskino
    KrisThielemans authored and paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    a9e5d55 View commit details
    Browse the repository at this point in the history

  4. use environment.yml from SIRF-Exercise 

    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
    paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    d46a296 View commit details
    Browse the repository at this point in the history

  5. Update CHANGES.md

    @paskino
    paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    2e295c7 View commit details
    Browse the repository at this point in the history

  6. Use value of BUILD_TESTING_Gadgetron 

    we forced BUILD_TESTING=ON for some reason. Now we use the value
of our own CMake variable

Fixes #824
    @KrisThielemans @paskino
    KrisThielemans authored and paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    42e5771 View commit details
    Browse the repository at this point in the history

  7. remove python requirement for patching Gadgetron 

    we're no longer patching it
    @KrisThielemans @paskino
    KrisThielemans authored and paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    523d2b6 View commit details
    Browse the repository at this point in the history

  8. remove CMAKE_INCLUDE/LIBRARY_PATH in Gadgetron 

    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
    @KrisThielemans @paskino
    KrisThielemans authored and paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    053bdae View commit details
    Browse the repository at this point in the history

  9. fix mamba install 

    - fixes #826
    @casperdcl @paskino
    casperdcl authored and paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    59c9f4b View commit details
    Browse the repository at this point in the history

  10. suppress pip warning

    @casperdcl @paskino
    casperdcl authored and paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    5004488 View commit details
    Browse the repository at this point in the history

  11. Update version_config.cmake

    @paskino
    paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    cfc92dd View commit details
    Browse the repository at this point in the history

  12. Update CHANGES.md

    @paskino
    paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    92e0da6 View commit details
    Browse the repository at this point in the history

  13. Update VM_version.txt

    @paskino
    paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    998e31b View commit details
    Browse the repository at this point in the history

  14. Update Vagrantfile

    @paskino
    paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    fef68c6 View commit details
    Browse the repository at this point in the history

  15. disable CCPi regularisation unittests of CIL

    @paskino
    paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    84798be View commit details
    Browse the repository at this point in the history

  16. disable build of CCPi Regularisation with CIL by default

    @paskino
    paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    2c1f7f8 View commit details
    Browse the repository at this point in the history

  17. [ci skip] Update CHANGES.md

    @paskino
    paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    cdce881 View commit details
    Browse the repository at this point in the history

  18. remove comments

    @paskino
    paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    893a655 View commit details
    Browse the repository at this point in the history

  19. [CMAKE] default DISABLE_MATLAB to ON 

    SIRF Matlab support is out-of-date and could generate conflicts with Python shared libraries.
    @KrisThielemans @paskino
    KrisThielemans authored and paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    3fc68fa View commit details
    Browse the repository at this point in the history

  20. remove obsolete version restriction for SciPy

    @KrisThielemans @paskino
    KrisThielemans authored and paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    160a02e View commit details
    Browse the repository at this point in the history

  21. Add SIRF/CIL integration tests

    @paskino
    paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    cfa66b4 View commit details
    Browse the repository at this point in the history

  22. Update CIL version

    @paskino
    paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    e04bd69 View commit details
    Browse the repository at this point in the history

  23. [ci skip] Update CHANGES.md

    @paskino
    paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    408a142 View commit details
    Browse the repository at this point in the history

  24. Update version_config.cmake

    @paskino
    paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    4090d04 View commit details
    Browse the repository at this point in the history

  25. use new CIL hash

    @paskino
    paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    68f5cec View commit details
    Browse the repository at this point in the history

  26. Merge branch 'master' into update_ccpi_repos_tags

    @paskino
    paskino committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    cc3ea5f View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

  1. update changelog [ci skip]

    @paskino
    paskino committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    d0ed5b6 View commit details
    Browse the repository at this point in the history