Skip to content

Commit da91eaa

Browse files
committed
use the latest DiffEqDevTools
Signed-off-by: Qingyu Qu <[email protected]>
1 parent 143f091 commit da91eaa

File tree

2 files changed

+20
-33
lines changed

2 files changed

+20
-33
lines changed

benchmarks/NonStiffBVP/Manifest.toml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -469,9 +469,9 @@ version = "6.158.1"
469469

470470
[[deps.DiffEqDevTools]]
471471
deps = ["DiffEqBase", "DiffEqNoiseProcess", "Distributed", "LinearAlgebra", "Logging", "NLsolve", "RecipesBase", "RecursiveArrayTools", "RootedTrees", "SciMLBase", "Statistics", "StructArrays"]
472-
git-tree-sha1 = "35f51dc83977ca2cc45f9a0abd55ed9efd54eff7"
472+
git-tree-sha1 = "167a3a413b954aca9e64d785f8ea096e23e5afb8"
473473
uuid = "f3b72e0c-5b89-59e1-b016-84e28bfd966d"
474-
version = "2.45.0"
474+
version = "2.45.1"
475475

476476
[[deps.DiffEqNoiseProcess]]
477477
deps = ["DiffEqBase", "Distributions", "GPUArraysCore", "LinearAlgebra", "Markdown", "Optim", "PoissonRandom", "QuadGK", "Random", "Random123", "RandomNumbers", "RecipesBase", "RecursiveArrayTools", "ResettableStacks", "SciMLBase", "StaticArraysCore", "Statistics"]
@@ -499,9 +499,9 @@ version = "1.15.1"
499499

500500
[[deps.DifferentiationInterface]]
501501
deps = ["ADTypes", "LinearAlgebra"]
502-
git-tree-sha1 = "5dc557ea58f472885021dc57cabab1de3817dd3c"
502+
git-tree-sha1 = "758ef234ab0b81071c195cd2ea155030d69c1ef8"
503503
uuid = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63"
504-
version = "0.6.12"
504+
version = "0.6.13"
505505

506506
[deps.DifferentiationInterface.extensions]
507507
DifferentiationInterfaceChainRulesCoreExt = "ChainRulesCore"
@@ -830,15 +830,15 @@ version = "0.1.6"
830830

831831
[[deps.GR]]
832832
deps = ["Artifacts", "Base64", "DelimitedFiles", "Downloads", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Preferences", "Printf", "Qt6Wayland_jll", "Random", "Serialization", "Sockets", "TOML", "Tar", "Test", "p7zip_jll"]
833-
git-tree-sha1 = "629693584cef594c3f6f99e76e7a7ad17e60e8d5"
833+
git-tree-sha1 = "ee28ddcd5517d54e417182fec3886e7412d3926f"
834834
uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
835-
version = "0.73.7"
835+
version = "0.73.8"
836836

837837
[[deps.GR_jll]]
838838
deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "FreeType2_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Qt6Base_jll", "Zlib_jll", "libpng_jll"]
839-
git-tree-sha1 = "a8863b69c2a0859f2c2c87ebdc4c6712e88bdf0d"
839+
git-tree-sha1 = "f31929b9e67066bee48eec8b03c0df47d31a74b3"
840840
uuid = "d2c73de3-f751-5644-a686-071e5b155ba9"
841-
version = "0.73.7+0"
841+
version = "0.73.8+0"
842842

843843
[[deps.GenericSchur]]
844844
deps = ["LinearAlgebra", "Printf"]
@@ -1152,10 +1152,10 @@ uuid = "c1c5ebd0-6772-5130-a774-d5fcae4a789d"
11521152
version = "3.100.2+0"
11531153

11541154
[[deps.LERC_jll]]
1155-
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
1156-
git-tree-sha1 = "bf36f528eec6634efc60d7ec062008f171071434"
1155+
deps = ["Artifacts", "JLLWrappers", "Libdl"]
1156+
git-tree-sha1 = "36bdbc52f13a7d1dcb0f3cd694e01677a515655b"
11571157
uuid = "88015f11-f218-50d7-93a8-a6af411a945d"
1158-
version = "3.0.0+1"
1158+
version = "4.0.0+0"
11591159

11601160
[[deps.LLVMOpenMP_jll]]
11611161
deps = ["Artifacts", "JLLWrappers", "Libdl"]
@@ -1170,9 +1170,9 @@ uuid = "dd4b983a-f0e5-5f8d-a1b7-129d4a5fb1ac"
11701170
version = "2.10.2+1"
11711171

11721172
[[deps.LaTeXStrings]]
1173-
git-tree-sha1 = "50901ebc375ed41dbf8058da26f9de442febbbec"
1173+
git-tree-sha1 = "dda21b8cbd6a6c40d9d02a73230f9d70fed6918c"
11741174
uuid = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
1175-
version = "1.3.1"
1175+
version = "1.4.0"
11761176

