try fixing LM for banded jacobian

SciML · Nov 2, 2023 · 40a9ded · 40a9ded
1 parent b07360f
commit 40a9ded
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "NonlinearSolve"
 uuid = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
 authors = ["SciML"]
-version = "2.6.0"
+version = "2.6.1"
 
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"

diff --git a/src/levenberg.jl b/src/levenberg.jl
@@ -260,7 +260,7 @@ function perform_step!(cache::LevenbergMarquardtCache{true, fastls}) where {fast
     # Usual Levenberg-Marquardt step ("velocity").
     # The following lines do: cache.v = -cache.mat_tmp \ cache.u_tmp
     if fastls
-        cache.mat_tmp[1:length(fu1), :] .= cache.J
+        copyto!(@view(cache.mat_tmp[1:length(fu1), :]), cache.J)
         cache.mat_tmp[(length(fu1) + 1):end, :] .= λ .* cache.DᵀD
         cache.rhs_tmp[1:length(fu1)] .= _vec(fu1)
         linres = dolinsolve(alg.precs, linsolve; A = cache.mat_tmp,
@@ -299,8 +299,8 @@ function perform_step!(cache::LevenbergMarquardtCache{true, fastls}) where {fast
     cache.stats.nfactors += 2
 
     # Require acceptable steps to satisfy the following condition.
-    norm_v = norm(v)
-    if 2 * norm(cache.a) ≤ α_geodesic * norm_v
+    norm_v = cache.internalnorm(v)
+    if 2 * cache.internalnorm(cache.a) ≤ α_geodesic * norm_v
         _vec(cache.δ) .= _vec(v) .+ _vec(cache.a) ./ 2
         @unpack δ, loss_old, norm_v_old, v_old, b_uphill = cache
         f(cache.fu_tmp, u .+ δ, p)
@@ -356,7 +356,7 @@ function perform_step!(cache::LevenbergMarquardtCache{false, fastls}) where {fas
 
     # Usual Levenberg-Marquardt step ("velocity").
     if fastls
-        cache.mat_tmp = vcat(J, λ .* cache.DᵀD)
+        cache.mat_tmp = _vcat(J, λ .* cache.DᵀD)
         cache.rhs_tmp[1:length(fu1)] .= -_vec(fu1)
         linres = dolinsolve(alg.precs, linsolve; A = cache.mat_tmp,
             b = cache.rhs_tmp, linu = _vec(cache.v), p = p, reltol = cache.abstol)
@@ -392,8 +392,8 @@ function perform_step!(cache::LevenbergMarquardtCache{false, fastls}) where {fas
     cache.stats.nfactors += 1
 
     # Require acceptable steps to satisfy the following condition.
-    norm_v = norm(v)
-    if 2 * norm(cache.a) ≤ α_geodesic * norm_v
+    norm_v = cache.internalnorm(v)
+    if 2 * cache.internalnorm(cache.a) ≤ α_geodesic * norm_v
         cache.δ = _restructure(cache.δ, _vec(v) .+ _vec(cache.a) ./ 2)
         @unpack δ, loss_old, norm_v_old, v_old, b_uphill = cache
         fu_new = f(u .+ δ, p)