Merge pull request #2311 from SciML/cleanup

reconfigure CI testing to actually test the submodules in isolation

Author: ChrisRackauckas

.github/workflows/CI.yml

@@ -24,16 +24,36 @@ jobs:
           - Downstream
           - ODEInterfaceRegression
           - Multithreading
-          - FIRK
-          - Symplectic
-          - Extrapolation
-          - Feagin
-          - StabilizedRK
-          - StabilizedIRK
-          - SSPRK
-          - LowStorageRK
-          - QPRK
-          - Linear
+
+          - OrdinaryDiffEqAdamsBashforthMoulton
+          - OrdinaryDiffEqBDF
+          - OrdinaryDiffEqDefault
+          - OrdinaryDiffEqDifferentiation
+          - OrdinaryDiffEqExplicitRK
+          - OrdinaryDiffEqExponentialRK
+          - OrdinaryDiffEqExtrapolation
+          - OrdinaryDiffEqFIRK
+          - OrdinaryDiffEqFeagin
+          - OrdinaryDiffEqFunctionMap
+          - OrdinaryDiffEqHighOrderRK
+          - OrdinaryDiffEqIMEXMultistep
+          - OrdinaryDiffEqLinear
+          - OrdinaryDiffEqLowOrderRK
+          - OrdinaryDiffEqLowStorageRK
+          - OrdinaryDiffEqNordsieck
+          - OrdinaryDiffEqPDIRK
+          - OrdinaryDiffEqPRK
+          - OrdinaryDiffEqQPRK
+          - OrdinaryDiffEqRKN
+          - OrdinaryDiffEqRosenbrock
+          - OrdinaryDiffEqSDIRK
+          - OrdinaryDiffEqSSPRK
+          - OrdinaryDiffEqStabilizedIRK
+          - OrdinaryDiffEqStabilizedRK
+          - OrdinaryDiffEqSymplecticRK
+          - OrdinaryDiffEqTsit5
+          - OrdinaryDiffEqVerner
+
         version:
           - '1'
     steps:

lib/OrdinaryDiffEqAdamsBashforthMoulton/Project.toml

@@ -17,9 +17,10 @@ julia = "1.10"
 
 [extras]
 DiffEqDevTools = "f3b72e0c-5b89-59e1-b016-84e28bfd966d"
+ODEProblemLibrary = "fdc4e326-1af4-4b90-96e7-779fcce2daa5"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["DiffEqDevTools", "Random", "SafeTestsets", "Test"]
+test = ["DiffEqDevTools", "ODEProblemLibrary", "Random", "SafeTestsets", "Test"]

lib/OrdinaryDiffEqAdamsBashforthMoulton/test/abm_convergence_tests.jl

@@ -0,0 +1,39 @@
+# This definitely needs cleaning
+using OrdinaryDiffEq, ODEProblemLibrary, DiffEqDevTools
+using Test, Random
+Random.seed!(100)
+
+## Convergence Testing
+dts1 = 1 .// 2 .^ (9:-1:5)
+dts = 1 .// 2 .^ (8:-1:4)
+testTol = 0.2
+
+@testset "Explicit Solver Convergence Tests ($(["out-of-place", "in-place"][i]))" for i in 1:2
+    prob = (ODEProblemLibrary.prob_ode_linear,
+        ODEProblemLibrary.prob_ode_2Dlinear)[i]
+
+    sim5 = test_convergence(dts, prob, AB3())
+    @test sim5.𝒪est[:l2]≈3 atol=testTol
+    sim6 = test_convergence(dts, prob, ABM32())
+    @test sim6.𝒪est[:l2]≈3 atol=testTol
+    sim7 = test_convergence(dts, prob, AB4())
+    @test sim7.𝒪est[:l2]≈4 atol=testTol
+    sim8 = test_convergence(dts1, prob, ABM43())  #using dts1 due to floating point error in convergence test
+    @test sim8.𝒪est[:l2]≈4 atol=testTol
+    sim9 = test_convergence(dts, prob, AB5())
+    @test sim9.𝒪est[:l2]≈5 atol=testTol
+    sim10 = test_convergence(dts, prob, ABM54())
+    @test sim10.𝒪est[:l2]≈5 atol=testTol
+    sim101 = test_convergence(dts, prob, VCAB3())
+    @test sim101.𝒪est[:l2]≈3 atol=testTol
+    sim102 = test_convergence(dts, prob, VCAB4())
+    @test sim102.𝒪est[:l2]≈4 atol=testTol
+    sim103 = test_convergence(dts, prob, VCAB5())
+    @test sim103.𝒪est[:l2]≈5 atol=testTol
+    sim104 = test_convergence(dts, prob, VCABM3())
+    @test sim104.𝒪est[:l2]≈3 atol=testTol
+    sim105 = test_convergence(dts, prob, VCABM4())
+    @test sim105.𝒪est[:l2]≈4 atol=testTol
+    sim106 = test_convergence(dts, prob, VCABM5())
+    @test sim106.𝒪est[:l2]≈5 atol=testTol
+end