11771177
[[deps.Latexify]]
11781178
deps = ["Format", "InteractiveUtils", "LaTeXStrings", "MacroTools", "Markdown", "OrderedCollections", "Requires"]
@@ -1288,9 +1288,9 @@ version = "2.40.1+0"
12881288

12891289
[[deps.Libtiff_jll]]
12901290
deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "LERC_jll", "Libdl", "XZ_jll", "Zlib_jll", "Zstd_jll"]
1291-
git-tree-sha1 = "2da088d113af58221c52828a80378e16be7d037a"
1291+
git-tree-sha1 = "b404131d06f7886402758c9ce2214b636eb4d54a"
12921292
uuid = "89763e89-9b03-5906-acba-b20f662cd828"
1293-
version = "4.5.1+1"
1293+
version = "4.7.0+0"
12941294

12951295
[[deps.Libuuid_jll]]
12961296
deps = ["Artifacts", "JLLWrappers", "Libdl"]
@@ -2585,9 +2585,9 @@ version = "7.2.1+1"
25852585

25862586
[[deps.SymbolicIndexingInterface]]
25872587
deps = ["Accessors", "ArrayInterface", "RuntimeGeneratedFunctions", "StaticArraysCore"]
2588-
git-tree-sha1 = "0225f7c62f5f78db35aae6abb2e5cabe38ce578f"
2588+
git-tree-sha1 = "b708e5c01d4aad69c148241bda3346fda1c550d2"
25892589
uuid = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
2590-
version = "0.3.31"
2590+
version = "0.3.32"
25912591

25922592
[[deps.TOML]]
25932593
deps = ["Dates"]

benchmarks/NonStiffBVP/linear_wpd.jmd

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ solvers_all = [
4444
(; pkg = :simpleboundaryvaluediffeq, type = :simplemirk, name = "SimpleMIRK4", solver = Dict(:alg => SimpleMIRK4(), :dts=>1.0 ./ 10.0 .^ (1:4))),
4545
(; pkg = :simpleboundaryvaluediffeq, type = :simplemirk, name = "SimpleMIRK5", solver = Dict(:alg => SimpleMIRK5(), :dts=>1.0 ./ 10.0 .^ (1:4))),
4646
(; pkg = :simpleboundaryvaluediffeq, type = :simplemirk, name = "SimpleMIRK6", solver = Dict(:alg => SimpleMIRK6(), :dts=>1.0 ./ 10.0 .^ (1:4))),
47-
(; pkg = :wrapper, type = :general, name = "BVPM2", solver = Dict(:alg => BVPM2(), :dts=>1.0 ./ 10.0 .^ (1:4))),
48-
(; pkg = :wrapper, type = :general, name = "COLNEW", solver = Dict(:alg => COLNEW(), :dts=>1.0 ./ 10.0 .^ (1:4))),
47+
#(; pkg = :wrapper, type = :general, name = "BVPM2", solver = Dict(:alg => BVPM2(), :dts=>1.0 ./ 10.0 .^ (1:4))),
48+
#(; pkg = :wrapper, type = :general, name = "COLNEW", solver = Dict(:alg => COLNEW(), :dts=>1.0 ./ 10.0 .^ (1:4))),
4949
];
5050

5151
solver_tracker = [];
@@ -65,24 +65,11 @@ Prepares helper function for benchmarking a specific problem.
6565
function benchmark(prob)
6666
sol = solve(prob, Shooting(Vern7()), abstol=1e-14, reltol=1e-14)
6767
testsol = TestSolution(sol)
68-
successful_solvers = filter(solver -> check_solver(prob, solver), solvers_all)
69-
wps = WorkPrecisionSet(prob, abstols, reltols, getfield.(successful_solvers, :solver); names = getfield.(successful_solvers, :name), appxsol = testsol, maxiters=Int(1e4))
68+
wps = WorkPrecisionSet(prob, abstols, reltols, getfield.(solvers_all, :solver); names = getfield.(solvers_all, :name), appxsol = testsol, maxiters=Int(1e4))
7069
push!(wp_general_tracker, wps)
7170
return wps
7271
end
7372

74-
# Checks if a solver can successfully solve a given problem.
75-
function check_solver(prob, solver)
76-
dt = solver.solver[:alg] isa Union{BoundaryValueDiffEq.BoundaryValueDiffEqShooting.AbstractShooting, SimpleBoundaryValueDiffEq.SimpleShooting} ? nothing : 1e-3
77-
sol = solve(prob, solver.solver[:alg], dt = dt; abstol=1e-6, reltol=1e-6)
78-
if !SciMLBase.successful_retcode(sol)
79-
Base.printstyled("[Info] Solver $(solver.name) failed on this problem \
80-
with an returned retcode $(sol.retcode).\n"; color=:green)
81-
return false
82-
end
83-
return true
84-
end
85-
8673
function plot_wpd(wp_set)
8774
fig = begin
8875
LINESTYLES = Dict(:boundaryvaluediffeq => :solid, :simpleboundaryvaluediffeq => :dash, :wrapper => :dot)

0 commit comments

Comments
 (0)