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 parallelproj to 1.9.0 (and require it), as well as CIL, SIRF, STIR #906

Merged
merged 4 commits into from
Jun 21, 2024
Merged

update parallelproj to 1.9.0 (and require it), as well as CIL, SIRF, STIR #906

merged 4 commits into from
Jun 21, 2024

Conversation

KrisThielemans
Copy link
Member

@KrisThielemans KrisThielemans added this to the v3.8 milestone Jun 18, 2024
@KrisThielemans
Copy link
Member Author

Failures due to issues unrelated to this PR:
SyneRBI/SIRF#1267
TomographicImaging/CIL#1837
TomographicImaging/CIL#1838

@KrisThielemans KrisThielemans changed the title update parallelproj to 1.9.0 (and require it) update parallelproj to 1.9.0 (and require it), as well as CIL, SIRF, STIR Jun 20, 2024
@KrisThielemans
Copy link
Member Author

We need to update SIRF and CIL for numpy 2.0 issues. Can just as well do STIR.

@KrisThielemans
Copy link
Member Author

2 problems resolved, but CIL_FRAMEWORK_TESTS_6 still fails due to TomographicImaging/CIL#1838

@KrisThielemans KrisThielemans mentioned this pull request Jun 21, 2024
Draft
casperdcl
casperdcl reviewed Jun 21, 2024
View reviewed changes
CHANGES.md Outdated Show resolved Hide resolved
casperdcl
casperdcl reviewed Jun 21, 2024
View reviewed changes
version_config.cmake Outdated Show resolved Hide resolved
@KrisThielemans
Copy link
Member Author

Some failures due to Zenodo time-out. Docker jobs

ERROR: test_SIRF (unittest.loader._FailedTest)
----------------------------------------------------------------------
ImportError: Failed to import test module: test_SIRF
Traceback (most recent call last):
  File "/opt/conda/lib/python3.10/unittest/loader.py", line 436, in _find_test_path
    module = self._get_module_from_name(name)
  File "/opt/conda/lib/python3.10/unittest/loader.py", line 377, in _get_module_from_name
    __import__(name)
  File "/home/jovyan/cil_sirf_test/test_SIRF.py", line 29, in <module>
    from cil.optimisation.utilities import AdaptiveSensitivity
ImportError: cannot import name 'AdaptiveSensitivity' from 'cil.optimisation.utilities' (/opt/conda/lib/python3.10/site-packages/cil/optimisation/utilities/__init__.py)

not sure if this is the most recent though.

@KrisThielemans KrisThielemans mentioned this pull request Jun 21, 2024
Closed
@KrisThielemans
Copy link
Member Author

TomographicImaging/CIL#1846

@KrisThielemans
Copy link
Member Author

I'll merge this anyway, as it fixes other problems.

@KrisThielemans KrisThielemans merged commit f371793 into SyneRBI:master Jun 21, 2024
6 of 8 checks passed
@KrisThielemans KrisThielemans deleted the parallelproj1.9.0 branch June 21, 2024 19:40
@KrisThielemans KrisThielemans mentioned this pull request Jun 22, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@casperdcl casperdcl casperdcl approved these changes

Assignees

@KrisThielemans KrisThielemans

Labels
bug enhancement upstream_problem
Projects
None yet
Milestone
v3.8
Development

Successfully merging this pull request may close these issues.
2 participants
@KrisThielemans @casperdcl