lib/OrdinaryDiffEqAdamsBashforthMoulton/test/runtests.jl

@@ -1,3 +1,4 @@
 using SafeTestsets
 
-@time @safetestset "Adams Variable Coefficients Tests" include("adams_tests.jl")
+@time @safetestset "ABM Convergence Tests" include("abm_convergence_tests.jl")
+@time @safetestset "Adams Variable Coefficients Tests" include("adams_tests.jl")

lib/OrdinaryDiffEqBDF/Project.toml

@@ -16,6 +16,7 @@ ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
 
 [extras]
 DiffEqDevTools = "f3b72e0c-5b89-59e1-b016-84e28bfd966d"
+ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
@@ -24,4 +25,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 julia = "1.10"
 
 [targets]
-test = ["DiffEqDevTools", "Random", "SafeTestsets", "Test"]
+test = ["DiffEqDevTools", "ForwardDiff", "Random", "SafeTestsets", "Test"]

lib/OrdinaryDiffEqBDF/test/bdf_convergence_tests.jl

@@ -0,0 +1,66 @@
+# This definitely needs cleaning
+using OrdinaryDiffEq, ODEProblemLibrary, DiffEqDevTools
+using Test, Random
+Random.seed!(100)
+
+testTol = 0.2
+
+@testset "Implicit Solver Convergence Tests ($(["out-of-place", "in-place"][i]))" for i in 1:2
+    prob = (ODEProblemLibrary.prob_ode_linear,
+        ODEProblemLibrary.prob_ode_2Dlinear)[i]
+
+    sim = test_convergence(dts, prob, ABDF2())
+    @test sim.𝒪est[:final]≈2 atol=testTol
+    @test sim.𝒪est[:l2]≈2 atol=testTol
+    @test sim.𝒪est[:l∞]≈2 atol=testTol
+
+    sim = test_convergence(dts, prob, ABDF2(nlsolve = NLFunctional()))
+    @test sim.𝒪est[:final]≈2 atol=testTol
+    @test sim.𝒪est[:l2]≈2 atol=testTol
+    @test sim.𝒪est[:l∞]≈2 atol=testTol
+
+    # QBDF
+    sim = test_convergence(dts, prob, QBDF1())
+    @test sim.𝒪est[:final]≈1 atol=testTol
+    @test sim.𝒪est[:l2]≈1 atol=testTol
+    @test sim.𝒪est[:l∞]≈1 atol=testTol
+
+    sim = test_convergence(dts, prob, QBDF2())
+    @test sim.𝒪est[:final]≈2 atol=testTol
+    @test sim.𝒪est[:l2]≈2 atol=testTol
+    @test sim.𝒪est[:l∞]≈2 atol=testTol
+
+    # QNDF
+    sim = test_convergence(dts, prob, QNDF1())
+    @test sim.𝒪est[:final]≈1 atol=testTol
+    @test sim.𝒪est[:l2]≈1 atol=testTol
+    @test sim.𝒪est[:l∞]≈1 atol=testTol
+
+    sim = test_convergence(dts3, prob, QNDF2())
+    @test sim.𝒪est[:final]≈2 atol=testTol
+    @test sim.𝒪est[:l2]≈2 atol=testTol
+    @test sim.𝒪est[:l∞]≈2 atol=testTol
+
+    sim = test_convergence(dts, prob, QNDF2(nlsolve = NLFunctional()))
+    @test sim.𝒪est[:final]≈2 atol=testTol
+    @test sim.𝒪est[:l2]≈2 atol=testTol
+    @test sim.𝒪est[:l∞]≈2 atol=testTol
+    @test_nowarn solve(prob, QNDF())
+
+    # MEBDF2
+    sim21 = test_convergence(dts, prob, MEBDF2(extrapolant = :linear))
+    @test sim21.𝒪est[:final]≈2 atol=testTol
+
+    sim22 = test_convergence(dts, prob, MEBDF2(nlsolve = NLFunctional()), reltol = 1e-2)
+    @test sim22.𝒪est[:final]≈2 atol=testTol
+
+    sim23 = test_convergence(dts, prob, MEBDF2(nlsolve = NLAnderson()), reltol = 1e-2)
+    @test sim23.𝒪est[:final]≈2 atol=testTol
+
+    sim24 = test_convergence(
+        dts, prob, MEBDF2(nlsolve = NonlinearSolveAlg()), reltol = 1e-2)
+    @test sim24.𝒪est[:final]≈2 atol=testTol
+
+    #FBDF
+    @test_nowarn solve(prob, FBDF())
+end

