diff --git a/lib/OrdinaryDiffEqBDF/test/inference_tests.jl b/lib/OrdinaryDiffEqBDF/test/inference_tests.jl index abef4a23960..6609725fc61 100644 --- a/lib/OrdinaryDiffEqBDF/test/inference_tests.jl +++ b/lib/OrdinaryDiffEqBDF/test/inference_tests.jl @@ -1,4 +1,5 @@ using OrdinaryDiffEqBDF, ADTypes, Test +using OrdinaryDiffEqNonlinearSolve: NonlinearSolveAlg using NonlinearSolve: TrustRegion import OrdinaryDiffEqCore.SciMLLogging as SciMLLogging using OrdinaryDiffEqCore: DEVerbosity @@ -6,7 +7,7 @@ using OrdinaryDiffEqCore: DEVerbosity prob = ODEProblem((du, u, p, t) -> du .= u, zeros(1), (0.0, 1.0)) nlalg = FBDF( autodiff = AutoFiniteDiff(), - nlsolve = OrdinaryDiffEqBDF.NonlinearSolveAlg(TrustRegion(autodiff = AutoFiniteDiff())) + nlsolve = NonlinearSolveAlg(TrustRegion(autodiff = AutoFiniteDiff())) ) basicalg = FBDF(autodiff = AutoFiniteDiff()) basicalgad = FBDF() diff --git a/lib/OrdinaryDiffEqDifferentiation/src/derivative_utils.jl b/lib/OrdinaryDiffEqDifferentiation/src/derivative_utils.jl index e6976fca45d..856978e9d33 100644 --- a/lib/OrdinaryDiffEqDifferentiation/src/derivative_utils.jl +++ b/lib/OrdinaryDiffEqDifferentiation/src/derivative_utils.jl @@ -93,8 +93,8 @@ function _rosenbrock_jac_reuse_decision(integrator, cache, dtgamma) # constraint derivatives must remain accurate. See Steinebach (2024). naccept = integrator.stats.naccept if integrator.f.mass_matrix !== I - if naccept > jac_reuse.last_naccept - jac_reuse.last_naccept = naccept + if naccept > jac_reuse.last_naccept + jac_reuse.last_naccept = naccept return (true, true) else return (false, true) diff --git a/lib/OrdinaryDiffEqFIRK/Project.toml b/lib/OrdinaryDiffEqFIRK/Project.toml index 5bb6ea070fb..370194148a1 100644 --- a/lib/OrdinaryDiffEqFIRK/Project.toml +++ b/lib/OrdinaryDiffEqFIRK/Project.toml @@ -58,7 +58,7 @@ Polyester = "0.7" DiffEqBase = "7" Reexport = "1.2.2" SafeTestsets = "0.1.0" -SciMLOperators = "1.15.0" +SciMLOperators = "1.23" [targets] test = ["DiffEqDevTools", "GenericSchur", "Random", "SafeTestsets", "Test", "ODEProblemLibrary", "Pkg"] diff --git a/lib/StochasticDiffEqCore/src/StochasticDiffEqCore.jl b/lib/StochasticDiffEqCore/src/StochasticDiffEqCore.jl index f470c59fd4c..d132a893261 100644 --- a/lib/StochasticDiffEqCore/src/StochasticDiffEqCore.jl +++ b/lib/StochasticDiffEqCore/src/StochasticDiffEqCore.jl @@ -51,6 +51,7 @@ using SparseArrays: SparseArrays, issparse # DEVerbosity is owned (and made public) by DiffEqBase but also re-exported # through OrdinaryDiffEqCore; import it from the owner. using DiffEqBase: DEVerbosity +using SciMLLogging: AbstractVerbosityPreset, Standard using LinearAlgebra: LinearAlgebra, I, mul! using Random: Random