diff options
author | Johannes Ranke <jranke@uni-bremen.de> | 2022-11-16 09:15:36 +0100 |
---|---|---|
committer | Johannes Ranke <jranke@uni-bremen.de> | 2022-11-16 09:15:36 +0100 |
commit | 51d63256a7b3020ee11931d61b4db97b9ded02c0 (patch) | |
tree | cb6d628211c99cb6dd1938428a18ef4dd5a997dc /vignettes | |
parent | 679cf716192cdfd91dfd232578cbd4e30d7eac12 (diff) |
We get about 25% performance gain
with the custom lsoda call, avoiding repeated getNativeSymbolInfo calls.
It's just that we should not be calling foreign functions from different
packages, because the may change without notice. Using
getNativeSymbolInfo for "call_lsoda" avoids the CRAN note, and a similar
call could probably be used for "unlock_solver", avoiding the NOTE in
checks for cran, but we should not do this in a CRAN package.
Diffstat (limited to 'vignettes')
-rw-r--r-- | vignettes/mkin.html | 2 | ||||
-rw-r--r-- | vignettes/web_only/benchmarks.html | 91 | ||||
-rw-r--r-- | vignettes/web_only/mkin_benchmarks.rda | bin | 1586 -> 1641 bytes | |||
-rw-r--r-- | vignettes/web_only/saem_benchmarks.html | 59 | ||||
-rw-r--r-- | vignettes/web_only/saem_benchmarks.rda | bin | 359 -> 471 bytes |
5 files changed, 137 insertions, 15 deletions
diff --git a/vignettes/mkin.html b/vignettes/mkin.html index 0d5ed6fc..38c44a0f 100644 --- a/vignettes/mkin.html +++ b/vignettes/mkin.html @@ -1599,7 +1599,7 @@ div.tocify { <h1 class="title toc-ignore">Introduction to mkin</h1> <h4 class="author">Johannes Ranke</h4> -<h4 class="date">Last change 15 February 2021 (rebuilt 2022-07-12)</h4> +<h4 class="date">Last change 15 February 2021 (rebuilt 2022-11-15)</h4> </div> diff --git a/vignettes/web_only/benchmarks.html b/vignettes/web_only/benchmarks.html index 5f81f39f..5376c1f5 100644 --- a/vignettes/web_only/benchmarks.html +++ b/vignettes/web_only/benchmarks.html @@ -1599,7 +1599,7 @@ div.tocify { <h1 class="title toc-ignore">Benchmark timings for mkin</h1> <h4 class="author">Johannes Ranke</h4> -<h4 class="date">Last change 14 July 2022 (rebuilt 2022-07-14)</h4> +<h4 class="date">Last change 14 July 2022 (rebuilt 2022-11-15)</h4> </div> @@ -1635,7 +1635,7 @@ FOMC_SFO <- mkinmod( parent = mkinsub("FOMC", "m1"), m1 = mkinsub("SFO")) DFOP_SFO <- mkinmod( - parent = mkinsub("FOMC", "m1"), + parent = mkinsub("FOMC", "m1"), # erroneously used FOMC twice, not fixed for consistency m1 = mkinsub("SFO")) t3 <- system.time(mmkin_bench(list(SFO_SFO, FOMC_SFO, DFOP_SFO), list(FOCUS_D)))[["elapsed"]] t4 <- system.time(mmkin_bench(list(SFO_SFO, FOMC_SFO, DFOP_SFO), list(FOCUS_D), @@ -1816,6 +1816,30 @@ t11 <- system.time(mmkin_bench(list(m_synth_DFOP_par), list(DFOP_par_c), <td align="right">1.770</td> <td align="right">3.377</td> </tr> +<tr class="odd"> +<td align="left">Linux</td> +<td align="left">Ryzen 7 1700</td> +<td align="left">4.2.1</td> +<td align="left">1.1.2</td> +<td align="right">1.957</td> +<td align="right">3.633</td> +</tr> +<tr class="even"> +<td align="left">Linux</td> +<td align="left">Ryzen 7 1700</td> +<td align="left">4.2.2</td> +<td align="left">1.2.0</td> +<td align="right">2.129</td> +<td align="right">3.784</td> +</tr> +<tr class="odd"> +<td align="left">Linux</td> +<td align="left">Ryzen 7 1700</td> +<td align="left">4.2.2</td> +<td align="left">1.3.0</td> +<td align="right">2.046</td> +<td align="right">3.693</td> +</tr> </tbody> </table> </div> @@ -1979,6 +2003,33 @@ t11 <- system.time(mmkin_bench(list(m_synth_DFOP_par), list(DFOP_par_c), <td align="right">5.758</td> <td align="right">2.558</td> </tr> +<tr class="odd"> +<td align="left">Linux</td> +<td align="left">Ryzen 7 1700</td> +<td align="left">4.2.1</td> +<td align="left">1.1.2</td> +<td align="right">1.503</td> +<td align="right">6.147</td> +<td align="right">2.803</td> +</tr> +<tr class="even"> +<td align="left">Linux</td> +<td align="left">Ryzen 7 1700</td> +<td align="left">4.2.2</td> +<td align="left">1.2.0</td> +<td align="right">1.559</td> +<td align="right">6.097</td> +<td align="right">2.841</td> +</tr> +<tr class="odd"> +<td align="left">Linux</td> +<td align="left">Ryzen 7 1700</td> +<td align="left">4.2.2</td> +<td align="left">1.3.0</td> +<td align="right">1.230</td> +<td align="right">4.333</td> +<td align="right">2.187</td> +</tr> </tbody> </table> </div> @@ -2193,6 +2244,42 @@ t11 <- system.time(mmkin_bench(list(m_synth_DFOP_par), list(DFOP_par_c), <td align="right">1.744</td> <td align="right">2.566</td> </tr> +<tr class="odd"> +<td align="left">Linux</td> +<td align="left">Ryzen 7 1700</td> +<td align="left">4.2.1</td> +<td align="left">1.1.2</td> +<td align="right">0.861</td> +<td align="right">1.295</td> +<td align="right">1.507</td> +<td align="right">3.102</td> +<td align="right">1.961</td> +<td align="right">2.852</td> +</tr> +<tr class="even"> +<td align="left">Linux</td> +<td align="left">Ryzen 7 1700</td> +<td align="left">4.2.2</td> +<td align="left">1.2.0</td> +<td align="right">0.911</td> +<td align="right">1.328</td> +<td align="right">1.519</td> +<td align="right">2.986</td> +<td align="right">1.957</td> +<td align="right">2.769</td> +</tr> +<tr class="odd"> +<td align="left">Linux</td> +<td align="left">Ryzen 7 1700</td> +<td align="left">4.2.2</td> +<td align="left">1.3.0</td> +<td align="right">0.693</td> +<td align="right">0.996</td> +<td align="right">1.121</td> +<td align="right">2.174</td> +<td align="right">1.427</td> +<td align="right">2.026</td> +</tr> </tbody> </table> </div> diff --git a/vignettes/web_only/mkin_benchmarks.rda b/vignettes/web_only/mkin_benchmarks.rda Binary files differindex 2d3deb26..c07def65 100644 --- a/vignettes/web_only/mkin_benchmarks.rda +++ b/vignettes/web_only/mkin_benchmarks.rda diff --git a/vignettes/web_only/saem_benchmarks.html b/vignettes/web_only/saem_benchmarks.html index 4875bb1b..714dc1ff 100644 --- a/vignettes/web_only/saem_benchmarks.html +++ b/vignettes/web_only/saem_benchmarks.html @@ -1599,7 +1599,7 @@ div.tocify { <h1 class="title toc-ignore">Benchmark timings for saem.mmkin</h1> <h4 class="author">Johannes Ranke</h4> -<h4 class="date">Last change 14 November 2022 (rebuilt 2022-11-14)</h4> +<h4 class="date">Last change 14 November 2022 (rebuilt 2022-11-15)</h4> </div> @@ -1781,10 +1781,20 @@ t11 <- system.time(sforb_sfo3_plus_const <- saem(three_met_sep_tc["SF <td align="left">Linux</td> <td align="left">1.2.0</td> <td align="left">3.2</td> -<td align="right">2.996</td> -<td align="right">5.207</td> -<td align="right">5.317</td> -<td align="right">5.171</td> +<td align="right">2.110</td> +<td align="right">4.632</td> +<td align="right">4.264</td> +<td align="right">4.930</td> +</tr> +<tr class="even"> +<td align="left">Ryzen 7 1700</td> +<td align="left">Linux</td> +<td align="left">1.3.0</td> +<td align="left">3.2</td> +<td align="right">2.394</td> +<td align="right">4.748</td> +<td align="right">4.883</td> +<td align="right">4.937</td> </tr> </tbody> </table> @@ -1808,10 +1818,20 @@ t11 <- system.time(sforb_sfo3_plus_const <- saem(three_met_sep_tc["SF <td align="left">Linux</td> <td align="left">1.2.0</td> <td align="left">3.2</td> -<td align="right">5.671</td> -<td align="right">7.696</td> -<td align="right">8.166</td> -<td align="right">8.168</td> +<td align="right">5.602</td> +<td align="right">7.373</td> +<td align="right">7.815</td> +<td align="right">7.831</td> +</tr> +<tr class="even"> +<td align="left">Ryzen 7 1700</td> +<td align="left">Linux</td> +<td align="left">1.3.0</td> +<td align="left">3.2</td> +<td align="right">5.622</td> +<td align="right">7.445</td> +<td align="right">8.297</td> +<td align="right">7.740</td> </tr> </tbody> </table> @@ -1836,8 +1856,16 @@ t11 <- system.time(sforb_sfo3_plus_const <- saem(three_met_sep_tc["SF <td align="left">Linux</td> <td align="left">1.2.0</td> <td align="left">3.2</td> -<td align="right">24.883</td> -<td align="right">818.157</td> +<td align="right">24.014</td> +<td align="right">749.699</td> +</tr> +<tr class="even"> +<td align="left">Ryzen 7 1700</td> +<td align="left">Linux</td> +<td align="left">1.3.0</td> +<td align="left">3.2</td> +<td align="right">24.480</td> +<td align="right">519.087</td> </tr> </tbody> </table> @@ -1861,7 +1889,14 @@ t11 <- system.time(sforb_sfo3_plus_const <- saem(three_met_sep_tc["SF <td align="left">Linux</td> <td align="left">1.2.0</td> <td align="left">3.2</td> -<td align="right">1355.036</td> +<td align="right">1249.834</td> +</tr> +<tr class="even"> +<td align="left">Ryzen 7 1700</td> +<td align="left">Linux</td> +<td align="left">1.3.0</td> +<td align="left">3.2</td> +<td align="right">944.471</td> </tr> </tbody> </table> diff --git a/vignettes/web_only/saem_benchmarks.rda b/vignettes/web_only/saem_benchmarks.rda Binary files differindex e8b139da..992b58cf 100644 --- a/vignettes/web_only/saem_benchmarks.rda +++ b/vignettes/web_only/saem_benchmarks.rda |