lib/OrdinaryDiffEqBDF/test/dae_ad_tests.jl

@@ -1,30 +1,5 @@
 using OrdinaryDiffEq, LinearAlgebra, ForwardDiff, Test
 
-function rober(du, u, p, t)
-    y₁, y₂, y₃ = u
-    k₁, k₂, k₃ = p
-    du[1] = -k₁ * y₁ + k₃ * y₂ * y₃
-    du[2] = k₁ * y₁ - k₃ * y₂ * y₃ - k₂ * y₂^2
-    du[3] = y₁ + y₂ + y₃ - 1
-    nothing
-end
-function rober(u, p, t)
-    y₁, y₂, y₃ = u
-    k₁, k₂, k₃ = p
-    [-k₁ * y₁ + k₃ * y₂ * y₃,
-        k₁ * y₁ - k₃ * y₂ * y₃ - k₂ * y₂^2,
-        y₁ + y₂ + y₃ - 1]
-end
-M = [1.0 0 0
-     0 1.0 0
-     0 0 0]
-roberf = ODEFunction(rober, mass_matrix = M)
-roberf_oop = ODEFunction{false}(rober, mass_matrix = M)
-prob_mm = ODEProblem(roberf, [1.0, 0.0, 0.2], (0.0, 1e5), (0.04, 3e7, 1e4))
-prob_mm_oop = ODEProblem(roberf_oop, [1.0, 0.0, 0.2], (0.0, 1e5), (0.04, 3e7, 1e4))
-sol = solve(prob_mm, Rodas5P(), reltol = 1e-8, abstol = 1e-8)
-sol = solve(prob_mm_oop, Rodas5P(), reltol = 1e-8, abstol = 1e-8)
-
 function f(out, du, u, p, t)
     out[1] = -p[1] * u[1] + p[3] * u[2] * u[3] - du[1]
     out[2] = +p[1] * u[1] - p[2] * u[2]^2 - p[3] * u[2] * u[3] - du[2]
@@ -47,10 +22,10 @@ sol1 = solve(prob, DFBDF(), dt = 1e-5, abstol = 1e-8, reltol = 1e-8)
 # These tests flex differentiation of the solver and through the initialization
 # To only test the solver part and isolate potential issues, set the initialization to consistent
 @testset "Inplace: $(isinplace(_prob)), DAEProblem: $(_prob isa DAEProblem), BrownBasic: $(initalg isa BrownFullBasicInit), Autodiff: $autodiff" for _prob in [
-        prob, prob_mm, prob_oop, prob_mm_oop],
+        prob, prob_oop],
     initalg in [BrownFullBasicInit(), ShampineCollocationInit()], autodiff in [true, false]
 
-    alg = _prob isa DAEProblem ? DFBDF(; autodiff) : Rodas5P(; autodiff)
+    alg = DFBDF(; autodiff)
     function f(p)
         sol = solve(remake(_prob, p = p), alg, abstol = 1e-14,
             reltol = 1e-14, initializealg = initalg)

