-
-
Notifications
You must be signed in to change notification settings - Fork 42
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
Including jvp for radius update schemes #172
Merged
Merged
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
2cfa3f1
jvp for yuan's method
yash-rs 47fef1e
jvp modifications
yash-rs 12b4655
fixes
yash-rs e251104
added some simple tests
yash-rs 7d0e31d
more tests and jvp modifications
yash-rs df859ff
more tests
yash-rs 08e34dc
fan's method
yash-rs 230ccb1
iip issue resolved
yash-rs e76281b
more tests
yash-rs d80286d
fixed parameter issue in jvp
yash-rs d2553e2
Merge branch 'master' into ys/tr_jvp
ChrisRackauckas 50f266d
tolerance decreased
yash2798 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
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
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 |
---|---|---|
|
@@ -417,17 +417,18 @@ function trust_region_step!(cache::TrustRegionCache) | |
elseif r >= cache.expand_threshold && cache.internalnorm(step_size) > cache.trust_r / 2 | ||
cache.p1 = cache.p3 * cache.p1 | ||
end | ||
@unpack p1, fu, f, J = cache | ||
#cache.trust_r = p1 * cache.internalnorm(jacobian!(J, cache) * fu) # we need the gradient at the new (k+1)th point WILL THIS BECOME ALLOCATING? | ||
|
||
|
||
if r > cache.step_threshold | ||
take_step!(cache) | ||
cache.loss = cache.loss_new | ||
cache.make_new_J = true | ||
else | ||
cache.make_new_J = false | ||
end | ||
|
||
|
||
@unpack p1= cache | ||
cache.trust_r = p1 * cache.internalnorm(jvp(cache)) # we need the gradient at the new (k+1)th point WILL THIS BECOME ALLOCATING? | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The comment can be removed. |
||
|
||
if iszero(cache.fu) || cache.internalnorm(cache.fu) < cache.abstol || cache.internalnorm(g) < cache.ϵ # parameters to be defined | ||
cache.force_stop = true | ||
end | ||
|
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.
Put a
!
on there because it's mutating.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.
we are actually not modifying the cache, we are just returning the jvp. Should that still be done?
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.
You are modifying the cache in one of them