CompatHelper: bump compat for SciMLBase to 3, (keep existing compat) (#194)

* CompatHelper: bump compat for SciMLBase to 3, (keep existing compat)

* allow new versions

* allow v2 of all OrdinaryDiffEq*.jl packages

* migrate to new versions

* bump compat for OrdinaryDiffEqCore to v4.2

* only allow new versions

* OrdinaryDiffEqFIRK

* use set_EEst!

* bump versions according to Downgrade CI

* bump more compats for Downgrade

* import SciMLBase

* fix length

* bump compat of SciMLBase.jl to v3.7 to fix Downgrade

---------

Co-authored-by: CompatHelper Julia <compathelper_noreply@julialang.org>
Co-authored-by: Joshua Lampert <51029046+JoshuaLampert@users.noreply.github.com>

Author: 3 people

Project.toml

@@ -24,15 +24,15 @@ JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
 JuMPExt = "JuMP"
 
 [compat]
-FastBroadcast = "0.3.5, 1"
+FastBroadcast = "1.3"
 JuMP = "1.28"
 LinearAlgebra = "1"
-LinearSolve = "3.54"
+LinearSolve = "3.75"
 MuladdMacro = "0.2.4"
-OrdinaryDiffEqCore = "3.0.1"
+OrdinaryDiffEqCore = "4.2"
 RecipesBase = "1.3.4"
 Reexport = "1.2.2"
-SciMLBase = "2.128"
+SciMLBase = "3.7"
 SparseArrays = "1"
 StaticArrays = "1.9.8"
 Statistics = "1"

docs/Project.toml

@@ -25,21 +25,21 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 [compat]
 BenchmarkTools = "1"
 Clarabel = "0.11"
-DiffEqBase = "6.160"
+DiffEqBase = "7"
 DiffEqCallbacks = "4"
-DiffEqDevTools = "2.45.1"
+DiffEqDevTools = "3"
 Documenter = "1"
 DoubleFloats = "1.4"
 InteractiveUtils = "1"
 JuMP = "1.28"
 LinearAlgebra = "1"
 LinearSolve = "3.7.1"
-OrdinaryDiffEqFIRK = "1.7"
-OrdinaryDiffEqLowOrderRK = "1.2"
-OrdinaryDiffEqRosenbrock = "1.4"
-OrdinaryDiffEqSDIRK = "1.2"
-OrdinaryDiffEqTsit5 = "1.1"
-OrdinaryDiffEqVerner = "1.1"
+OrdinaryDiffEqFIRK = "2"
+OrdinaryDiffEqLowOrderRK = "2"
+OrdinaryDiffEqRosenbrock = "2"
+OrdinaryDiffEqSDIRK = "2"
+OrdinaryDiffEqTsit5 = "2"
+OrdinaryDiffEqVerner = "2"
 Pkg = "1"
 Plots = "1"
 PrettyTables = "3"

src/PositiveIntegrators.jl

@@ -8,7 +8,7 @@ using SparseArrays: SparseArrays, AbstractSparseMatrix, SparseMatrixCSC,
                     issparse, nonzeros, nzrange, rowvals, spdiagm
 using StaticArrays: SVector, SMatrix, StaticArray, StaticMatrix, @SVector, @SMatrix, MMatrix
 
-using FastBroadcast: @..
+using FastBroadcast: @.., Serial
 using MuladdMacro: @muladd
 
 using Reexport: @reexport
@@ -25,18 +25,17 @@ using SymbolicIndexingInterface: SymbolicIndexingInterface
 
 using LinearSolve: LinearSolve, LinearProblem, LUFactorization, solve!
 
-import SciMLBase: interp_summary
+import SciMLBase: SciMLBase, interp_summary
 
 using OrdinaryDiffEqCore: OrdinaryDiffEqAdaptiveAlgorithm,
                           OrdinaryDiffEqConstantCache, OrdinaryDiffEqMutableCache,
-                          False,
                           _vec
 import OrdinaryDiffEqCore: alg_order, isfsal,
                            calculate_residuals, calculate_residuals!,
                            alg_cache, get_tmp_cache,
                            initialize!, perform_step!,
                            _ode_interpolant, _ode_interpolant!,
-                           get_fsalfirstlast
+                           get_fsalfirstlast, set_EEst!
 
 using RecipesBase: @recipe
 

src/mpdec.jl

@@ -606,7 +606,7 @@ end
     tmp = u - u1
     atmp = calculate_residuals(tmp, uprev, u, integrator.opts.abstol,
                                integrator.opts.reltol, integrator.opts.internalnorm, t)
-    integrator.EEst = integrator.opts.internalnorm(atmp, t)
+    set_EEst!(integrator, integrator.opts.internalnorm(atmp, t))
 
     integrator.u = u
 end
@@ -739,8 +739,8 @@ end
     # Now tmp stores error residuals
     calculate_residuals!(tmp, σ, uprev, u, integrator.opts.abstol,
                          integrator.opts.reltol, integrator.opts.internalnorm, t,
-                         False())
-    integrator.EEst = integrator.opts.internalnorm(tmp, t)
+                         Serial())
+    set_EEst!(integrator, integrator.opts.internalnorm(tmp, t))
 end
 
 @muladd function perform_step!(integrator, cache::MPDeCConservativeCache,
@@ -783,6 +783,6 @@ end
     # Now tmp stores error residuals
     calculate_residuals!(tmp, σ, uprev, u, integrator.opts.abstol,
                          integrator.opts.reltol, integrator.opts.internalnorm, t,
-                         False())
-    integrator.EEst = integrator.opts.internalnorm(tmp, t)
+                         Serial())
+    set_EEst!(integrator, integrator.opts.internalnorm(tmp, t))
 end