lib/OrdinaryDiffEqBDF/test/dae_initialization_tests.jl

@@ -1,102 +1,5 @@
 using OrdinaryDiffEq, StaticArrays, LinearAlgebra, Test
 
-## Mass Matrix
-
-function rober_oop(u, p, t)
-    y₁, y₂, y₃ = u
-    k₁, k₂, k₃ = p
-    du1 = -k₁ * y₁ + k₃ * y₂ * y₃
-    du2 = k₁ * y₁ - k₃ * y₂ * y₃ - k₂ * y₂^2
-    du3 = y₁ + y₂ + y₃ - 1
-    [du1, du2, du3]
-end
-M = [1.0 0 0
-     0 1.0 0
-     0 0 0]
-f_oop = ODEFunction(rober_oop, mass_matrix = M)
-prob_mm = ODEProblem(f_oop, [1.0, 0.0, 0.0], (0.0, 1e5), (0.04, 3e7, 1e4))
-sol = solve(prob_mm, Rosenbrock23(autodiff = false), reltol = 1e-8, abstol = 1e-8)
-@test sol[1] == [1.0, 0.0, 0.0] # Ensure initialization is unchanged if it works at the start!
-sol = solve(prob_mm, Rosenbrock23(), reltol = 1e-8, abstol = 1e-8,
-    initializealg = ShampineCollocationInit())
-@test sol[1] == [1.0, 0.0, 0.0] # Ensure initialization is unchanged if it works at the start!
-
-prob_mm = ODEProblem(f_oop, [1.0, 0.0, 0.2], (0.0, 1e5), (0.04, 3e7, 1e4))
-sol = solve(prob_mm, Rosenbrock23(), reltol = 1e-8, abstol = 1e-8)
-@test sum(sol[1]) ≈ 1
-@test sol[1] ≈ [1.0, 0.0, 0.0]
-for alg in [Rosenbrock23(autodiff = false), Trapezoid()]
-    local sol
-    sol = solve(prob_mm, alg, reltol = 1e-8, abstol = 1e-8,
-        initializealg = ShampineCollocationInit())
-    @test sum(sol[1]) ≈ 1
-end
-
-function rober(du, u, p, t)
-    y₁, y₂, y₃ = u
-    k₁, k₂, k₃ = p
-    du[1] = -k₁ * y₁ + k₃ * y₂ * y₃
-    du[2] = k₁ * y₁ - k₃ * y₂ * y₃ - k₂ * y₂^2
-    du[3] = y₁ + y₂ + y₃ - 1
-    nothing
-end
-M = [1.0 0 0
-     0 1.0 0
-     0 0 0]
-f = ODEFunction(rober, mass_matrix = M)
-prob_mm = ODEProblem(f, [1.0, 0.0, 0.0], (0.0, 1e5), (0.04, 3e7, 1e4))
-sol = solve(prob_mm, Rodas5(autodiff = false), reltol = 1e-8, abstol = 1e-8)
-@test sol[1] == [1.0, 0.0, 0.0] # Ensure initialization is unchanged if it works at the start!
-sol = solve(prob_mm, Rodas5(), reltol = 1e-8, abstol = 1e-8,
-    initializealg = ShampineCollocationInit())
-@test sol[1] == [1.0, 0.0, 0.0] # Ensure initialization is unchanged if it works at the start!
-
-prob_mm = ODEProblem(f, [1.0, 0.0, 1.0], (0.0, 1e5), (0.04, 3e7, 1e4))
-sol = solve(prob_mm, Rodas5(), reltol = 1e-8, abstol = 1e-8)
-@test sum(sol[1]) ≈ 1
-@test sol[1] ≈ [1.0, 0.0, 0.0]
-
-for alg in [Rodas5(autodiff = false), Trapezoid()]
-    local sol
-    sol = solve(prob_mm, alg, reltol = 1e-8, abstol = 1e-8,
-        initializealg = ShampineCollocationInit())
-    @test sum(sol[1]) ≈ 1
-end
-
-function rober_no_p(du, u, p, t)
-    y₁, y₂, y₃ = u
-    (k₁, k₂, k₃) = (0.04, 3e7, 1e4)
-    du[1] = -k₁ * y₁ + k₃ * y₂ * y₃
-    du[2] = k₁ * y₁ - k₃ * y₂ * y₃ - k₂ * y₂^2
-    du[3] = y₁ + y₂ + y₃ - 1
-    nothing
-end
-
-function rober_oop_no_p(du, u, p, t)
-    y₁, y₂, y₃ = u
-    (k₁, k₂, k₃) = (0.04, 3e7, 1e4)
-    du1 = -k₁ * y₁ + k₃ * y₂ * y₃
-    du2 = k₁ * y₁ - k₃ * y₂ * y₃ - k₂ * y₂^2
-    du3 = y₁ + y₂ + y₃ - 1
-    [du1, du2, du3]
-end
-
-# test oop and iip ODE initialization with parameters without eltype/length
-struct UnusedParam
-end
-for f in (
-    ODEFunction(rober_no_p, mass_matrix = M), ODEFunction(rober_oop_no_p, mass_matrix = M))
-    local prob, probp
-    prob = ODEProblem(f, [1.0, 0.0, 1.0], (0.0, 1e5))
-    probp = ODEProblem(f, [1.0, 0.0, 1.0], (0.0, 1e5), UnusedParam)
-    for initializealg in (ShampineCollocationInit(), BrownFullBasicInit())
-        isapprox(init(prob, Rodas5(), abstol = 1e-10; initializealg).u,
-            init(prob, Rodas5(), abstol = 1e-10; initializealg).u)
-    end
-end
-
-## DAEProblem
-
 f = function (du, u, p, t)
     out1 = -0.04u[1] + 1e4 * u[2] * u[3] - du[1]
     out2 = +0.04u[1] - 3e7 * u[2]^2 - 1e4 * u[2] * u[3] - du[2]
