Merge branch 'master' into eisenstat-walker-rebased

Author: ChrisRackauckas

Project.toml

@@ -22,6 +22,7 @@ NonlinearSolveQuasiNewton = "9a2c21bd-3a47-402d-9113-8faf9a0ee114"
 NonlinearSolveSpectralMethods = "26075421-4e9a-44e1-8bd1-420ed7ad02b2"
 PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
 Preferences = "21216c6a-2e73-6563-6e65-726566657250"
+ReTestItems = "817f1d60-ba6b-4fd5-9520-3cf149f6a823"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 SciMLLogging = "a6db7da4-7206-11f0-1eab-35f2a5dbe1d1"
@@ -44,23 +45,13 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 SpeedMapping = "f1835b91-879b-4a3f-a438-e4baacf14412"
 Sundials = "c3572dad-4567-51f8-b174-8c6c989267f4"
 
-[sources.BracketingNonlinearSolve]
-path = "lib/BracketingNonlinearSolve"
-
-[sources.NonlinearSolveBase]
-path = "lib/NonlinearSolveBase"
-
-[sources.NonlinearSolveFirstOrder]
-path = "lib/NonlinearSolveFirstOrder"
-
-[sources.NonlinearSolveQuasiNewton]
-path = "lib/NonlinearSolveQuasiNewton"
-
-[sources.NonlinearSolveSpectralMethods]
-path = "lib/NonlinearSolveSpectralMethods"
-
-[sources.SimpleNonlinearSolve]
-path = "lib/SimpleNonlinearSolve"
+[sources]
+BracketingNonlinearSolve = {path = "lib/BracketingNonlinearSolve"}
+NonlinearSolveBase = {path = "lib/NonlinearSolveBase"}
+NonlinearSolveFirstOrder = {path = "lib/NonlinearSolveFirstOrder"}
+NonlinearSolveQuasiNewton = {path = "lib/NonlinearSolveQuasiNewton"}
+NonlinearSolveSpectralMethods = {path = "lib/NonlinearSolveSpectralMethods"}
+SimpleNonlinearSolve = {path = "lib/SimpleNonlinearSolve"}
 
 [extensions]
 NonlinearSolveFastLevenbergMarquardtExt = "FastLevenbergMarquardt"

lib/NonlinearSolveBase/Project.toml

@@ -1,7 +1,7 @@
 name = "NonlinearSolveBase"
 uuid = "be0214bd-f91f-a760-ac4e-3421ce2b2da0"
 authors = ["Avik Pal <[email protected]> and contributors"]
-version = "2.6.0"
+version = "2.7.0"
 
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"

lib/NonlinearSolveBase/src/NonlinearSolveBase.jl

@@ -29,7 +29,7 @@ import SciMLBase: solve, init, __init, __solve, wrap_sol, get_root_indp, isinpla
 using SciMLJacobianOperators: JacobianOperator, StatefulJacobianOperator
 using SciMLOperators: AbstractSciMLOperator, IdentityOperator
 using SciMLLogging: SciMLLogging, @SciMLMessage, @verbosity_specifier,
-                    AbstractVerbositySpecifier, AbstractVerbosityPreset,
+                    AbstractVerbositySpecifier, AbstractVerbosityPreset, AbstractMessageLevel,
                     None, Minimal, Standard, Detailed, All, Silent, InfoLevel, WarnLevel
 
 using SymbolicIndexingInterface: SymbolicIndexingInterface

lib/NonlinearSolveBase/src/verbosity.jl

@@ -16,6 +16,9 @@ diagnostic messages, warnings, and errors during nonlinear system solution.
 - `threshold_state`: Messages about threshold state in low-rank methods
 - `forcing`: Messages about forcing parameter in Newton-Krylov methods
 
+## Sensitivity Group
+- `sensitivity_vjp_choice`: Messages about VJP choice in sensitivity analysis (used by SciMLSensitivity.jl)
+
 ## Linear Solver Group
 - `linear_verbosity`: Verbosity configuration for linear solvers
 
@@ -30,7 +33,7 @@ Create a `NonlinearVerbosity` using a preset configuration:
 - `SciMLLogging.Detailed()`: Comprehensive debugging information
 - `SciMLLogging.All()`: Maximum verbosity
 
-    NonlinearVerbosity(; error_control=nothing, numerical=nothing, linear_verbosity=nothing, kwargs...)
+    NonlinearVerbosity(; error_control=nothing, numerical=nothing, sensitivity=nothing, linear_verbosity=nothing, kwargs...)
 
 Create a `NonlinearVerbosity` with group-level or individual field control.
 
