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.

Sign up for GitHub

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

Jump to bottom

ApproximateGradientSumFunction class and example SGFunction for Stochastic Gradient Descent #1550

Merged
merged 183 commits into from
Mar 26, 2024
Merged

ApproximateGradientSumFunction class and example SGFunction for Stochastic Gradient Descent #1550

merged 183 commits into from
Mar 26, 2024

Conversation

MargaretDuff
Copy link
Member

@MargaretDuff MargaretDuff commented Oct 25, 2023 •
edited

Describe your changes

Added the ApproximateGradientSumFunction class and example SGFunction for Stochastic Gradient Descent and relevant unit tests

Describe any testing you have performed

See code

Link relevant issues

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 10:36
@MargaretDuff
First attempt at sampling class
8389932
@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 <43645617+MargaretDuff@users.noreply.github.com>
@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
Copy link
Member Author

Jenkins is happy
image

@MargaretDuff MargaretDuff dismissed jakobsj’s stale review March 26, 2024 12:27

Changes made and checked with Edo

@MargaretDuff MargaretDuff merged commit 040f214 into TomographicImaging:master Mar 26, 2024
8 checks passed
@MargaretDuff MargaretDuff deleted the SGD branch March 26, 2024 12:33
@MargaretDuff MargaretDuff mentioned this pull request Mar 26, 2024
Closed
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@paskino paskino paskino approved these changes

@epapoutsellis epapoutsellis epapoutsellis approved these changes

@jakobsj jakobsj jakobsj left review comments

@gfardell gfardell Awaiting requested review from gfardell

Assignees

@MargaretDuff MargaretDuff

Labels
Waiting for review
Projects
No open projects
Work plan
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Stochastic Gradient Descent (SGD) Implement SubsetSumFunction
6 participants
@MargaretDuff @epapoutsellis @jakobsj @paskino @lauramurgatroyd @gfardell