Change the norm

SciML · Nov 28, 2023 · 594100e · 594100e
1 parent 49f8904
commit 594100e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/SimpleNonlinearSolve.jl b/src/SimpleNonlinearSolve.jl
@@ -8,7 +8,8 @@ import PrecompileTools: @compile_workload, @setup_workload, @recompile_invalidat
 
     import DiffEqBase: AbstractNonlinearTerminationMode,
         AbstractSafeNonlinearTerminationMode, AbstractSafeBestNonlinearTerminationMode,
-        NonlinearSafeTerminationReturnCode, get_termination_mode
+        NonlinearSafeTerminationReturnCode, get_termination_mode,
+        NONLINEARSOLVE_DEFAULT_NORM
     using FiniteDiff, ForwardDiff
     import ForwardDiff: Dual
     import MaybeInplace: @bb, setindex_trait, CanSetindex, CannotSetindex

diff --git a/src/nlsolve/dfsane.jl b/src/nlsolve/dfsane.jl
@@ -69,7 +69,7 @@ function SciMLBase.__solve(prob::NonlinearProblem, alg::SimpleDFSane, args...;
     abstol, reltol, tc_cache = init_termination_cache(abstol, reltol, fx, x,
         termination_condition)
 
-    fx_norm = norm(fx)^nexp
+    fx_norm = NONLINEARSOLVE_DEFAULT_NORM(fx)^nexp
     α_1 = one(T)
     f_1 = fx_norm
 
@@ -99,7 +99,7 @@ function SciMLBase.__solve(prob::NonlinearProblem, alg::SimpleDFSane, args...;
         @bb @. x += α_p * d
 
         fx = __eval_f(prob, fx, x)
-        fx_norm_new = norm(fx)^nexp
+        fx_norm_new = NONLINEARSOLVE_DEFAULT_NORM(fx)^nexp
 
         while k < maxiters
             fx_norm_new ≤ (f_bar + η - γ * α_p^2 * fx_norm) && break
@@ -108,7 +108,7 @@ function SciMLBase.__solve(prob::NonlinearProblem, alg::SimpleDFSane, args...;
             @bb @. x -= α_m * d
 
             fx = __eval_f(prob, fx, x)
-            fx_norm_new = norm(fx)^nexp
+            fx_norm_new = NONLINEARSOLVE_DEFAULT_NORM(fx)^nexp
 
             fx_norm_new ≤ (f_bar + η - γ * α_m^2 * fx_norm) && break
 
@@ -118,7 +118,7 @@ function SciMLBase.__solve(prob::NonlinearProblem, alg::SimpleDFSane, args...;
             @bb @. x += α_p * d
 
             fx = __eval_f(prob, fx, x)
-            fx_norm_new = norm(fx)^nexp
+            fx_norm_new = NONLINEARSOLVE_DEFAULT_NORM(fx)^nexp
 
             k += 1
         end

diff --git a/test/basictests.jl b/test/basictests.jl
@@ -258,9 +258,9 @@ end
 # --- Allocation Checks ---
 
 ## SimpleDFSane needs to allocate a history vector
-@testset "Allocation Checks: $(_nameof(alg))" for alg in ( SimpleNewtonRaphson(),
-        SimpleHalley(), SimpleBroyden(), SimpleKlement(), SimpleLimitedMemoryBroyden(),
-        SimpleTrustRegion())
+@testset "Allocation Checks: $(_nameof(alg))" for alg in (SimpleNewtonRaphson(),
+    SimpleHalley(), SimpleBroyden(), SimpleKlement(), SimpleLimitedMemoryBroyden(),
+    SimpleTrustRegion())
     @check_allocs nlsolve(prob, alg) = DiffEqBase.__solve(prob, alg; abstol = 1e-9)
 
     nlprob_scalar = NonlinearProblem{false}(quadratic_f, 1.0, 2.0)