-
Notifications
You must be signed in to change notification settings - Fork 44
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
CCPi Regularisation toolkit plugin: bugfix, docstrings, unittests, remove unused functions #971
Conversation
Please @epapoutsellis and/or @jakobsj can you advise on what to do with LLT_ROF? There are 2 regularisation parameters, and I currently have multiplied both of them. |
I think we delayed a lot adding tests for the regularisation toolkit. The only option easy and fast is via cvxpy. |
I don't know. Tests should be implemented in the CCPi Regularisation package. Some are already implemented, though they test each other or the C/OpenMP vs the CUDA code. But the tests you want to implement would be good to have anyway. Open an issue about it. |
An issue is already open for |
Actually we only use Also check if there are unittests for the plugin functionality. |
OK, I removed all the regularisng functions we do not use. I added unit tests to compare our plugin via Could you please confirm the defaults I chose? |
I also added f = alpha * FGP_TV() return a |
Jenkin's happy. |
Wrappers/Python/cil/plugins/ccpi_regularisation/functions/regularisers.py
Outdated
Show resolved
Hide resolved
Wrappers/Python/cil/plugins/ccpi_regularisation/functions/regularisers.py
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we need docstrings for the 4 we're wrapping, but that's not really the fault of this PR!
Wrappers/Python/cil/plugins/ccpi_regularisation/functions/regularisers.py
Outdated
Show resolved
Hide resolved
Wrappers/Python/cil/plugins/ccpi_regularisation/functions/regularisers.py
Outdated
Show resolved
Hide resolved
Wrappers/Python/cil/plugins/ccpi_regularisation/functions/regularisers.py
Outdated
Show resolved
Hide resolved
Wrappers/Python/cil/plugins/ccpi_regularisation/functions/regularisers.py
Outdated
Show resolved
Hide resolved
Wrappers/Python/cil/plugins/ccpi_regularisation/functions/regularisers.py
Show resolved
Hide resolved
Wrappers/Python/cil/plugins/ccpi_regularisation/functions/regularisers.py
Show resolved
Hide resolved
The default ratio for the TGV parameters should be |
Notice that I removed the |
Wrappers/Python/cil/plugins/ccpi_regularisation/functions/regularisers.py
Show resolved
Hide resolved
Wrappers/Python/cil/plugins/ccpi_regularisation/functions/regularisers.py
Outdated
Show resolved
Hide resolved
Wrappers/Python/cil/plugins/ccpi_regularisation/functions/regularisers.py
Outdated
Show resolved
Hide resolved
Wrappers/Python/cil/plugins/ccpi_regularisation/functions/regularisers.py
Outdated
Show resolved
Hide resolved
Jenkin's happy |
Wrappers/Python/cil/plugins/ccpi_regularisation/functions/regularisers.py
Show resolved
Hide resolved
Wrappers/Python/cil/plugins/ccpi_regularisation/functions/regularisers.py
Outdated
Show resolved
Hide resolved
Wrappers/Python/cil/plugins/ccpi_regularisation/functions/regularisers.py
Outdated
Show resolved
Hide resolved
Wrappers/Python/cil/plugins/ccpi_regularisation/functions/regularisers.py
Outdated
Show resolved
Hide resolved
Wrappers/Python/cil/plugins/ccpi_regularisation/functions/regularisers.py
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM happy to merge
closes #931