Skip to content

Commit

Permalink
Commit stuff so that I can run it remotely
Browse files Browse the repository at this point in the history
  • Loading branch information
nathanaelbosch committed Nov 13, 2023
1 parent d559156 commit 9697921
Show file tree
Hide file tree
Showing 37 changed files with 10,646 additions and 8,868 deletions.
2 changes: 1 addition & 1 deletion benchmarks/hodgkinhuxley.jmd
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ u0 = [p.V0, m_inf(p.V0, p.VT), n_inf(p.V0, p.VT), h_inf(p.V0, p.VT)]

prob = ODEProblem{true,SciMLBase.FullSpecialize()}(f, u0, (0.0, 100.0), p)

test_sol = solve(prob, Vern7(), abstol=1/10^14, reltol=1/10^14, dense=false)
test_sol = solve(prob, Vern7(), abstol=1/10^14, reltol=1/10^14)
plot(test_sol,
legend=false,
layout=(4,1),
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/runall.jl
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ for file in FILES
)
end

delete!(ENV, "GKSwstype");
delete!(ENV, "GKSwstype"); nothing
4 changes: 2 additions & 2 deletions benchmarks/vanderpol.jmd
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ tspan = (0.0, 6.3)
u0 = [2.0, 0.0]
prob = ODEProblem(vanderpol!, u0, tspan, p)

test_sol = solve(prob, RadauIIA5(), abstol=1/10^14, reltol=1/10^14, dense=false)
test_sol = solve(prob, RadauIIA5(), abstol=1/10^14, reltol=1/10^14)
plot(test_sol, title="Van der Pol Solution", legend=false, ylims=(-2.5, 2.5), xticks=:auto)
```

Expand Down Expand Up @@ -209,7 +209,7 @@ u0 = [2.0]
du0 = [0.0]
prob2 = SecondOrderODEProblem(vanderpol2!, du0, u0, tspan, p)

test_sol2 = solve(prob2, RadauIIA5(), abstol=1/10^14, reltol=1/10^14, dense=false)
test_sol2 = solve(prob2, RadauIIA5(), abstol=1/10^14, reltol=1/10^14)
plot(test_sol2, title="Van der Pol Solution (2nd order)", legend=false, ylims=(-2.5, 2.5), xticks=:auto)
```

Expand Down
834 changes: 417 additions & 417 deletions docs/src/benchmarks/figures/hodgkinhuxley_2_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
404 changes: 204 additions & 200 deletions docs/src/benchmarks/figures/hodgkinhuxley_3_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
398 changes: 202 additions & 196 deletions docs/src/benchmarks/figures/hodgkinhuxley_4_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
314 changes: 161 additions & 153 deletions docs/src/benchmarks/figures/hodgkinhuxley_6_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
172 changes: 172 additions & 0 deletions docs/src/benchmarks/figures/hodgkinhuxley_7_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
736 changes: 368 additions & 368 deletions docs/src/benchmarks/figures/lotkavolterra_10_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
914 changes: 457 additions & 457 deletions docs/src/benchmarks/figures/lotkavolterra_11_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
846 changes: 423 additions & 423 deletions docs/src/benchmarks/figures/lotkavolterra_12_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
762 changes: 381 additions & 381 deletions docs/src/benchmarks/figures/lotkavolterra_13_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
696 changes: 348 additions & 348 deletions docs/src/benchmarks/figures/lotkavolterra_14_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,086 changes: 543 additions & 543 deletions docs/src/benchmarks/figures/lotkavolterra_15_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
606 changes: 302 additions & 304 deletions docs/src/benchmarks/figures/lotkavolterra_16_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,066 changes: 533 additions & 533 deletions docs/src/benchmarks/figures/lotkavolterra_17_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2,250 changes: 1,134 additions & 1,116 deletions docs/src/benchmarks/figures/lotkavolterra_18_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
266 changes: 133 additions & 133 deletions docs/src/benchmarks/figures/lotkavolterra_2_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
628 changes: 323 additions & 305 deletions docs/src/benchmarks/figures/lotkavolterra_3_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
600 changes: 300 additions & 300 deletions docs/src/benchmarks/figures/lotkavolterra_4_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
604 changes: 302 additions & 302 deletions docs/src/benchmarks/figures/lotkavolterra_5_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
628 changes: 314 additions & 314 deletions docs/src/benchmarks/figures/lotkavolterra_6_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
616 changes: 310 additions & 306 deletions docs/src/benchmarks/figures/lotkavolterra_7_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
616 changes: 310 additions & 306 deletions docs/src/benchmarks/figures/lotkavolterra_8_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
758 changes: 378 additions & 380 deletions docs/src/benchmarks/figures/lotkavolterra_9_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
159 changes: 159 additions & 0 deletions docs/src/benchmarks/figures/vanderpol_10_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
140 changes: 140 additions & 0 deletions docs/src/benchmarks/figures/vanderpol_11_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
254 changes: 254 additions & 0 deletions docs/src/benchmarks/figures/vanderpol_12_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
263 changes: 263 additions & 0 deletions docs/src/benchmarks/figures/vanderpol_13_1.svg

Large diffs are not rendered by default.

250 changes: 125 additions & 125 deletions docs/src/benchmarks/figures/vanderpol_2_1.svg

Large diffs are not rendered by default.

428 changes: 214 additions & 214 deletions docs/src/benchmarks/figures/vanderpol_3_1.svg

Large diffs are not rendered by default.

829 changes: 338 additions & 491 deletions docs/src/benchmarks/figures/vanderpol_4_1.svg

Large diffs are not rendered by default.

554 changes: 406 additions & 148 deletions docs/src/benchmarks/figures/vanderpol_5_1.svg

Large diffs are not rendered by default.

501 changes: 501 additions & 0 deletions docs/src/benchmarks/figures/vanderpol_9_1.svg

Large diffs are not rendered by default.

122 changes: 77 additions & 45 deletions docs/src/benchmarks/hodgkinhuxley.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ u0 = [p.V0, m_inf(p.V0, p.VT), n_inf(p.V0, p.VT), h_inf(p.V0, p.VT)]

prob = ODEProblem{true,SciMLBase.FullSpecialize()}(f, u0, (0.0, 100.0), p)

test_sol = solve(prob, Vern7(), abstol=1/10^14, reltol=1/10^14, dense=false)
test_sol = solve(prob, Vern7(), abstol=1/10^14, reltol=1/10^14)
plot(test_sol,
legend=false,
layout=(4,1),
Expand Down Expand Up @@ -113,16 +113,17 @@ wp = WorkPrecisionSet(
appxsol = test_sol,
dense = DENSE,
save_everystep = SAVE_EVERYSTEP,
numruns = 10,
maxiters = Int(1e7),
timeseries_errors = false,
verbose = false,
)

plot(wp, title = "Adaptive steps - no smoothing", color = colors)
plot(wp, title="Adaptive steps - no smoothing", color=colors)
```

```
Error: InterruptException:
```

![](figures/hodgkinhuxley_3_1.svg)




Expand Down Expand Up @@ -154,16 +155,30 @@ wp = WorkPrecisionSet(
appxsol = test_sol,
dense = DENSE,
save_everystep = SAVE_EVERYSTEP,
numruns = 10,
maxiters = Int(1e7),
timeseries_errors = false,
verbose = false,
)

plot(wp, title = "Adaptive steps - with smoothing", color = colors)
plot(wp, title="Adaptive steps - with smoothing", color=colors)
```

```
Error: InterruptException:
```





Dense errors
```julia
plot(wp, x= L2, title="Adaptive steps - with smoothing", color=colors)
```

```
Error: UndefVarError: `L2` not defined
```

![](figures/hodgkinhuxley_4_1.svg)




Expand Down Expand Up @@ -194,16 +209,17 @@ wp = WorkPrecisionSet(
appxsol = test_sol,
dense = DENSE,
save_everystep = SAVE_EVERYSTEP,
numruns = 10,
maxiters = Int(1e7),
timeseries_errors = false,
verbose = false,
)

plot(wp, title = "Fixed steps - no smoothing", color = colors)
plot(wp, title="Fixed steps - no smoothing", color=colors)
```

```
Error: InterruptException:
```

![](figures/hodgkinhuxley_5_1.svg)




Expand Down Expand Up @@ -234,16 +250,31 @@ wp = WorkPrecisionSet(
appxsol = test_sol,
dense = DENSE,
save_everystep = SAVE_EVERYSTEP,
numruns = 10,
maxiters = Int(1e7),
timeseries_errors = false,
verbose = false,
)

plot(wp, title = "Fixed steps - with smoothing", color = colors)
plot(wp, title="Fixed steps - with smoothing", color=colors)
```

```
Error: InterruptException:
```





Dense errors
```julia
plot(wp, x=:L2, title="Adaptive steps - with smoothing", color=colors)
```

```
Error: UndefVarError: `wp` not defined
```

![](figures/hodgkinhuxley_6_1.svg)



Expand All @@ -263,11 +294,11 @@ Build Info:
Official https://julialang.org/ release
Platform Info:
OS: Linux (x86_64-linux-gnu)
CPU: 12 × Intel(R) Core(TM) i7-6800K CPU @ 3.40GHz
CPU: 6 × 13th Gen Intel(R) Core(TM) i9-13900K
WORD_SIZE: 64
LIBM: libopenlibm
LLVM: libLLVM-14.0.6 (ORCJIT, broadwell)
Threads: 12 on 12 virtual cores
LLVM: libLLVM-14.0.6 (ORCJIT, goldmont)
Threads: 6 on 6 virtual cores
Environment:
JULIA_NUM_THREADS = auto
JULIA_STACKTRACE_MINIMAL = true
Expand All @@ -285,27 +316,25 @@ Pkg.status()

```
Status `~/.julia/dev/ProbNumDiffEq/benchmarks/Project.toml`
[f3b72e0c] DiffEqDevTools v2.39.1
[f3b72e0c] DiffEqDevTools v2.41.0 `~/.julia/dev/DiffEqDevTools`
[31c24e10] Distributions v0.25.103
[7073ff75] IJulia v1.24.2
[7f56f5a3] LSODA v0.7.5
[e6f89c97] LoggingExtras v1.0.3
[e2752cbe] MATLABDiffEq v1.2.0
[961ee093] ModelingToolkit v8.72.2
[54ca160b] ODEInterface v0.5.0
[09606e27] ODEInterfaceDiffEq v3.13.3
[1dea7af3] OrdinaryDiffEq v6.59.0
[65888b18] ParameterizedFunctions v5.16.0
[91a5bcdd] Plots v1.39.0
[bf3e78b0] ProbNumDiffEq v0.13.0 `~/.julia/dev/ProbNumDiffEq`
[0bca4576] SciMLBase v2.7.3
[0bca4576] SciMLBase v2.8.0
[505e40e9] SciPyDiffEq v0.2.1
[ce78b400] SimpleUnPack v1.1.0
[90137ffa] StaticArrays v1.6.5
[c3572dad] Sundials v4.20.1
[44d3d7a6] Weave v0.10.12
[0518478a] deSolveDiffEq v0.1.1
Info Packages marked with ⌃ have new versions available and may be upgradab
le.
```


Expand All @@ -323,13 +352,14 @@ Status `~/.julia/dev/ProbNumDiffEq/benchmarks/Manifest.toml`
⌅ [c3fe647b] AbstractAlgebra v0.32.5
[621f4979] AbstractFFTs v1.5.0
[1520ce14] AbstractTrees v0.4.4
[7d9f7c33] Accessors v0.1.33
[79e6a3ab] Adapt v3.7.1
[ec485272] ArnoldiMethod v0.2.0
[c9d4266f] ArrayAllocators v0.3.0
[4fba245c] ArrayInterface v7.5.1
[6e4b80f9] BenchmarkTools v1.3.2
[e2ed5e7c] Bijections v0.1.6
[d1d4a3ce] BitFlags v0.1.7
[d1d4a3ce] BitFlags v0.1.8
[62783981] BitTwiddlingConvenienceFunctions v0.1.5
[fa961155] CEnum v0.5.0
[2a0fbf3d] CPUSummary v0.2.4
Expand All @@ -349,6 +379,7 @@ Status `~/.julia/dev/ProbNumDiffEq/benchmarks/Manifest.toml`
[bbf7d656] CommonSubexpressions v0.3.0
[34da2185] Compat v4.10.0
[b152e2b5] CompositeTypes v0.1.3
[a33af91c] CompositionsBase v0.1.2
[2569d6c7] ConcreteStructs v0.2.3
[f0e56b4a] ConcurrentUtilities v2.3.0
[8f4d0f93] Conda v1.9.1
Expand All @@ -365,7 +396,7 @@ Status `~/.julia/dev/ProbNumDiffEq/benchmarks/Manifest.toml`
[8bb1440f] DelimitedFiles v1.9.1
[2b5f629d] DiffEqBase v6.138.1
[459566f4] DiffEqCallbacks v2.33.1
[f3b72e0c] DiffEqDevTools v2.39.1
[f3b72e0c] DiffEqDevTools v2.41.0 `~/.julia/dev/DiffEqDevTools`
[77a26b50] DiffEqNoiseProcess v5.19.0
[163ba53b] DiffResults v1.1.0
[b552c78f] DiffRules v1.15.1
Expand Down Expand Up @@ -415,6 +446,7 @@ Status `~/.julia/dev/ProbNumDiffEq/benchmarks/Manifest.toml`
[842dd82b] InlineStrings v1.4.0
[18e54dd8] IntegerMathUtils v0.1.2
[8197267c] IntervalSets v0.7.8
[3587e190] InverseFunctions v0.1.12
[41ab1584] InvertedIndices v1.3.0
[92d709cd] IrrationalConstants v0.2.2
[c8e1da08] IterTools v1.8.0
Expand All @@ -432,21 +464,19 @@ Status `~/.julia/dev/ProbNumDiffEq/benchmarks/Manifest.toml`
[2ee39098] LabelledArrays v1.14.0
[984bce1d] LambertW v0.4.6
[23fbe1c1] Latexify v0.16.1
[73f95e8e] LatticeRules v0.0.1
[10f19ff3] LayoutPointers v0.1.15
[50d2b5c4] Lazy v0.15.1
[1d6d02ad] LeftChildRightSiblingTrees v0.2.0
[d3d80556] LineSearches v7.2.0
[7ed4a6bd] LinearSolve v2.17.1
[7ed4a6bd] LinearSolve v2.20.0
[2ab3a3ac] LogExpFunctions v0.3.26
[e6f89c97] LoggingExtras v1.0.3
[bdcacae8] LoopVectorization v0.12.166
[10e44e05] MATLAB v0.8.4
[e2752cbe] MATLABDiffEq v1.2.0
[33e6dc65] MKL v0.6.1
[d8e11817] MLStyle v0.4.17
[1914dd2f] MacroTools v0.5.11
[d125e4d3] ManualMemory v0.1.8
[739be429] MbedTLS v1.1.7
[739be429] MbedTLS v1.1.8
[442fdcdd] Measures v0.3.2
[e1d29d7a] Missings v1.1.0
[961ee093] ModelingToolkit v8.72.2
Expand All @@ -467,12 +497,12 @@ Status `~/.julia/dev/ProbNumDiffEq/benchmarks/Manifest.toml`
[429524aa] Optim v1.7.8
[bac558e1] OrderedCollections v1.6.2
[1dea7af3] OrdinaryDiffEq v6.59.0
[90014a1f] PDMats v0.11.28
[90014a1f] PDMats v0.11.29
[fe68d972] PSDMatrices v0.4.6
[65ce6f38] PackageExtensionCompat v1.0.2
[65888b18] ParameterizedFunctions v5.16.0
[d96e819e] Parameters v0.12.3
[69de0a69] Parsers v2.7.2
[69de0a69] Parsers v2.8.0
[b98c9c47] Pipe v1.3.0
[32113eaa] PkgBenchmark v0.2.12
[ccf2f8ad] PlotThemes v3.1.0
Expand All @@ -488,19 +518,20 @@ Status `~/.julia/dev/ProbNumDiffEq/benchmarks/Manifest.toml`
[aea7be01] PrecompileTools v1.2.0
[21216c6a] Preferences v1.4.1
[08abe8d2] PrettyTables v2.2.8
[27ebfcd6] Primes v0.5.4
[27ebfcd6] Primes v0.5.5
[bf3e78b0] ProbNumDiffEq v0.13.0 `~/.julia/dev/ProbNumDiffEq`
[33c8b6b6] ProgressLogging v0.1.4
[438e738f] PyCall v1.96.1
[438e738f] PyCall v1.96.2
[1fd47b50] QuadGK v2.9.1
[8a4e6c94] QuasiMonteCarlo v0.3.2
[6f49c342] RCall v0.13.18
[74087812] Random123 v1.6.1
[fb686558] RandomExtensions v0.4.4
[e6cf234a] RandomNumbers v1.5.3
[3cdcf5f2] RecipesBase v1.3.4
[01d81517] RecipesPipeline v0.6.12
[731186ca] RecursiveArrayTools v2.38.10
[f2c3362d] RecursiveFactorization v0.2.20
[f2c3362d] RecursiveFactorization v0.2.21
[189a3867] Reexport v1.2.2
[05181044] RelocatableFolders v1.0.1
[ae029012] Requires v1.3.0
Expand All @@ -511,7 +542,7 @@ Status `~/.julia/dev/ProbNumDiffEq/benchmarks/Manifest.toml`
[fdea26ae] SIMD v3.4.6
[94e857df] SIMDTypes v0.1.0
[476501e8] SLEEFPirates v0.6.42
[0bca4576] SciMLBase v2.7.3
[0bca4576] SciMLBase v2.8.0
[e9a6253c] SciMLNLSolve v0.1.9
[c0aeaf25] SciMLOperators v0.3.7
[505e40e9] SciPyDiffEq v0.2.1
Expand All @@ -525,6 +556,7 @@ Status `~/.julia/dev/ProbNumDiffEq/benchmarks/Manifest.toml`
[699a6c99] SimpleTraits v0.9.4
[ce78b400] SimpleUnPack v1.1.0
[66db9d55] SnoopPrecompile v1.0.3
[ed01d8cd] Sobol v1.5.0
[b85f4697] SoftGlobalScope v1.1.0
[a2af1166] SortingAlgorithms v1.2.0
[47a9eef4] SparseDiffTools v2.11.0
Expand All @@ -539,7 +571,7 @@ Status `~/.julia/dev/ProbNumDiffEq/benchmarks/Manifest.toml`
[2913bbd2] StatsBase v0.34.2
[4c63d2b9] StatsFuns v1.3.0
[3eaba693] StatsModels v0.7.3
[7792a7ef] StrideArraysCore v0.4.17
[7792a7ef] StrideArraysCore v0.5.1
[69024149] StringEncodings v0.3.7
[892a3eda] StringManipulation v0.3.4
[09ab397b] StructArrays v0.6.16
Expand All @@ -565,7 +597,7 @@ Status `~/.julia/dev/ProbNumDiffEq/benchmarks/Manifest.toml`
[5c2747f8] URIs v1.5.1
[3a884ed6] UnPack v1.0.2
[1cfade01] UnicodeFun v0.4.1
[1986cc42] Unitful v1.17.0
[1986cc42] Unitful v1.18.0
[45397f5d] UnitfulLatexify v1.6.3
[a7c27f48] Unityper v0.1.5
[41fe7b60] Unzip v0.2.0
Expand Down Expand Up @@ -712,9 +744,9 @@ Status `~/.julia/dev/ProbNumDiffEq/benchmarks/Manifest.toml`
[8e850b90] libblastrampoline_jll v5.8.0+0
[8e850ede] nghttp2_jll v1.48.0+0
[3f19e933] p7zip_jll v17.4.0+0
Info Packages marked with ⌃ and ⌅ have new versions available, but those wi
th ⌅ are restricted by compatibility constraints from upgrading. To see why
use `status --outdated -m`
Info Packages marked with ⌅ have new versions available but compatibility c
onstraints restrict them from upgrading. To see why use `status --outdated
-m`
```


Loading

0 comments on commit 9697921

Please sign in to comment.