-
-
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
Implementing some new Trust region radius update schemes #159
Changes from 14 commits
f9db2fe
dc43d2d
2be3572
a027372
56b23b0
a256021
7d29b1a
7aa7e94
764501e
503fc4c
08fffd4
76185a8
4aa4813
17abaf0
b1f34dd
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -80,10 +80,18 @@ for large-scale and numerically-difficult nonlinear systems. | |
Currently, the linear solver and chunk size choice only applies to in-place defined | ||
`NonlinearProblem`s. That is expected to change in the future. | ||
""" | ||
EnumX.@enumx RadiusUpdateSchemes begin | ||
Simple | ||
Hei | ||
Yuan | ||
Bastin | ||
end | ||
|
||
struct TrustRegion{CS, AD, FDT, L, P, ST, CJ, MTR} <: | ||
AbstractNewtonAlgorithm{CS, AD, FDT, ST, CJ} | ||
linsolve::L | ||
precs::P | ||
radius_update_scheme::RadiusUpdateSchemes.T | ||
max_trust_radius::MTR | ||
initial_trust_radius::MTR | ||
step_threshold::MTR | ||
|
@@ -98,6 +106,7 @@ function TrustRegion(; chunk_size = Val{0}(), | |
autodiff = Val{true}(), | ||
standardtag = Val{true}(), concrete_jac = nothing, | ||
diff_type = Val{:forward}, linsolve = nothing, precs = DEFAULT_PRECS, | ||
radius_update_scheme::RadiusUpdateSchemes.T = RadiusUpdateSchemes.Simple, #defaults to conventional radius update | ||
max_trust_radius::Real = 0 // 1, | ||
initial_trust_radius::Real = 0 // 1, | ||
step_threshold::Real = 1 // 10, | ||
|
@@ -109,7 +118,7 @@ function TrustRegion(; chunk_size = Val{0}(), | |
TrustRegion{_unwrap_val(chunk_size), _unwrap_val(autodiff), diff_type, | ||
typeof(linsolve), typeof(precs), _unwrap_val(standardtag), | ||
_unwrap_val(concrete_jac), typeof(max_trust_radius) | ||
}(linsolve, precs, max_trust_radius, | ||
}(linsolve, precs, radius_update_scheme, max_trust_radius, | ||
initial_trust_radius, | ||
step_threshold, | ||
shrink_threshold, | ||
|
@@ -138,6 +147,7 @@ mutable struct TrustRegionCache{iip, fType, algType, uType, resType, pType, | |
retcode::SciMLBase.ReturnCode.T | ||
abstol::tolType | ||
prob::probType | ||
radius_update_scheme::RadiusUpdateSchemes.T | ||
trust_r::trustType | ||
max_trust_r::trustType | ||
step_threshold::suType | ||
|
@@ -155,20 +165,29 @@ mutable struct TrustRegionCache{iip, fType, algType, uType, resType, pType, | |
fu_new::resType | ||
make_new_J::Bool | ||
r::floatType | ||
p1::floatType | ||
p2::floatType | ||
p3::floatType | ||
p4::floatType | ||
ϵ::floatType | ||
# p5::floatType | ||
# p6::floatType | ||
# p7::floatType | ||
|
||
function TrustRegionCache{iip}(f::fType, alg::algType, u::uType, fu::resType, p::pType, | ||
uf::ufType, linsolve::L, J::jType, | ||
jac_config::JC, iter::Int, | ||
force_stop::Bool, maxiters::Int, internalnorm::INType, | ||
retcode::SciMLBase.ReturnCode.T, abstol::tolType, | ||
prob::probType, trust_r::trustType, | ||
prob::probType, radius_update_scheme::RadiusUpdateSchemes.T, trust_r::trustType, | ||
max_trust_r::trustType, step_threshold::suType, | ||
shrink_threshold::trustType, expand_threshold::trustType, | ||
shrink_factor::trustType, expand_factor::trustType, | ||
loss::floatType, loss_new::floatType, H::jType, | ||
g::resType, shrink_counter::Int, step_size::su2Type, | ||
u_tmp::tmpType, fu_new::resType, make_new_J::Bool, | ||
r::floatType) where {iip, fType, algType, uType, | ||
r::floatType, p1::floatType, p2::floatType, p3::floatType, | ||
p4::floatType, ϵ::floatType) where {iip, fType, algType, uType, | ||
resType, pType, INType, | ||
tolType, probType, ufType, L, | ||
jType, JC, floatType, trustType, | ||
|
@@ -178,13 +197,13 @@ mutable struct TrustRegionCache{iip, fType, algType, uType, resType, pType, | |
trustType, suType, su2Type, tmpType}(f, alg, u, fu, p, uf, linsolve, J, | ||
jac_config, iter, force_stop, | ||
maxiters, internalnorm, retcode, | ||
abstol, prob, trust_r, max_trust_r, | ||
abstol, prob, radius_update_scheme, trust_r, max_trust_r, | ||
step_threshold, shrink_threshold, | ||
expand_threshold, shrink_factor, | ||
expand_factor, loss, | ||
loss_new, H, g, shrink_counter, | ||
step_size, u_tmp, fu_new, | ||
make_new_J, r) | ||
make_new_J, r, p1, p2, p3, p4, ϵ) | ||
end | ||
end | ||
|
||
|
@@ -238,6 +257,7 @@ function SciMLBase.__init(prob::NonlinearProblem{uType, iip}, alg::TrustRegion, | |
loss = get_loss(fu) | ||
uf, linsolve, J, u_tmp, jac_config = jacobian_caches(alg, f, u, p, Val(iip)) | ||
|
||
radius_update_scheme = alg.radius_update_scheme | ||
max_trust_radius = convert(eltype(u), alg.max_trust_radius) | ||
initial_trust_radius = convert(eltype(u), alg.initial_trust_radius) | ||
step_threshold = convert(eltype(u), alg.step_threshold) | ||
|
@@ -262,13 +282,37 @@ function SciMLBase.__init(prob::NonlinearProblem{uType, iip}, alg::TrustRegion, | |
make_new_J = true | ||
r = loss | ||
|
||
# Parameters for the Schemes | ||
p1 = 0 | ||
p2 = 0 | ||
p3 = 0 | ||
p4 = 0 | ||
ϵ = 1e-8 | ||
if radius_update_scheme === RadiusUpdateSchemes.Hei | ||
step_threshold = 0 | ||
shrink_threshold = 0.25 | ||
expand_threshold = 0.25 | ||
p1 = 5.0 # M | ||
p2 = 0.1 # β | ||
p3 = 0.15 # γ1 | ||
p4 = 0.15 # γ2 | ||
elseif radius_update_scheme === RadiusUpdateSchemes.Yuan | ||
step_threshold = 0.0001 | ||
shrink_threshold = 0.25 | ||
expand_threshold = 0.25 | ||
p1 = 2.0 # μ | ||
p2 = 1/6 # c5 | ||
p3 = 6 # c6 | ||
p4 = 0 | ||
end | ||
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. these values should match the type of |
||
|
||
return TrustRegionCache{iip}(f, alg, u, fu, p, uf, linsolve, J, jac_config, | ||
1, false, maxiters, internalnorm, | ||
ReturnCode.Default, abstol, prob, initial_trust_radius, | ||
ReturnCode.Default, abstol, prob, radius_update_scheme, initial_trust_radius, | ||
max_trust_radius, step_threshold, shrink_threshold, | ||
expand_threshold, shrink_factor, expand_factor, loss, | ||
loss_new, H, g, shrink_counter, step_size, u_tmp, fu_new, | ||
make_new_J, r) | ||
make_new_J, r, p1, p2, p3, p4, ϵ) | ||
end | ||
|
||
function perform_step!(cache::TrustRegionCache{true}) | ||
|
@@ -290,6 +334,7 @@ function perform_step!(cache::TrustRegionCache{true}) | |
cache.u_tmp .= u .+ cache.step_size | ||
f(cache.fu_new, cache.u_tmp, p) | ||
|
||
@unpack radius_update_scheme = cache | ||
trust_region_step!(cache) | ||
return nothing | ||
end | ||
|
@@ -312,42 +357,89 @@ function perform_step!(cache::TrustRegionCache{false}) | |
cache.u_tmp = u .+ cache.step_size | ||
cache.fu_new = f(cache.u_tmp, p) | ||
|
||
@unpack radius_update_scheme = cache | ||
trust_region_step!(cache) | ||
return nothing | ||
end | ||
|
||
function trust_region_step!(cache::TrustRegionCache) | ||
@unpack fu_new, step_size, g, H, loss, max_trust_r = cache | ||
@unpack fu_new, step_size, g, H, loss, max_trust_r, radius_update_scheme = cache | ||
cache.loss_new = get_loss(fu_new) | ||
|
||
# Compute the ratio of the actual reduction to the predicted reduction. | ||
cache.r = -(loss - cache.loss_new) / (step_size' * g + step_size' * H * step_size / 2) | ||
@unpack r = cache | ||
|
||
# Update the trust region radius. | ||
if r < cache.shrink_threshold | ||
cache.trust_r *= cache.shrink_factor | ||
cache.shrink_counter += 1 | ||
else | ||
cache.shrink_counter = 0 | ||
end | ||
if r > cache.step_threshold | ||
if radius_update_scheme === RadiusUpdateSchemes.Simple | ||
# Update the trust region radius. | ||
if r < cache.shrink_threshold | ||
cache.trust_r *= cache.shrink_factor | ||
cache.shrink_counter += 1 | ||
else | ||
cache.shrink_counter = 0 | ||
end | ||
if r > cache.step_threshold | ||
take_step!(cache) | ||
cache.loss = cache.loss_new | ||
|
||
# Update the trust region radius. | ||
if r > cache.expand_threshold | ||
cache.trust_r = min(cache.expand_factor * cache.trust_r, max_trust_r) | ||
end | ||
|
||
cache.make_new_J = true | ||
else | ||
# No need to make a new J, no step was taken, so we try again with a smaller trust_r | ||
cache.make_new_J = false | ||
end | ||
|
||
if iszero(cache.fu) || cache.internalnorm(cache.fu) < cache.abstol | ||
cache.force_stop = true | ||
end | ||
|
||
elseif radius_update_scheme === RadiusUpdateSchemes.Hei | ||
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. error for not implemented 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. okay, like a TypeError when the |
||
if r > cache.step_threshold # parameters to be defined | ||
take_step!(cache) | ||
cache.loss = cache.loss_new | ||
cache.make_new_J = true | ||
else | ||
cache.make_new_J = false | ||
end | ||
# Hei's radius update scheme | ||
@unpack shrink_threshold, p1, p2, p3, p4, ϵ = cache | ||
cache.trust_r = rfunc(r, shrink_threshold, p1, p3, p4, p2) * cache.internalnorm(step_size) # parameters to be defined | ||
|
||
if iszero(fu) || cache.internalnorm(cache.fu) < cache.abstol || cache.internalnorm(g) < ϵ # parameters to be defined | ||
cache.force_stop = true | ||
end | ||
|
||
|
||
elseif radius_update_scheme === RadiusUpdateSchemes.Yuan | ||
if r > cache.step_threshold | ||
take_step!(cache) | ||
cache.loss = cache.loss_new | ||
|
||
# Update the trust region radius. | ||
if r > cache.expand_threshold | ||
cache.trust_r = min(cache.expand_factor * cache.trust_r, max_trust_r) | ||
end | ||
|
||
cache.make_new_J = true | ||
else | ||
# No need to make a new J, no step was taken, so we try again with a smaller trust_r | ||
else | ||
cache.make_new_J = false | ||
end | ||
|
||
if iszero(cache.fu) || cache.internalnorm(cache.fu) < cache.abstol | ||
end | ||
if r < cache.shrink_threshold | ||
cache.p1 = p2 * cache.p1 | ||
elseif r >= cache.shrink_threshold && cache.internalnorm(step_size) > cache.trust_r / 2 | ||
cache.p1 = p3 * cache.p1 | ||
end | ||
@unpack p1 = cache.p1 | ||
|
||
# yuan's scheme | ||
@unpack fu = cache | ||
cache.trust_r = p1 * cache.internalnorm(jacobian(cache, f) * fu) # 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. you don't needto calculate the whole Jacobian here, we can fix that in a future PR though. |
||
|
||
if iszero(fu) || cache.internalnorm(cache.fu) < cache.abstol || cache.internalnorm(g) < ϵ # parameters to be defined | ||
cache.force_stop = true | ||
end | ||
|
||
#elseif radius_update_scheme === RadiusUpdateSchemes.Bastin | ||
|
||
|
||
end | ||
end | ||
|
||
|
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.
missing from the Project.toml
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.
yeah i added the pkg in the env but didn't commit it yet. will do it in the next commit