Improve termination conditions

Author: avik-pal

Manifest.toml

@@ -164,7 +164,7 @@ uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
 
 [[deps.DiffEqBase]]
 deps = ["ArrayInterface", "ChainRulesCore", "DataStructures", "DocStringExtensions", "EnumX", "EnzymeCore", "FastBroadcast", "ForwardDiff", "FunctionWrappers", "FunctionWrappersWrappers", "LinearAlgebra", "Logging", "Markdown", "MuladdMacro", "Parameters", "PreallocationTools", "PrecompileTools", "Printf", "RecursiveArrayTools", "Reexport", "Requires", "SciMLBase", "SciMLOperators", "Setfield", "SparseArrays", "Static", "StaticArraysCore", "Statistics", "Tricks", "TruncatedStacktraces", "ZygoteRules"]
-git-tree-sha1 = "e5049e32074cd22f86d74036caf6663637623003"
+git-tree-sha1 = "4e661d0beddac31da05e71b79afd769232622de8"
 repo-rev = "ap/tstable_termination"
 repo-url = "https://github.com/SciML/DiffEqBase.jl"
 uuid = "2b5f629d-d688-5b77-993f-72d75c75574e"
@@ -689,9 +689,9 @@ version = "0.1.0"
 
 [[deps.SLEEFPirates]]
 deps = ["IfElse", "Static", "VectorizationBase"]
-git-tree-sha1 = "897b39ec056c0619ea87adc7eeadba0bec0cf931"
+git-tree-sha1 = "f5c896d781486f1d67c8492f0e0ead2c3517208c"
 uuid = "476501e8-09a2-5ece-8869-fb82de89a1fa"
-version = "0.6.40"
+version = "0.6.41"
 
 [[deps.SciMLBase]]
 deps = ["ADTypes", "ArrayInterface", "ChainRulesCore", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FillArrays", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables", "TruncatedStacktraces", "ZygoteRules"]

src/lbroyden.jl

@@ -101,11 +101,6 @@ function perform_step!(cache::LimitedMemoryBroydenCache{true})
     @unpack f, p, du, u = cache
     T = eltype(u)
 
-<<<<<<< HEAD
-=======
-    termination_condition = cache.termination_condition(tc_storage)
-
->>>>>>> a83cf9c (Use the new Termination Condition API)
     α = perform_linesearch!(cache.ls_cache, u, du)
     _axpy!(-α, du, u)
     f(cache.fu2, u, p)

src/utils.jl