src/mprk.jl

@@ -31,7 +31,7 @@ end
 
 ### evaluate_pds ######################################################
 # evaluate_pds is used in out-of-place implementations to evaluate
-# the production and destruction terms 
+# the production and destruction terms
 @inline function evaluate_pds(f::PDSFunction, u, p, t)
     P = f.p(u, p, t)
     d = f.d(u, p, t)
@@ -55,7 +55,7 @@ end
 end
 
 ### lincomb and lincomb! ###############################################
-# These functions are used to compute linear combinations of production 
+# These functions are used to compute linear combinations of production
 # matrices and/or destruction vectors.
 
 # out-of-place versions
@@ -97,7 +97,7 @@ end
     return nothing
 end
 
-# in-place version for sparse matrices 
+# in-place version for sparse matrices
 @muladd @generated function lincomb!(dest::SparseMatrixCSC, pairs...)
     n = length(pairs) ÷ 2
     nz_names = [Symbol("nz_", i) for i in 1:n]
@@ -188,10 +188,10 @@ end
 end
 
 ### build_mprk_matrix ############################################################
-# These functions build the system matrix M that needs to be solved in each 
+# These functions build the system matrix M that needs to be solved in each
 # Patankar step.
 
-# out-of-place for dense matrices 
+# out-of-place for dense matrices
 function build_mprk_matrix(P, sigma, dt, d = nothing)
     # re-use the in-place version implemented below
     M = similar(P)
@@ -723,7 +723,7 @@ end
     tmp = u - σ
     atmp = calculate_residuals(tmp, uprev, u, integrator.opts.abstol,
                                integrator.opts.reltol, integrator.opts.internalnorm, t)
-    integrator.EEst = integrator.opts.internalnorm(atmp, t)
+    set_EEst!(integrator, integrator.opts.internalnorm(atmp, t))
 
     integrator.u = u
 end
@@ -838,8 +838,8 @@ end
     # Now tmp stores error residuals
     calculate_residuals!(tmp, σ, uprev, u, integrator.opts.abstol,
                          integrator.opts.reltol, integrator.opts.internalnorm, t,
-                         False())
-    integrator.EEst = integrator.opts.internalnorm(tmp, t)
+                         Serial())
+    set_EEst!(integrator, integrator.opts.internalnorm(tmp, t))
 end
 
 ### MPRK43 #####################################################################################
@@ -1131,7 +1131,7 @@ end
     tmp = u - σ
     atmp = calculate_residuals(tmp, uprev, u, integrator.opts.abstol,
                                integrator.opts.reltol, integrator.opts.internalnorm, t)
-    integrator.EEst = integrator.opts.internalnorm(atmp, t)
+    set_EEst!(integrator, integrator.opts.internalnorm(atmp, t))
 
     integrator.u = u
 end
@@ -1275,8 +1275,8 @@ end
     # Now tmp2 stores error residuals
     calculate_residuals!(tmp2, tmp, uprev, u, integrator.opts.abstol,
                          integrator.opts.reltol, integrator.opts.internalnorm, t,
-                         False())
-    integrator.EEst = integrator.opts.internalnorm(tmp2, t)
+                         Serial())
+    set_EEst!(integrator, integrator.opts.internalnorm(tmp2, t))
 end
 
 ########################################################################################

src/sspmprk.jl

@@ -169,7 +169,7 @@ end
     tmp = u - σ2
     atmp = calculate_residuals(tmp, uprev, u, integrator.opts.abstol,
                                integrator.opts.reltol, integrator.opts.internalnorm, t)
-    integrator.EEst = integrator.opts.internalnorm(atmp, t)
+    set_EEst!(integrator, integrator.opts.internalnorm(atmp, t))
 
     integrator.u = u
 end
