final fixes

Author: ChrisRackauckas

Project.toml

@@ -69,7 +69,7 @@ SciMLBase = "2.37.0"
 Setfield = "1.1.1"
 StaticArrays = "1.9"
 StaticArraysCore = "1.4.2"
-TaylorDiff = "0.2.5, 0.3"
+TaylorDiff = "0.2.5"
 Test = "1.10"
 Tracker = "0.2.33"
 Zygote = "0.6.69"

src/termination_conditions.jl

@@ -293,7 +293,7 @@ end
 
 # This dispatch is needed based on how Terminating Callback works!
 # This intentially drops the `abstol` and `reltol` arguments
-function (cache::NonlinearTerminationModeCache)(integrator::DiffEqBase.AbstractODEIntegrator,
+function (cache::NonlinearTerminationModeCache)(integrator::SciMLBase.AbstractODEIntegrator,
         abstol::Number, reltol::Number, min_t)
     retval = cache(cache.mode, get_du(integrator), integrator.u, integrator.uprev)
     (min_t === nothing || integrator.t ≥ min_t) && return retval
@@ -517,3 +517,52 @@ end
 
 NONLINEARSOLVE_DEFAULT_NORM(u) = norm(u)
 NONLINEARSOLVE_DEFAULT_NORM(f::F, u) where {F} = norm(f.(u))
+
+@inline __fast_scalar_indexing(args...) = all(ArrayInterface.fast_scalar_indexing, args)
+
+@inline __maximum_abs(op::F, x, y) where {F} = __maximum(abs ∘ op, x, y)
+## Nonallocating version of maximum(op.(x, y))
+@inline function __maximum(op::F, x, y) where {F}
+    if __fast_scalar_indexing(x, y)
+        return maximum(@closure((xᵢyᵢ)->begin
+                xᵢ, yᵢ = xᵢyᵢ
+                return op(xᵢ, yᵢ)
+            end), zip(x, y))
+    else
+        return mapreduce(@closure((xᵢ, yᵢ)->op(xᵢ, yᵢ)), max, x, y)
+    end
+end
+
+@inline function __norm_op(::typeof(Base.Fix2(norm, 2)), op::F, x, y) where {F}
+    if __fast_scalar_indexing(x, y)
+        return sqrt(sum(@closure((xᵢyᵢ)->begin
+                xᵢ, yᵢ = xᵢyᵢ
+                return op(xᵢ, yᵢ)^2
+            end), zip(x, y)))
+    else
+        return sqrt(mapreduce(@closure((xᵢ, yᵢ)->(op(xᵢ, yᵢ)^2)), +, x, y))
+    end
+end
+
+@inline __norm_op(norm::N, op::F, x, y) where {N, F} = norm(op.(x, y))
+
+function __nonlinearsolve_is_approx(x::Number, y::Number; atol = false,
+        rtol = atol > 0 ? false : sqrt(eps(promote_type(typeof(x), typeof(y)))))
+    return isapprox(x, y; atol, rtol)
+end
+function __nonlinearsolve_is_approx(x, y; atol = false,
+        rtol = atol > 0 ? false : sqrt(eps(promote_type(eltype(x), eltype(y)))))
+    length(x) != length(y) && return false
+    d = __maximum_abs(-, x, y)
+    return d ≤ max(atol, rtol * max(maximum(abs, x), maximum(abs, y)))
+end
+
+@inline function __add_and_norm(::Nothing, x, y)
+    Base.depwarn("Not specifying the internal norm of termination conditions has been \
+                  deprecated. Using inf-norm currently.",
+        :__add_and_norm)
+    return __maximum_abs(+, x, y)
+end
+@inline __add_and_norm(::typeof(Base.Fix1(maximum, abs)), x, y) = __maximum_abs(+, x, y)
+@inline __add_and_norm(::typeof(Base.Fix2(norm, Inf)), x, y) = __maximum_abs(+, x, y)
+@inline __add_and_norm(f::F, x, y) where {F} = __norm_op(f, +, x, y)

test/core/23_test_problems_tests.jl

@@ -1,5 +1,6 @@
 @testsetup module RobustnessTesting
 using LinearAlgebra, NonlinearProblemLibrary, DiffEqBase, Test
+using SimpleNonlinearSolve
 
 problems = NonlinearProblemLibrary.problems
 dicts = NonlinearProblemLibrary.dicts

test/core/rootfind_tests.jl

@@ -3,6 +3,7 @@ using Reexport
 @reexport using AllocCheck, StaticArrays, Random, LinearAlgebra, ForwardDiff, DiffEqBase,
                 TaylorDiff
 import PolyesterForwardDiff
+using SimpleNonlinearSolve
 
 quadratic_f(u, p) = u .* u .- p
 quadratic_f!(du, u, p) = (du .= u .* u .- p)