[SyneRBI/SIRF-SuperBuild] update parallelproj to 1.9.0 (and require it) (PR #906)
Kris Thielemans
You can view, comment on, or merge this pull request online at:
https://github.com/SyneRBI/SIRF-SuperBuild/pull/906
Commit Summary
- 542823b update parallelproj to 1.9.0 (and require it)
File Changes
(2 files)
- M CHANGES.md (4)
- M version_config.cmake (4)
Patch Links:
- https://github.com/SyneRBI/SIRF-SuperBuild/pull/906.patch
- https://github.com/SyneRBI/SIRF-SuperBuild/pull/906.diff
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Kris Thielemans
Failures due to issues unrelated to this PR:
SyneRBI/SIRF#1267
TomographicImaging/CIL#1837
TomographicImaging/CIL#1838
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Kris Thielemans
@KrisThielemans pushed 2 commits.
- fc53607 add extra conda dependencies for convenience
- ec206bc update SIRF, STIR, CIL and parallelproj
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Kris Thielemans
We need to update SIRF and CIL for numpy 2.0 issues. Can just as well do STIR.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl approved this pull request.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Kris Thielemans
2 problems resolved, but CIL_FRAMEWORK_TESTS_6 still fails due to TomographicImaging/CIL#1838
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl commented on this pull request.
In CHANGES.md:
> @@ -1,5 +1,12 @@ # ChangeLog +## v3.8.0 +- Updated Versions: + - SIRF: 81f5c0a7878ed60577ee526abf8d0cd2b64e334f (20 June 2024) + - STIR: 12bfa873522653936a4818e9bad9b9da41f11706 (20 June 2024) + - parallelproj: 1.9.1 (contains a fix for truncation of the TOF kernel) + - CIL: 8d111a37cec72756d4b8d80f526ff22333019037 (20 June 2024, numpy 2.0 fix)
should be updated after TomographicImaging/CIL#1844
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl commented on this pull request.
> @@ -161,7 +161,7 @@ set(DEFAULT_JSON_TAG v3.11.3) # CCPi CIL # minimum supported version of CIL supported is > 22.1.0 or from commit a6062410028c9872c5b355be40b96ed1497fed2a set(DEFAULT_CIL_URL https://github.com/TomographicImaging/CIL) -set(DEFAULT_CIL_TAG ccf17f393ba911d13b74f2327779dde030098fe6) # 28 May 2024 +set(DEFAULT_CIL_TAG 8d111a37cec72756d4b8d80f526ff22333019037) # 20 June 2024 (numpy 2.0 fix)
should be updated after TomographicImaging/CIL#1844
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl commented on this pull request.
In CHANGES.md:
> @@ -1,5 +1,12 @@ # ChangeLog +## v3.8.0 +- Updated Versions: + - SIRF: 81f5c0a7878ed60577ee526abf8d0cd2b64e334f (20 June 2024) + - STIR: 12bfa873522653936a4818e9bad9b9da41f11706 (20 June 2024) + - parallelproj: 1.9.1 (contains a fix for truncation of the TOF kernel) + - CIL: 8d111a37cec72756d4b8d80f526ff22333019037 (20 June 2024, numpy 2.0 fix)
- - CIL: 8d111a37cec72756d4b8d80f526ff22333019037 (20 June 2024, numpy 2.0 fix) + - CIL: 8449f663bb585c3f5744a7aff78937b6f12d7e20 (21 June 2024)
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl commented on this pull request.
> @@ -161,7 +161,7 @@ set(DEFAULT_JSON_TAG v3.11.3) # CCPi CIL # minimum supported version of CIL supported is > 22.1.0 or from commit a6062410028c9872c5b355be40b96ed1497fed2a set(DEFAULT_CIL_URL https://github.com/TomographicImaging/CIL) -set(DEFAULT_CIL_TAG ccf17f393ba911d13b74f2327779dde030098fe6) # 28 May 2024 +set(DEFAULT_CIL_TAG 8d111a37cec72756d4b8d80f526ff22333019037) # 20 June 2024 (numpy 2.0 fix)
-set(DEFAULT_CIL_TAG 8d111a37cec72756d4b8d80f526ff22333019037) # 20 June 2024 (numpy 2.0 fix) +set(DEFAULT_CIL_TAG 8449f663bb585c3f5744a7aff78937b6f12d7e20) # 21 June 2024
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl pushed 1 commit.
- 7f3ba73 bump CIL again
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Kris Thielemans
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.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Kris Thielemans
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Kris Thielemans
I'll merge this anyway, as it fixes other problems.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Kris Thielemans
Merged #906 into master.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.