@@ -287,8 +287,8 @@ end
     # Now tmp stores error residuals
     calculate_residuals!(tmp, σ, uprev, u, integrator.opts.abstol,
                          integrator.opts.reltol, integrator.opts.internalnorm, t,
-                         False())
-    integrator.EEst = integrator.opts.internalnorm(tmp, t)
+                         Serial())
+    set_EEst!(integrator, integrator.opts.internalnorm(tmp, t))
 end
 
 """
@@ -514,7 +514,7 @@ end
     tmp = u - σ
     atmp = calculate_residuals(tmp, uprev, u, integrator.opts.abstol,
                                integrator.opts.reltol, integrator.opts.internalnorm, t)
-    integrator.EEst = integrator.opts.internalnorm(atmp, t)
+    set_EEst!(integrator, integrator.opts.internalnorm(atmp, t))
     =#
 
     integrator.u = u
@@ -677,7 +677,7 @@ end
     # Now tmp2 stores error residuals
     calculate_residuals!(tmp2, tmp, uprev, u, integrator.opts.abstol,
                          integrator.opts.reltol, integrator.opts.internalnorm, t,
-                         False())
-    integrator.EEst = integrator.opts.internalnorm(tmp2, t)
+                         Serial())
+    set_EEst!(integrator, integrator.opts.internalnorm(tmp2, t))
     =#
 end

src/utilities.jl

@@ -159,7 +159,7 @@ function work_precision_fixed!(dict, prob, algs, labels, dts, alg_ref;
                 error_time[i] = (Inf, Inf)
                 try
                     sol = solve(prob, alg; dt, adaptive = false, save_everystep = true)
-                    if Int(sol.retcode) == 1 && isnonnegative(sol)
+                    if SciMLBase.successful_retcode(sol) && isnonnegative(sol)
                         error = compute_error(sol, ref_sol(sol.t))
                         time = compute_time_fixed(dt, prob, alg, seconds, numruns)
 
@@ -240,7 +240,7 @@ function work_precision_adaptive!(dict, prob, algs, labels, abstols, reltols, al
             sol = solve(prob, alg; abstol, reltol, save_everystep = true,
                         kwargs...)
 
-            if Int(sol.retcode) == 1 && isnonnegative(sol)
+            if SciMLBase.successful_retcode(sol) && isnonnegative(sol)
                 error = compute_error(sol, ref_sol(sol.t))
                 time = compute_time_adaptive(abstol, reltol, prob, alg, seconds, numruns,
                                              kwargs...)

test/Project.toml

@@ -15,6 +15,7 @@ OrdinaryDiffEqVerner = "79d7bb75-1356-48c1-b8c0-6832512096c2"
 Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
 RecursiveFactorization = "f2c3362d-daeb-58d1-803e-2bc74f2840b4"
+SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
@@ -24,20 +25,21 @@ Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 [compat]
 ADTypes = "1.16"
 Aqua = "0.8"
-Clarabel = "0.11"
+Clarabel = "0.11.1"
 DoubleFloats = "1.4.3"
 ExplicitImports = "1.0.1"
 JuMP = "1.28"
 LinearAlgebra = "1"
-LinearSolve = "3.54"
-OrdinaryDiffEqLowOrderRK = "1.10"
-OrdinaryDiffEqRosenbrock = "1.22"
-OrdinaryDiffEqSDIRK = "1.11"
-OrdinaryDiffEqTsit5 = "1.9"
-OrdinaryDiffEqVerner = "1.10"
-Plots = "1.38.9"
+LinearSolve = "3.75"
+OrdinaryDiffEqLowOrderRK = "2"
+OrdinaryDiffEqRosenbrock = "2"
+OrdinaryDiffEqSDIRK = "2"
+OrdinaryDiffEqTsit5 = "2"
+OrdinaryDiffEqVerner = "2"
+Plots = "1.38.13"
 RecipesBase = "1.3.4"
 RecursiveFactorization = "0.2.26"
+SciMLBase = "3.7"
 SparseArrays = "1"
 StaticArrays = "1.9.8"
 Statistics = "1"

test/runtests.jl

@@ -15,6 +15,7 @@ using OrdinaryDiffEqSDIRK: ImplicitEuler, SDIRK2, TRBDF2
 using OrdinaryDiffEqTsit5: Tsit5
 using OrdinaryDiffEqVerner: Vern7, Vern9
 using PositiveIntegrators
+import SciMLBase
 
 using Clarabel
 using JuMP
@@ -2375,7 +2376,7 @@ end
                     # later versions of OrdinaryDiffEq.jl use dtmin = 0 by default,
                     # see https://github.com/SciML/OrdinaryDiffEq.jl/pull/2098
                     sol = solve(prob, alg; dtmin = 0.0)
-                    @test Int(sol.retcode) == 1
+                    @test SciMLBase.successful_retcode(sol)
                 end
             end
         end
@@ -2392,7 +2393,7 @@ end
                     tspan = prob.tspan
                     dt = (tspan[2] - tspan[1]) / 10
                     sol = solve(prob, alg; dt = dt)
-                    @test Int(sol.retcode) == 1
+                    @test SciMLBase.successful_retcode(sol)
                 end
             end
         end
@@ -2576,7 +2577,7 @@ end
             sol_cb = solve(prob_ode_stratreac_scaled, ROS2(); save_everystep = false,
                            callback = cb)
 
-            @test length(sol_cb) == 2
+            @test length(sol_cb.t) == 2
         end
 
         @testset "Sandu projection get_numsteps_SanduProjection" begin