-
Notifications
You must be signed in to change notification settings - Fork 17
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
Changes to admm and svmbir wrapper to address issue #57 #88
Merged
Merged
Changes from 56 commits
Commits
Show all changes
70 commits
Select commit
Hold shift + click to select a range
717e1c6
Rough in approximate prox function
Michael-T-McCann 9a5cfa6
Add kwargs to all proxes
Michael-T-McCann 123d296
change svmbir roi radius to have the full rectangle as the imaging do…
smajee f8d2cfb
update gitignore to ignore macos hidden files
smajee 66fa592
pass initial image to prox
smajee 5118df1
add stopping conditions to SVMBIRWeightedSquaredL2Loss
smajee 08c5ba7
add optional is_masked argument to projector. SVMBIRWeightedSquaredL2…
smajee 812d3dc
Use bug-fixed branch of svmbir
smajee 9e0ae41
use small number of iterations for proximal map in example
smajee 0bcc1b3
Merge branch 'main' into mike/approx_prox
bwohlberg 3a6d97e
change CT angle generation so that pi is not included
smajee 0cb6003
Merge branch 'mike/approx_prox' of github.com:lanl/scico into mike/ap…
smajee 8313a04
Merge branch 'main' into mike/approx_prox
bwohlberg 7640be4
Apply black
bwohlberg 56189bd
Merge branch 'main' into mike/approx_prox
smajee 1220f75
fix merge conflicts
smajee 93e03ac
Fix lint error
bwohlberg 4a8842b
Fix reshape edge case to enable all tests to pass
smajee 903d792
Resolve #90
bwohlberg 955677c
add initial test script
tbalke 570a856
adds test
tbalke ae8910d
change tolerance
tbalke 1f0887b
remove comment
tbalke 7ebad4c
rename
tbalke 4276e0a
Add missing test
bwohlberg 1df1275
Fix additional bugs and correct docs
bwohlberg 47c0f6a
improve documentation
smajee 88dc430
Merge remote-tracking branch 'origin/brendt/admm-bug' into mike/appro…
smajee 196bdf8
fix lint error with black
smajee 70a041c
Fix math error
bwohlberg 0f1cb51
Merge branch 'brendt/admm-bug' into mike/approx_prox
bwohlberg c1f26d8
Improved parameters
bwohlberg aa6703b
Improved parameters
bwohlberg a42b143
Improve docstring
smajee 557b8ab
grammatical change
smajee e00f1ef
add tests for masked mode
smajee c07dcd2
Add tests for prox v0
smajee d496b64
Docstring changes
smajee f1c9ed4
change svmbir branch to master since nanfix branch was merged and del…
smajee 964fca5
bugfix in test
smajee 5fc99ed
Docs edits
bwohlberg b3d9367
Merge branch 'mike/approx_prox' of github.com:lanl/scico into mike/ap…
bwohlberg a8ab873
use svmbir to generate weights in test
smajee fa1df17
update svmbir requirements to pypi since bug fix has been pushed to pypi
smajee bb2b42b
add version num to svmbir
smajee 238e5f9
perform cg svmbir-prox comparison test for both masked on and off
smajee c81e3dd
expose svmbir positivity to users
smajee 629fa4e
update docstring
smajee 86b2a37
Fix bug resulting from specification of svmbir version number
bwohlberg 3fdc0cb
adds cg-prox to generic loss
tbalke 06631b2
change args to maxiter and ctol
tbalke 7ea5a11
tighter test bounds
tbalke b342a7e
update docstring for svmbir projector
smajee 497e1ca
cast to Device
tbalke d6c6d85
Merge branch 'mike/approx_prox' of github.com:lanl/scico into mike/ap…
smajee 72c77f8
prox_kwargs
tbalke 9e45bdc
add generic prox for unweighted loss
tbalke f4f268d
Update error messages
bwohlberg 57a06f2
handle prox_args=None
tbalke f318cd1
deal better with non-set dictionary entries
tbalke 57e0df0
remove testing file
tbalke 53713dd
add test for non-diagonal prox
tbalke 0f5175f
Some docstring improvements
bwohlberg 079ac16
add docstring
tbalke a640fa7
added ctol
tbalke db28d3f
Merge branch 'main' into mike/approx_prox
bwohlberg 219e5ed
update ParallelBeamProjector docstring
smajee 4c02266
Some docstring improvements
bwohlberg 9b614bb
Improve parameters
bwohlberg 2cc51b3
Improve parameters
bwohlberg File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -133,3 +133,6 @@ dmypy.json | |
|
||
# Pyre type checker | ||
.pyre/ | ||
|
||
# macos files | ||
*.DS_Store |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,4 +6,4 @@ jax==0.2.19 | |
jaxlib==0.1.70 | ||
flax | ||
bm3d | ||
svmbir | ||
svmbir>=0.2.6 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Is it really desirable that we just drop the default stopping tolerance here?
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 I would choose the tolerance to be 0 (or very) low so that always 5 iterations are being performed (unless there is really almost no change)
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.
Addressed in a640fa7