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.

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

Update version_config.cmake and others files for release #829

Merged
merged 8 commits into from
Aug 13, 2023

Conversation

paskino
Copy link
Contributor

@paskino paskino commented Jul 20, 2023

updates for release 3.5.0

@paskino paskino changed the title Update version_config.cmake Update version_config.cmake and others files for release Jul 20, 2023
@KrisThielemans
Copy link
Member

more CCPi regulariser trouble sadly

    from ccpi.filters.regularisers import ROF_TV, FGP_TV, PD_TV, SB_TV, TGV, LLT_ROF, FGP_dTV, NDF, Diff4th
  File "/home/runner/install/python/ccpi/filters/regularisers.py", line 5, in <module>
    from ccpi.filters.cpu_regularisers import TV_ROF_CPU, TV_FGP_CPU, TV_PD_CPU, TV_SB_CPU, dTV_FGP_CPU, TNV_CPU, NDF_CPU, Diff4th_CPU, TGV_CPU, LLT_ROF_CPU, PATCHSEL_CPU, NLTV_CPU
ImportError: /home/runner/install/python/ccpi/filters/cpu_regularisers.cpython-310-x86_64-linux-gnu.so: undefined symbol: _Z14SB_TV_CPU_mainPfS_S_fifiiii

Docker builds still stuck due to #826

@paskino
Copy link
Contributor Author

paskino commented Jul 23, 2023

I'm not sure where this bug comes from, it used to work earlier and I am tempted to remove the unit tests for the release and open an issue for next release.

I opened an issue on the TomographicImaging/CCPi-Regularisation-Toolkit#177 repo.

@paskino paskino mentioned this pull request Aug 10, 2023
3 tasks
@paskino paskino marked this pull request as ready for review August 10, 2023 08:37
@paskino
Copy link
Contributor Author

paskino commented Aug 10, 2023

@KrisThielemans @evgueni-ovtchinnikov @casperdcl now that the tests are all green (see 6e0b7e3), I suggest to merge this PR and tag the SuperBuild. We should then tackle #832 in a later release.

This PR removes the CCPi Regularisation from the packages built with CIL.

Copy link
Member

@casperdcl casperdcl left a comment

Choose a reason for hiding this comment

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

lgtm

@KrisThielemans
Copy link
Member

This PR removes the CCPi Regularisation from the packages built with CIL.

why? I thought you were just going to disable the tests. If you need to disable the build, then #832 needs to be adjusted.

I suggest to merge this PR and tag the SuperBuild.

Please merge #830 after this PR. It avoids conflicts for people who have MATLAB installed.

@paskino
Copy link
Contributor Author

paskino commented Aug 13, 2023

The unit test fails because of an import error. I didn't understand why this happens in the GitHub runner. I thought to outright remove the software instead of packaging it with potential import errors.

@KrisThielemans
Copy link
Member

ok

@KrisThielemans KrisThielemans merged commit bfc474a into master Aug 13, 2023
6 of 11 checks passed
@KrisThielemans KrisThielemans deleted the pre_3.5.0 branch August 13, 2023 09:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants