Merge pull request #2633 from jlchan/jc/add_VoA_StructArray_tests

Check for consistency between different `VectorOfArray` parent array types

Author: ChrisRackauckas

Project.toml

@@ -142,6 +142,7 @@ SparseDiffTools = "2"
 Static = "0.8, 1"
 StaticArrayInterface = "1.2"
 StaticArrays = "1.0"
+StructArrays = "0.6"
 TruncatedStacktraces = "1.2"
 julia = "1.10"
 
@@ -167,9 +168,10 @@ ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
+StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
 Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 
 [targets]
-test = ["Calculus", "ComponentArrays", "Symbolics", "AlgebraicMultigrid", "IncompleteLU", "DiffEqCallbacks", "DiffEqDevTools", "ODEProblemLibrary", "ElasticArrays", "InteractiveUtils", "ParameterizedFunctions", "PoissonRandom", "Printf", "Random", "ReverseDiff", "SafeTestsets", "SparseArrays", "Statistics", "Test", "Unitful", "ModelingToolkit", "Pkg", "NLsolve", "RecursiveFactorization"]
+test = ["Calculus", "ComponentArrays", "Symbolics", "AlgebraicMultigrid", "IncompleteLU", "DiffEqCallbacks", "DiffEqDevTools", "ODEProblemLibrary", "ElasticArrays", "InteractiveUtils", "ParameterizedFunctions", "PoissonRandom", "Printf", "Random", "ReverseDiff", "SafeTestsets", "SparseArrays", "Statistics", "StructArrays", "Test", "Unitful", "ModelingToolkit", "Pkg", "NLsolve", "RecursiveFactorization"]

lib/OrdinaryDiffEqLowStorageRK/Project.toml

@@ -34,6 +34,7 @@ Reexport = "1.2.2"
 SafeTestsets = "0.1.0"
 Static = "1.1.1"
 StaticArrays = "1.9.7"
+StructArrays = "0.6"
 Test = "<0.0.1, 1"
 julia = "1.10"
 
@@ -42,7 +43,8 @@ DiffEqDevTools = "f3b72e0c-5b89-59e1-b016-84e28bfd966d"
 ODEProblemLibrary = "fdc4e326-1af4-4b90-96e7-779fcce2daa5"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
+StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["DiffEqDevTools", "Random", "SafeTestsets", "Test", "ODEProblemLibrary"]
+test = ["DiffEqDevTools", "Random", "SafeTestsets", "StructArrays", "Test", "ODEProblemLibrary"]

lib/OrdinaryDiffEqLowStorageRK/test/ode_low_storage_rk_tests.jl

@@ -1605,3 +1605,36 @@ end
         save_start = false, alias = ODEAliasSpecifier(alias_u0 = true))
     @test sol_old[end] ≈ sol_new[end]
 end
+
+@testset "VectorOfArray/StructArray compatibility" begin
+    using RecursiveArrayTools, StaticArrays, StructArrays
+
+    function rhs!(du_voa, u_voa, p, t)
+        du = parent(du_voa)
+        u = parent(u_voa)
+        du .= u
+    end
+
+    # StructArray storage
+    u = StructArray{SVector{1, Float64}}(ntuple(_ -> [1.0, 2.0], 1))
+    ode = ODEProblem(rhs!, VectorOfArray(u), (0, 0.7))
+    sol_SA = solve(ode, RDPK3SpFSAL35())
+
+    # Vector{<:SVector} storage
+    u = SVector{1, Float64}.([1.0, 2.0])
+    ode = ODEProblem(rhs!, VectorOfArray(u), (0, 0.7))
+    sol_SV = solve(ode, RDPK3SpFSAL35())
+
+    @test sol_SA ≈ sol_SV
+    @test sol_SV.stats.naccept == sol_SA.stats.naccept
+    
+    # Plain vector
+    u = [1.0, 2.0]
+    ode = ODEProblem(rhs!, u, (0, 0.7))
+    sol = solve(ode, RDPK3SpFSAL35())
+    @test sol.stats.naccept == sol_SA.stats.naccept
+    @test sol.t ≈ sol_SA.t
+    for i in eachindex(sol_SA.u), j in eachindex(u)
+        @test sol.u[i][j] ≈ sol_SA.u[i][j][1]
+    end
+end

lib/OrdinaryDiffEqSSPRK/Project.toml

@@ -33,6 +33,7 @@ Reexport = "1.2.2"
 SafeTestsets = "0.1.0"
 Static = "1.1.1"
 StaticArrays = "1.9.7"
+StructArrays = "0.6"
 Test = "<0.0.1, 1"
 julia = "1.10"
 
@@ -42,7 +43,8 @@ ODEProblemLibrary = "fdc4e326-1af4-4b90-96e7-779fcce2daa5"
 OrdinaryDiffEqLowStorageRK = "b0944070-b475-4768-8dec-fb6eb410534d"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
+StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["DiffEqDevTools", "Random", "SafeTestsets", "Test", "ODEProblemLibrary", "OrdinaryDiffEqLowStorageRK"]
+test = ["DiffEqDevTools", "Random", "SafeTestsets", "StructArrays", "Test", "ODEProblemLibrary", "OrdinaryDiffEqLowStorageRK"]

lib/OrdinaryDiffEqSSPRK/test/ode_ssprk_tests.jl

@@ -491,3 +491,26 @@ end
 sol = solve(test_problem_ssp_long, alg, dt = OrdinaryDiffEqSSPRK.ssp_coefficient(alg),
     dense = false)
 @test all(sol.u .>= 0)
+
+@testset "VectorOfArray/StructArray compatibility" begin
+    using RecursiveArrayTools, StaticArrays, StructArrays
+
+    function rhs!(du_voa, u_voa, p, t)
+        du = parent(du_voa)
+        u = parent(u_voa)
+        du .= u
+    end
+
+    # StructArray storage
+    u = StructArray{SVector{1, Float64}}(ntuple(_ -> [1.0, 2.0], 1))
+    ode = ODEProblem(rhs!, VectorOfArray(u), (0, 0.7))
+    sol_SA = solve(ode, SSPRK43())
+
+    # Vector{<:SVector} storage
+    u = SVector{1, Float64}.([1.0, 2.0])
+    ode = ODEProblem(rhs!, VectorOfArray(u), (0, 0.7))
+    sol_SV = solve(ode, SSPRK43())
+
+    @test sol_SA ≈ sol_SV
+    @test sol_SV.stats.naccept == sol_SA.stats.naccept
+end