@@ -63,7 +66,8 @@ NonlinearVerbosity
 
 @verbosity_specifier NonlinearVerbosity begin
     toggles = (:linear_verbosity, :non_enclosing_interval, :alias_u0_immutable,
-        :linsolve_failed_noncurrent, :termination_condition, :threshold_state, :forcing)
+        :linsolve_failed_noncurrent, :termination_condition, :threshold_state, :forcing,
+        :sensitivity_vjp_choice)
 
     presets = (
         None = (
@@ -74,6 +78,7 @@ NonlinearVerbosity
             termination_condition = Silent(),
             threshold_state = Silent(),
             forcing = Silent()
+            sensitivity_vjp_choice = Silent()
         ),
         Minimal = (
             linear_verbosity = None(),
@@ -83,6 +88,7 @@ NonlinearVerbosity
             termination_condition = Silent(),
             threshold_state = Silent(),
             forcing = Silent()
+            sensitivity_vjp_choice = Silent()
         ),
         Standard = (
             linear_verbosity = None(),
@@ -92,6 +98,7 @@ NonlinearVerbosity
             termination_condition = WarnLevel(),
             threshold_state = WarnLevel(),
             forcing = InfoLevel()
+            sensitivity_vjp_choice = WarnLevel()
         ),
         Detailed = (
             linear_verbosity = Detailed(),
@@ -101,6 +108,7 @@ NonlinearVerbosity
             termination_condition = WarnLevel(),
             threshold_state = WarnLevel(),
             forcing = InfoLevel()
+            sensitivity_vjp_choice = WarnLevel()
         ),
         All = (
             linear_verbosity = Detailed(),
@@ -110,12 +118,14 @@ NonlinearVerbosity
             termination_condition = WarnLevel(),
             threshold_state = InfoLevel(),
             forcing = InfoLevel()
+            sensitivity_vjp_choice = WarnLevel()
         )
     )
 
     groups = (
         error_control = (:non_enclosing_interval, :alias_u0_immutable,
             :linsolve_failed_noncurrent, :termination_condition),
         numerical = (:threshold_state, :forcing)
+        sensitivity = (:sensitivity_vjp_choice,)
     )
 end

lib/SciMLJacobianOperators/Project.toml

@@ -1,6 +1,6 @@
 name = "SciMLJacobianOperators"
 uuid = "19f34311-ddf3-4b8b-af20-060888a46c0e"
-version = "0.1.13"
+version = "0.1.12"
 authors = ["Avik Pal <[email protected]> and contributors"]
 
 [deps]

test/verbosity_tests.jl

@@ -16,19 +16,24 @@
         @test v_none.non_enclosing_interval isa SciMLLogging.Silent
         @test v_none.threshold_state isa SciMLLogging.Silent
         @test v_none.alias_u0_immutable isa SciMLLogging.Silent
+        @test v_none.sensitivity_vjp_choice isa SciMLLogging.Silent
 
         @test v_minimal.non_enclosing_interval isa SciMLLogging.WarnLevel
         @test v_minimal.alias_u0_immutable isa SciMLLogging.Silent
         @test v_minimal.termination_condition isa SciMLLogging.Silent
+        @test v_minimal.sensitivity_vjp_choice isa SciMLLogging.Silent
 
         @test v_standard.non_enclosing_interval isa SciMLLogging.WarnLevel
         @test v_standard.threshold_state isa SciMLLogging.WarnLevel
+        @test v_standard.sensitivity_vjp_choice isa SciMLLogging.WarnLevel
 
         @test v_detailed.alias_u0_immutable isa SciMLLogging.WarnLevel
         @test v_detailed.termination_condition isa SciMLLogging.WarnLevel
+        @test v_detailed.sensitivity_vjp_choice isa SciMLLogging.WarnLevel
 
         @test v_all.linsolve_failed_noncurrent isa SciMLLogging.WarnLevel
         @test v_all.threshold_state isa SciMLLogging.InfoLevel
+        @test v_all.sensitivity_vjp_choice isa SciMLLogging.WarnLevel
     end
 
     @testset "Group-level keyword constructors" begin
@@ -40,6 +45,12 @@
 
         v_numerical = NonlinearVerbosity(numerical = SciMLLogging.Silent())
         @test v_numerical.threshold_state isa SciMLLogging.Silent
+
+        v_sensitivity = NonlinearVerbosity(sensitivity = SciMLLogging.Silent())
+        @test v_sensitivity.sensitivity_vjp_choice isa SciMLLogging.Silent
+
+        v_sensitivity2 = NonlinearVerbosity(sensitivity = SciMLLogging.InfoLevel())
+        @test v_sensitivity2.sensitivity_vjp_choice isa SciMLLogging.InfoLevel
     end
 
     @testset "Mixed group and individual settings" begin