Skip to content

Commit be1e69a

Browse files
Restore SIMD method placeholders in benchmark files
- Added commented OrdinaryDiffEqSIMDRK imports - Added commented SIMD method calls (MER5v2, MER6v2, RK6v4) - Methods will be uncommented when OrdinaryDiffEqSIMDRK becomes publicly available - Kept Julia 1.10 Manifest intact
1 parent 6599a19 commit be1e69a

File tree

4 files changed

+40
-9
lines changed

4 files changed

+40
-9
lines changed

benchmarks/NonStiffODE/FitzhughNagumo_wpd.jmd

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ author: Chris Rackauckas
88
The purpose of this is to see how the errors scale on a standard nonlinear problem.
99

1010
```julia
11-
using OrdinaryDiffEq, ParameterizedFunctions, ODEInterface,
11+
using OrdinaryDiffEq, OrdinaryDiffEqCore, ParameterizedFunctions, ODEInterface,
1212
ODEInterfaceDiffEq, LSODA, Sundials, DiffEqDevTools,
1313
StaticArrays
14+
# TODO: Uncomment when OrdinaryDiffEqSIMDRK becomes publicly available
15+
# using OrdinaryDiffEqSIMDRK
1416
using Plots;
1517
gr()
1618

@@ -46,7 +48,12 @@ setups = [Dict(:alg=>DP5())
4648
Dict(:alg=>Tsit5())
4749
Dict(:alg=>Vern6())
4850
Dict(:alg=>Tsit5(), :prob_choice => 2)
49-
Dict(:alg=>Vern6(), :prob_choice => 2)]
51+
Dict(:alg=>Vern6(), :prob_choice => 2)
52+
# TODO: Add SIMD methods when OrdinaryDiffEqSIMDRK becomes available
53+
# Dict(:alg=>MER5v2(), :prob_choice => 2)
54+
# Dict(:alg=>MER6v2(), :prob_choice => 2)
55+
# Dict(:alg=>RK6v4(), :prob_choice => 2)
56+
]
5057
wp = WorkPrecisionSet(probs, abstols, reltols, setups; appxsol = test_sol,
5158
save_everystep = false, numruns = 100, maxiters = 1000)
5259
plot(wp)

benchmarks/NonStiffODE/LotkaVolterra_wpd.jmd

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ author: Chris Rackauckas
88
The purpose of this problem is to test the performance on easy problems. Since it's periodic, the error is naturally low, and so most of the difference will come down to startup times and, when measuring the interpolations, the algorithm choices.
99

1010
```julia
11-
using OrdinaryDiffEq, ParameterizedFunctions, ODEInterfaceDiffEq, LSODA,
11+
using OrdinaryDiffEq, OrdinaryDiffEqCore, ParameterizedFunctions, ODEInterfaceDiffEq, LSODA,
1212
Sundials, DiffEqDevTools, StaticArrays
13+
# TODO: Uncomment when OrdinaryDiffEqSIMDRK becomes publicly available
14+
# using OrdinaryDiffEqSIMDRK
1315

1416
f = @ode_def LotkaVolterra begin
1517
dx = a*x - b*x*y
@@ -43,7 +45,12 @@ setups = [Dict(:alg=>DP5())
4345
Dict(:alg=>Tsit5())
4446
Dict(:alg=>Vern6())
4547
Dict(:alg=>Tsit5(), :prob_choice => 2)
46-
Dict(:alg=>Vern6(), :prob_choice => 2)]
48+
Dict(:alg=>Vern6(), :prob_choice => 2)
49+
# TODO: Add SIMD methods when OrdinaryDiffEqSIMDRK becomes available
50+
# Dict(:alg=>MER5v2(), :prob_choice => 2)
51+
# Dict(:alg=>MER6v2(), :prob_choice => 2)
52+
# Dict(:alg=>RK6v4(), :prob_choice => 2)
53+
]
4754
wp = WorkPrecisionSet(probs, abstols, reltols, setups; appxsol = test_sol,
4855
save_everystep = false, maxiters = 10000, numruns = 100)
4956
plot(wp)

benchmarks/NonStiffODE/RigidBody_wpd.jmd

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ author: Chris Rackauckas
44
---
55

66
```julia
7-
using OrdinaryDiffEq, ParameterizedFunctions, ODEInterfaceDiffEq, LSODA,
7+
using OrdinaryDiffEq, OrdinaryDiffEqCore, ParameterizedFunctions, ODEInterfaceDiffEq, LSODA,
88
Sundials, DiffEqDevTools, StaticArrays
9+
# TODO: Uncomment when OrdinaryDiffEqSIMDRK becomes publicly available
10+
# using OrdinaryDiffEqSIMDRK
911

1012
k(t) = 0.25*sin(t)^2
1113

@@ -40,7 +42,12 @@ setups = [Dict(:alg=>DP5())
4042
Dict(:alg=>Tsit5())
4143
Dict(:alg=>Vern6())
4244
Dict(:alg=>Tsit5(), :prob_choice => 2)
43-
Dict(:alg=>Vern6(), :prob_choice => 2)]
45+
Dict(:alg=>Vern6(), :prob_choice => 2)
46+
# TODO: Add SIMD methods when OrdinaryDiffEqSIMDRK becomes available
47+
# Dict(:alg=>MER5v2(), :prob_choice => 2)
48+
# Dict(:alg=>MER6v2(), :prob_choice => 2)
49+
# Dict(:alg=>RK6v4(), :prob_choice => 2)
50+
]
4451
wp = WorkPrecisionSet(probs, abstols, reltols, setups; appxsol = test_sol,
4552
save_everystep = true, numruns = 100, maxiters = 10000)
4653
plot(wp)

benchmarks/NonStiffODE/linear_wpd.jmd

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ rapid development has its advantages.
2323
## Setup
2424

2525
```julia
26-
using OrdinaryDiffEq, Sundials, DiffEqDevTools, Plots, ODEInterfaceDiffEq, LSODA
26+
using OrdinaryDiffEq, OrdinaryDiffEqCore, Sundials, DiffEqDevTools, Plots, ODEInterfaceDiffEq, LSODA
27+
# TODO: Uncomment when OrdinaryDiffEqSIMDRK becomes publicly available
28+
# using OrdinaryDiffEqSIMDRK
2729
using Random
2830
Random.seed!(123)
2931
gr()
@@ -56,9 +58,17 @@ setups = [Dict(:alg=>DP5())
5658
Dict(:alg=>ode45())
5759
Dict(:alg=>dopri5())
5860
Dict(:alg=>ARKODE(Sundials.Explicit(), etable = Sundials.DORMAND_PRINCE_7_4_5))
59-
Dict(:alg=>Tsit5())]
61+
Dict(:alg=>Tsit5())
62+
# TODO: Add SIMD methods when OrdinaryDiffEqSIMDRK becomes available
63+
# Dict(:alg=>MER5v2())
64+
# Dict(:alg=>MER6v2())
65+
# Dict(:alg=>RK6v4())
66+
]
6067
solnames = ["OrdinaryDiffEq"; "ODE"; "ODEInterface"; "Sundials ARKODE";
61-
"OrdinaryDiffEq Tsit5"]
68+
"OrdinaryDiffEq Tsit5"
69+
# TODO: Add SIMD method names when available
70+
# ; "MER5v2"; "MER6v2"; "RK6v4"
71+
]
6272
wp = WorkPrecisionSet(
6373
prob, abstols, reltols, setups; names = solnames, save_everystep = false, numruns = 100)
6474
plot(wp)

0 commit comments

Comments
 (0)