@@ -176,7 +176,7 @@ end
 
 Defaults to `mul!(C, A, B)`. However, for sparse matrices uses `C .= A * B`.
 """
-__matmul!(C, A, B) = mul!(C, A, B)``
+__matmul!(C, A, B) = mul!(C, A, B)
 __matmul!(C::AbstractSparseMatrix, A, B) = C .= A * B
 
 # Concretize Algorithms
@@ -273,7 +273,6 @@ function check_and_update!(tc_cache, cache, fu, u, uprev,
         cache.force_stop = true
     end
 end
-# FIXME: Purge things till here!
 
 __init_identity_jacobian(u::Number, _) = u
 function __init_identity_jacobian(u, fu)

test/basictests.jl

@@ -133,7 +133,10 @@ const TERMINATION_CONDITIONS = [
 
     @testset "Termination condition: $(termination_condition) u0: $(_nameof(u0))" for termination_condition in TERMINATION_CONDITIONS,
         u0 in (1.0, [1.0, 1.0])
+<<<<<<< HEAD
 
+=======
+>>>>>>> 1a0df4e (Improve termination conditions)
         probN = NonlinearProblem(quadratic_f, u0, 2.0)
         @test all(solve(probN, NewtonRaphson(); termination_condition).u .≈ sqrt(2.0))
     end
@@ -298,7 +301,10 @@ end
 
     @testset "Termination condition: $(termination_condition) u0: $(_nameof(u0))" for termination_condition in TERMINATION_CONDITIONS,
         u0 in (1.0, [1.0, 1.0])
+<<<<<<< HEAD
 
+=======
+>>>>>>> 1a0df4e (Improve termination conditions)
         probN = NonlinearProblem(quadratic_f, u0, 2.0)
         @test all(solve(probN, TrustRegion(); termination_condition).u .≈ sqrt(2.0))
     end
@@ -415,7 +421,10 @@ end
 
     @testset "Termination condition: $(termination_condition) u0: $(_nameof(u0))" for termination_condition in TERMINATION_CONDITIONS,
         u0 in (1.0, [1.0, 1.0])
+<<<<<<< HEAD
 
+=======
+>>>>>>> 1a0df4e (Improve termination conditions)
         probN = NonlinearProblem(quadratic_f, u0, 2.0)
         @test all(solve(probN, LevenbergMarquardt(); termination_condition).u .≈ sqrt(2.0))
     end
@@ -550,7 +559,10 @@ end
 
     @testset "Termination condition: $(termination_condition) u0: $(_nameof(u0))" for termination_condition in TERMINATION_CONDITIONS,
         u0 in (1.0, [1.0, 1.0])
+<<<<<<< HEAD
 
+=======
+>>>>>>> 1a0df4e (Improve termination conditions)
         probN = NonlinearProblem(quadratic_f, u0, 2.0)
         @test all(solve(probN, DFSane(); termination_condition).u .≈ sqrt(2.0))
     end
@@ -671,7 +683,10 @@ end
 
     @testset "Termination condition: $(termination_condition) u0: $(_nameof(u0))" for termination_condition in TERMINATION_CONDITIONS,
         u0 in (1.0, [1.0, 1.0])
+<<<<<<< HEAD
 
+=======
+>>>>>>> 1a0df4e (Improve termination conditions)
         probN = NonlinearProblem(quadratic_f, u0, 2.0)
         @test all(solve(probN, PseudoTransient(; alpha_initial = 10.0);
             termination_condition).u .≈ sqrt(2.0))
@@ -769,7 +784,10 @@ end
 
     @testset "Termination condition: $(termination_condition) u0: $(_nameof(u0))" for termination_condition in TERMINATION_CONDITIONS,
         u0 in (1.0, [1.0, 1.0])
+<<<<<<< HEAD
 
+=======
+>>>>>>> 1a0df4e (Improve termination conditions)
         probN = NonlinearProblem(quadratic_f, u0, 2.0)
         @test all(solve(probN, GeneralBroyden(); termination_condition).u .≈ sqrt(2.0))
     end
@@ -866,9 +884,14 @@ end
 
     @testset "Termination condition: $(termination_condition) u0: $(_nameof(u0))" for termination_condition in TERMINATION_CONDITIONS,
         u0 in (1.0, [1.0, 1.0])
+<<<<<<< HEAD
 
         probN = NonlinearProblem(quadratic_f, u0, 2.0)
         @test all(solve(probN, GeneralKlement(); termination_condition).u .≈ sqrt(2.0))
+=======
+        probN = NonlinearProblem(quadratic_f, u0, 2.0)
+        @test all(solve(probN,GeneralKlement(); termination_condition).u .≈ sqrt(2.0))
+>>>>>>> 1a0df4e (Improve termination conditions)
     end
 end
 
@@ -967,9 +990,14 @@ end
 
     @testset "Termination condition: $(termination_condition) u0: $(_nameof(u0))" for termination_condition in TERMINATION_CONDITIONS,
         u0 in (1.0, [1.0, 1.0])
+<<<<<<< HEAD
 
         probN = NonlinearProblem(quadratic_f, u0, 2.0)
         @test all(solve(probN, LimitedMemoryBroyden();
+=======
+        probN = NonlinearProblem(quadratic_f, u0, 2.0)
+        @test all(solve(probN, LimitedMemoryBroyden();
+>>>>>>> 1a0df4e (Improve termination conditions)
             termination_condition).u .≈ sqrt(2.0))
     end
 end