Skip to content

SAG and SAGA approximate gradient methods - #1624

Merged
paskino merged 251 commits into
TomographicImaging:masterfrom
MargaretDuff:sag-saga
Jul 20, 2024
Merged

SAG and SAGA approximate gradient methods #1624
paskino merged 251 commits into
TomographicImaging:masterfrom
MargaretDuff:sag-saga

Conversation

@MargaretDuff

@MargaretDuff MargaretDuff commented Dec 13, 2023 •
edited
Loading

Copy link
Copy Markdown
Member

Describe your changes

SAG and SAGA approximate gradient methods

Describe any testing you have performed

Please add any demo scripts to CIL-Demos/misc/

Link relevant issues

Closes #1342

Checklist when you are ready to request a review

  • I have performed a self-review of my code
  • I have added docstrings in line with the guidance in the developer guide
  • I have implemented unit tests that cover any new or modified functionality
  • CHANGELOG.md has been updated with any functionality change
  • Request review from all relevant developers
  • Change pull request label to 'Waiting for review'

Contribution Notes

Please read and adhere to the developer guide and local patterns and conventions.

  • The content of this Pull Request (the Contribution) is intentionally submitted for inclusion in CIL (the Work) under the terms and conditions of the Apache-2.0 License.
  • I confirm that the contribution does not violate any intellectual property rights of third parties

MargaretDuff and others added 30 commits August 2, 2023 14:31
@MargaretDuff
Changed how probabilities and samplers interact in SPDHG
7331c73
@MargaretDuff
Initial playing
343509c
@MargaretDuff
Ready to start some basic testing
40ac9c0
@MargaretDuff
Started to debug
34fb1d5
@MargaretDuff
Testind SGD
6ef169a
@MargaretDuff
Update sampling.py
2bce666 
Quick docstring

Signed-off-by: Margaret Duff <[email protected]>
@MargaretDuff
Changed to factory method style and added in permuatations
ea759c5
@MargaretDuff
Debugging and fixing random generator in show epochs
d1909a3
@MargaretDuff
Testing SPDHG
98b0694
@MargaretDuff
Changed the show epochs
05b67cb
@MargaretDuff
Meeting with Vaggelis, Jakob, Gemma and Edo
001350b
@MargaretDuff
Set up for installation
890dec0
@MargaretDuff
Added staggered and custom order and started with writing documentation
25806fc
@MargaretDuff
Work on documentation
75abbfe
@MargaretDuff
Commenting and examples in the class
ebdf329
@MargaretDuff
Debugging sampler
ba35fb8
@MargaretDuff
sorted build and imports
ff5cdf1
@MargaretDuff
Changes to todo
f62f064
@MargaretDuff
Changes after dev meeting
beac6fa
@MargaretDuff
Checking probabilities in init
1202e53
@MargaretDuff
initial testing
079935b
@MargaretDuff
Sped up PDHG and SPDHG testing
43e3dc4
@MargaretDuff
Removed timing statements
004ab2f
@MargaretDuff
Got rid of epochs - still need to fix the shuffle
7b857e0
@MargaretDuff
Fixed random without replacement shuffle=False
1f7d546
@MargaretDuff
Changes after meeting 12-09-2023. Remove epochs in sampler and deprec…
6993a95 
…ate prob in spdhg
@MargaretDuff
Sampler unit tests added
bafc748
@MargaretDuff
Some checks for setting step sizes
d62aa2b
@MargaretDuff
Started looking at unit tests and debugging SPDHG setters and init
c81b71c
@MargaretDuff
Notes after discussions with gemma
b28f2f1
epapoutsellis
epapoutsellis reviewed Jul 11, 2024
View reviewed changes
Comment thread Wrappers/Python/cil/optimisation/functions/SAGFunction.py
epapoutsellis
epapoutsellis reviewed Jul 11, 2024
View reviewed changes
Comment thread Wrappers/Python/cil/optimisation/functions/SAGFunction.py Outdated
epapoutsellis
epapoutsellis reviewed Jul 11, 2024
View reviewed changes
Comment thread Wrappers/Python/cil/optimisation/functions/SAGFunction.py Outdated
epapoutsellis
epapoutsellis approved these changes Jul 11, 2024
View reviewed changes

@epapoutsellis epapoutsellis left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Some suggestions (no actions) and one question. LGTM, approve.

paskino
paskino reviewed Jul 17, 2024
View reviewed changes
Comment thread Wrappers/Python/cil/optimisation/functions/SAGFunction.py Outdated
paskino
paskino reviewed Jul 17, 2024
View reviewed changes
Comment thread Wrappers/Python/cil/optimisation/functions/SAGFunction.py
paskino
paskino reviewed Jul 17, 2024
View reviewed changes
Comment thread Wrappers/Python/cil/optimisation/functions/SAGFunction.py Outdated
paskino
paskino reviewed Jul 17, 2024
View reviewed changes
Comment thread Wrappers/Python/cil/optimisation/functions/SAGFunction.py Outdated
paskino
paskino reviewed Jul 17, 2024
View reviewed changes
Comment thread Wrappers/Python/cil/optimisation/functions/SAGFunction.py Outdated
paskino
paskino reviewed Jul 17, 2024
View reviewed changes

@paskino paskino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

A few suggestions, plus please add the memory requirements for these functions in the documentation.

@MargaretDuff MargaretDuff added this to the v24.2.0 milestone Jul 17, 2024
@MargaretDuff
MargaretDuff requested a review from paskino July 17, 2024 14:18
paskino
paskino reviewed Jul 18, 2024
View reviewed changes
Comment thread Wrappers/Python/cil/optimisation/functions/SAGFunction.py
paskino
paskino reviewed Jul 18, 2024
View reviewed changes
Comment thread Wrappers/Python/test/test_approximate_gradient.py Outdated
paskino
paskino reviewed Jul 18, 2024
View reviewed changes
Comment thread Wrappers/Python/test/test_approximate_gradient.py Outdated
paskino added 3 commits July 19, 2024 20:12
@paskino
use setuptools <71
8ec3a93 
Signed-off-by: Edoardo Pasca <[email protected]>
@paskino
revert setuptools <71 requirement in build
d8e725f 
Signed-off-by: Edoardo Pasca <[email protected]>
@paskino
add setuptools<71 in requirements-test.yml
97cbb16 
quick fix

Signed-off-by: Edoardo Pasca <[email protected]>
@paskino
paskino merged commit c719a67 into TomographicImaging:master Jul 20, 2024
@MargaretDuff MargaretDuff mentioned this pull request Aug 12, 2024
Closed
8 tasks
@MargaretDuff

MargaretDuff commented Aug 12, 2024

Copy link
Copy Markdown
Member Author

Thanks @paskino for getting this over the line!

@MargaretDuff
MargaretDuff deleted the sag-saga branch August 12, 2024 15:44
@paskino paskino mentioned this pull request Aug 23, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jakobsj jakobsj jakobsj approved these changes
@paskino paskino paskino approved these changes
@epapoutsellis epapoutsellis epapoutsellis approved these changes
@zeljkozeljko zeljkozeljko Awaiting requested review from zeljkozeljko

Assignees

@MargaretDuff MargaretDuff

Labels

Waiting for review

Projects

CIL work
Status: Done
Work plan
Status: PRs to review

Milestone

v24.2.0

Development

Successfully merging this pull request may close these issues.

Stochastic Average Gradient (Ameliore) SAG, SAGA

7 participants

@MargaretDuff @jakobsj @paskino @epapoutsellis @zeljkozeljko @lauramurgatroyd @gfardell