From f4f12d3658cb660fbdfacd651a9085ad00d4b63d Mon Sep 17 00:00:00 2001 From: Avik Pal Date: Tue, 5 Dec 2023 20:35:55 -0500 Subject: [PATCH] Norm has been fixed upstream --- src/broyden.jl | 2 +- src/trustRegion.jl | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/broyden.jl b/src/broyden.jl index 769ce4348..785ac0221 100644 --- a/src/broyden.jl +++ b/src/broyden.jl @@ -175,7 +175,7 @@ function perform_step!(cache::GeneralBroydenCache{iip, IJ, UR}) where {iip, IJ, ifelse(iszero(denom), T(1e-5), denom) @bb cache.J⁻¹ += vec(cache.du) × transpose(_vec(cache.u_cache)) elseif UR === :bad_broyden - dfu_norm = norm(cache.dfu)^2 + dfu_norm = cache.internalnorm(cache.dfu)^2 @bb @. cache.du = (cache.du - cache.J⁻¹dfu) / ifelse(iszero(dfu_norm), T(1e-5), dfu_norm) @bb cache.J⁻¹ += vec(cache.du) × transpose(_vec(cache.dfu)) diff --git a/src/trustRegion.jl b/src/trustRegion.jl index 5a6360f73..cab250223 100644 --- a/src/trustRegion.jl +++ b/src/trustRegion.jl @@ -563,7 +563,6 @@ function __reinit_internal!(cache::TrustRegionCache; kwargs...) return nothing end -# This only holds for 2-norm? __trust_region_loss(cache::TrustRegionCache, x) = __trust_region_loss(cache.internalnorm, x) __trust_region_loss(nf::F, x) where {F} = nf(x)^2 / 2