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

Example script ct_svmbir_ppp_bm3d_admm_cg.py broken #90

Closed
bwohlberg opened this issue Nov 13, 2021 · 3 comments · Fixed by #88
Closed

Example script ct_svmbir_ppp_bm3d_admm_cg.py broken #90

bwohlberg opened this issue Nov 13, 2021 · 3 comments · Fixed by #88
Assignees
Labels
bug Something isn't working
Milestone

Comments

@bwohlberg
Copy link
Collaborator

The merge of PR #78 seems to have broken the example script ct_svmbir_ppp_bm3d_admm_cg.py.

@bwohlberg bwohlberg added the bug Something isn't working label Nov 13, 2021
@bwohlberg bwohlberg added this to the Release 0.1.0 milestone Nov 13, 2021
bwohlberg added a commit that referenced this issue Nov 13, 2021
@smajee
Copy link
Contributor

smajee commented Nov 13, 2021

Interesting. ct_svmbir_ppp_bm3d_admm_cg.py seemed to run fine for me before the merge. Could be because of some conflict with the other changes merged into main.

@smajee
Copy link
Contributor

smajee commented Nov 13, 2021

As per my investigation, the bug first appears in commit 1b12a7c "adjust other code for new interface"

Hope that helps narrowing it down.

@bwohlberg
Copy link
Collaborator Author

Not sure exactly where it was introduced, but fixed in #91.

bwohlberg added a commit that referenced this issue Nov 16, 2021
* Rough in approximate prox function

* Add kwargs to all proxes

* change svmbir roi radius to have the full rectangle as the imaging domain

* update gitignore to ignore macos hidden files

* pass initial image to prox

* add stopping conditions to SVMBIRWeightedSquaredL2Loss

* add optional is_masked argument to projector. SVMBIRWeightedSquaredL2Loss uses this argument as well.

* Use bug-fixed branch of svmbir

* use small number of iterations for proximal map in example

* change CT angle generation so that pi is not included

* Apply black

* Fix lint error

* Fix reshape edge case to enable all tests to pass

* Resolve #90

* add initial test script

* adds test

* change tolerance

* remove comment

* rename

* Add missing test

* Fix additional bugs and correct docs

* improve documentation

* fix lint error with black

* Fix math error

* Improved parameters

* Improved parameters

* Improve docstring

* grammatical change

* add tests for masked mode

* Add tests for prox v0

* Docstring changes

* change svmbir branch to master since nanfix branch was merged and deleted

* bugfix in test

* Docs edits

* use svmbir to generate weights in test

* update svmbir requirements to pypi since bug fix has been pushed to pypi

* add version num to svmbir

* perform cg svmbir-prox comparison test for both masked on and off

* expose svmbir positivity to users

* update docstring

* Fix bug resulting from specification of svmbir version number

* adds cg-prox to generic loss

* change args to maxiter and ctol

* tighter test bounds

* update docstring for svmbir projector

* cast to Device

* prox_kwargs

* add generic prox for unweighted loss

* Update error messages

* handle prox_args=None

* deal better with non-set dictionary entries

* remove testing file

* add test for non-diagonal prox

* Some docstring improvements

* add docstring

* added ctol

* update ParallelBeamProjector docstring

* Some docstring improvements

* Improve parameters

* Improve parameters

Co-authored-by: Michael-T-McCann <michael.thompson.mccann@gmail.com>
Co-authored-by: Brendt Wohlberg <brendt@ieee.org>
Co-authored-by: Thilo Balke <thilo.balke@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
3 participants