@@ -246,23 +149,3 @@ for initializealg in (ShampineCollocationInit(), BrownFullBasicInit())
     @test isapprox(
         init(probp, DABDF2(); initializealg).u, init(prob, DABDF2(); initializealg).u)
 end
-
-# to test that we get the right NL solve we need a broken solver.
-struct BrokenNLSolve <: SciMLBase.AbstractNonlinearAlgorithm
-    BrokenNLSolve(; kwargs...) = new()
-end
-function SciMLBase.__solve(prob::NonlinearProblem,
-        alg::BrokenNLSolve, args...;
-        kwargs...)
-    u = fill(reinterpret(Float64, 0xDEADBEEFDEADBEEF), 3)
-    SciMLBase.build_solution(prob, alg, u, copy(u);
-        retcode = ReturnCode.Success)
-end
-function f2(u, p, t)
-    u
-end
-f = ODEFunction(f2, mass_matrix = Diagonal([1.0, 1.0, 0.0]))
-prob = ODEProblem(f, ones(3), (0.0, 1.0))
-integrator = init(prob, Rodas5P(),
-    initializealg = ShampineCollocationInit(1.0, BrokenNLSolve()))
-@test all(isequal(reinterpret(Float64, 0xDEADBEEFDEADBEEF)), integrator.u)

lib/OrdinaryDiffEqBDF/test/runtest.jl

@@ -0,0 +1,6 @@
+using SafeTestsets
+
+@time @safetestset "DAE Convergence Tests" include("dae_convergence_tests.jl")
+@time @safetestset "DAE AD Tests" include("dae_ad_tests.jl")
+@time @safetestset "DAE Event Tests" include("dae_event.jl")
+@time @safetestset "DAE Initialization Tests" include("dae_initialization_tests.jl")

lib/OrdinaryDiffEqBDF/test/runtests.jl

@@ -1,3 +1,4 @@
 using SafeTestsets
 
-@time @safetestset "Linear-Nonlinear Krylov Methods Tests" include("linear_nonlinear_krylov_tests.jl")
+@time @safetestset "Linear-Nonlinear Krylov Methods Tests" include("linear_nonlinear_krylov_tests.jl")
+@time @safetestset "Linear-Nonlinear Convergence Tests" include("linear_nonlinear_convergence_tests.jl")