diff --git a/Project.toml b/Project.toml index 61e17aa..0f494e1 100644 --- a/Project.toml +++ b/Project.toml @@ -29,11 +29,13 @@ LabelledArrays = "1.16.0" LinearAlgebra = "1.10" Optimization = "4.1.1, 5" OptimizationOptimJL = "0.4.1" -OrdinaryDiffEq = "6.98.0" +OrdinaryDiffEq = "6.98.0, 7" +OrdinaryDiffEqSDIRK = "1.1.0, 2" +SciMLBase = "2, 3" Pkg = "1.10" PrecompileTools = "1.2.1" Random = "1.10.8" -RecursiveArrayTools = "3.29.0" +RecursiveArrayTools = "3.29.0, 4" ReverseDiff = "1.16" SafeTestsets = "0.1" SparseArrays = "1.10" @@ -52,6 +54,8 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba" OptimizationOptimJL = "36348300-93cb-4f02-beb5-3c3902f8871e" OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed" +OrdinaryDiffEqSDIRK = "2d112036-d095-4a1e-ab9a-08536f3ecdbf" +SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd" @@ -63,4 +67,4 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["Aqua", "ADTypes", "ExplicitImports", "ForwardDiff", "Random", "LabelledArrays", "LinearAlgebra", "OrdinaryDiffEq", "Test", "RecursiveArrayTools", "Pkg", "SafeTestsets", "Optimization", "OptimizationOptimJL", "SparseArrays", "Symbolics", "SparseConnectivityTracer"] +test = ["Aqua", "ADTypes", "ExplicitImports", "ForwardDiff", "Random", "LabelledArrays", "LinearAlgebra", "OrdinaryDiffEq", "OrdinaryDiffEqSDIRK", "SciMLBase", "Test", "RecursiveArrayTools", "Pkg", "SafeTestsets", "Optimization", "OptimizationOptimJL", "SparseArrays", "Symbolics", "SparseConnectivityTracer"] diff --git a/test/GPU/Project.toml b/test/GPU/Project.toml index b49364e..8cbaac3 100644 --- a/test/GPU/Project.toml +++ b/test/GPU/Project.toml @@ -1,7 +1,11 @@ [deps] CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" +OrdinaryDiffEqSDIRK = "2d112036-d095-4a1e-ab9a-08536f3ecdbf" PreallocationTools = "d236fae5-4411-538c-8e31-a6e3d9e00b46" +SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" [compat] CUDA = "3.12, 4, 5" +OrdinaryDiffEqSDIRK = "2" PreallocationTools = "0.4, 1" +SciMLBase = "2, 3" diff --git a/test/core_nesteddual.jl b/test/core_nesteddual.jl index 403ac98..7980395 100644 --- a/test/core_nesteddual.jl +++ b/test/core_nesteddual.jl @@ -1,6 +1,6 @@ using LinearAlgebra, - OrdinaryDiffEq, Test, PreallocationTools, ForwardDiff, Optimization, - OptimizationOptimJL + OrdinaryDiffEq, OrdinaryDiffEqSDIRK, SciMLBase, Test, PreallocationTools, ForwardDiff, + Optimization, OptimizationOptimJL randmat = rand(5, 3) sto = similar(randmat) @@ -83,7 +83,7 @@ function objfun(x, prob, realsol, cache) sol = solve(prob, TRBDF2(), saveat = 0.0:0.1:10.0, reltol = 1.0e-8) ofv = 0.0 - if any((s.retcode != ReturnCode.Success for s in sol)) + if sol.retcode != ReturnCode.Success ofv = 1.0e12 else ofv = sum((sol .- realsol) .^ 2) @@ -116,7 +116,7 @@ function objfun2(x, prob, realsol, cache) ) ofv = 0.0 - if any((s.retcode != ReturnCode.Success for s in sol)) + if sol.retcode != ReturnCode.Success ofv = 1.0e12 else ofv = sum((sol .- realsol) .^ 2) diff --git a/test/core_odes.jl b/test/core_odes.jl index c9e61e9..234a100 100644 --- a/test/core_odes.jl +++ b/test/core_odes.jl @@ -1,5 +1,5 @@ using LinearAlgebra, - OrdinaryDiffEq, Test, PreallocationTools, LabelledArrays, + OrdinaryDiffEq, SciMLBase, Test, PreallocationTools, LabelledArrays, RecursiveArrayTools, ADTypes #Base array diff --git a/test/gpu_all.jl b/test/gpu_all.jl index 9a10e2e..e2a93c8 100644 --- a/test/gpu_all.jl +++ b/test/gpu_all.jl @@ -1,8 +1,9 @@ using LinearAlgebra, - OrdinaryDiffEq, Test, PreallocationTools, CUDA, ForwardDiff, ADTypes + OrdinaryDiffEq, OrdinaryDiffEqSDIRK, SciMLBase, Test, PreallocationTools, CUDA, + ForwardDiff, ADTypes # upstream -OrdinaryDiffEq.DiffEqBase.anyeltypedual(x::FixedSizeDiffCache, counter = 0) = Any +SciMLBase.anyeltypedual(x::FixedSizeDiffCache, counter = 0) = Any #Dispatch tests chunk_size = 5