Skip to content

Commit 4517dff

Browse files
committed
Update benchmarks
1 parent c27a024 commit 4517dff

5 files changed

Lines changed: 17 additions & 32 deletions

File tree

docs/benchmarks/hires/run_hires.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def param_to_solution(tol):
9090
vf_auto = functools.partial(vf_probdiffeq, t=t0)
9191
tcoeffs = taylor.odejet_padded_scan(vf_auto, (u0,), num=num_derivatives)
9292
init, ibm, ssm = ivpsolvers.prior_wiener_integrated(tcoeffs, ssm_fact="dense")
93-
ts1 = ivpsolvers.correction_ts1(ssm=ssm)
93+
ts1 = ivpsolvers.correction_ts1(vf_probdiffeq, ssm=ssm)
9494
strategy = ivpsolvers.strategy_filter(ssm=ssm)
9595
solver = ivpsolvers.solver_dynamic(strategy, prior=ibm, correction=ts1, ssm=ssm)
9696
control = ivpsolvers.control_proportional_integral()
@@ -101,13 +101,7 @@ def param_to_solution(tol):
101101
# Solve
102102
dt0 = ivpsolve.dt0(vf_auto, (u0,))
103103
solution = ivpsolve.solve_adaptive_terminal_values(
104-
vf_probdiffeq,
105-
init,
106-
t0=t0,
107-
t1=t1,
108-
dt0=dt0,
109-
adaptive_solver=adaptive_solver,
110-
ssm=ssm,
104+
init, t0=t0, t1=t1, dt0=dt0, adaptive_solver=adaptive_solver, ssm=ssm
111105
)
112106

113107
# Return the terminal value

docs/benchmarks/lotkavolterra/run_lotkavolterra.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def param_to_solution(tol):
8484
tcoeffs, ssm_fact=implementation
8585
)
8686
strategy = ivpsolvers.strategy_filter(ssm=ssm)
87-
corr = correction(ssm=ssm)
87+
corr = correction(vf_probdiffeq, ssm=ssm)
8888
solver = ivpsolvers.solver_mle(strategy, prior=ibm, correction=corr, ssm=ssm)
8989
control = ivpsolvers.control_proportional_integral()
9090
adaptive_solver = ivpsolvers.adaptive(
@@ -94,13 +94,7 @@ def param_to_solution(tol):
9494
# Solve
9595
dt0 = ivpsolve.dt0(vf_auto, (u0,))
9696
solution = ivpsolve.solve_adaptive_terminal_values(
97-
vf_probdiffeq,
98-
init,
99-
t0=t0,
100-
t1=t1,
101-
dt0=dt0,
102-
adaptive_solver=adaptive_solver,
103-
ssm=ssm,
97+
init, t0=t0, t1=t1, dt0=dt0, adaptive_solver=adaptive_solver, ssm=ssm
10498
)
10599

106100
# Return the terminal value

docs/benchmarks/pleiades/run_pleiades.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def param_to_solution(tol):
102102
init, ibm, ssm = ivpsolvers.prior_wiener_integrated(
103103
tcoeffs, ssm_fact="isotropic"
104104
)
105-
ts0_or_ts1 = correction_fun(ssm=ssm, ode_order=2)
105+
ts0_or_ts1 = correction_fun(vf_probdiffeq, ssm=ssm, ode_order=2)
106106
strategy = ivpsolvers.strategy_filter(ssm=ssm)
107107
solver = ivpsolvers.solver_dynamic(
108108
strategy, prior=ibm, correction=ts0_or_ts1, ssm=ssm
@@ -115,13 +115,7 @@ def param_to_solution(tol):
115115
# Solve
116116
dt0 = ivpsolve.dt0(vf_auto, (u0, du0))
117117
solution = ivpsolve.solve_adaptive_terminal_values(
118-
vf_probdiffeq,
119-
init,
120-
t0=t0,
121-
t1=t1,
122-
dt0=dt0,
123-
adaptive_solver=adaptive_solver,
124-
ssm=ssm,
118+
init, t0=t0, t1=t1, dt0=dt0, adaptive_solver=adaptive_solver, ssm=ssm
125119
)
126120

127121
# Return the terminal value

docs/benchmarks/vanderpol/run_vanderpol.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def param_to_solution(tol):
8282
tcoeffs = taylor.odejet_padded_scan(vf_auto, (u0, du0), num=num_derivatives - 1)
8383

8484
init, ibm, ssm = ivpsolvers.prior_wiener_integrated(tcoeffs, ssm_fact="dense")
85-
ts0_or_ts1 = ivpsolvers.correction_ts1(ode_order=2, ssm=ssm)
85+
ts0_or_ts1 = ivpsolvers.correction_ts1(vf_probdiffeq, ode_order=2, ssm=ssm)
8686
strategy = ivpsolvers.strategy_filter(ssm=ssm)
8787

8888
solver = ivpsolvers.solver_dynamic(
@@ -96,13 +96,7 @@ def param_to_solution(tol):
9696
# Solve
9797
dt0 = ivpsolve.dt0(vf_auto, (u0, du0))
9898
solution = ivpsolve.solve_adaptive_terminal_values(
99-
vf_probdiffeq,
100-
init,
101-
t0=t0,
102-
t1=t1,
103-
dt0=dt0,
104-
adaptive_solver=adaptive_solver,
105-
ssm=ssm,
99+
init, t0=t0, t1=t1, dt0=dt0, adaptive_solver=adaptive_solver, ssm=ssm
106100
)
107101

108102
# Return the terminal value

makefile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,14 @@ doc:
5454
make benchmarks-plot-results
5555
JUPYTER_PLATFORM_DIRS=1 mkdocs build
5656

57+
doc-serve:
58+
# The readme is the landing page of the docs:
59+
cp README.md docs/index.md
60+
# Execute the examples manually and not via mkdocs-jupyter
61+
# to gain clear error messages.
62+
make example
63+
make benchmarks-plot-results
64+
JUPYTER_PLATFORM_DIRS=1 mkdocs serve
65+
5766
find-dead-code:
5867
vulture . --ignore-names case*,fixture*,*jvp --exclude probdiffeq/_version.py

0 commit comments

Comments
 (0)