From 51d63256a7b3020ee11931d61b4db97b9ded02c0 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Wed, 16 Nov 2022 09:15:36 +0100 Subject: 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. --- vignettes/mkin.html | 2 +- vignettes/web_only/benchmarks.html | 91 +++++++++++++++++++++++++++++++- vignettes/web_only/mkin_benchmarks.rda | Bin 1586 -> 1641 bytes vignettes/web_only/saem_benchmarks.html | 59 ++++++++++++++++----- vignettes/web_only/saem_benchmarks.rda | Bin 359 -> 471 bytes 5 files changed, 137 insertions(+), 15 deletions(-) (limited to 'vignettes') 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 {

Introduction to mkin

Johannes Ranke

-

Last change 15 February 2021 (rebuilt 2022-07-12)

+

Last change 15 February 2021 (rebuilt 2022-11-15)

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 {

Benchmark timings for mkin

Johannes Ranke

-

Last change 14 July 2022 (rebuilt 2022-07-14)

+

Last change 14 July 2022 (rebuilt 2022-11-15)

@@ -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), 1.770 3.377 + +Linux +Ryzen 7 1700 +4.2.1 +1.1.2 +1.957 +3.633 + + +Linux +Ryzen 7 1700 +4.2.2 +1.2.0 +2.129 +3.784 + + +Linux +Ryzen 7 1700 +4.2.2 +1.3.0 +2.046 +3.693 + @@ -1979,6 +2003,33 @@ t11 <- system.time(mmkin_bench(list(m_synth_DFOP_par), list(DFOP_par_c), 5.758 2.558 + +Linux +Ryzen 7 1700 +4.2.1 +1.1.2 +1.503 +6.147 +2.803 + + +Linux +Ryzen 7 1700 +4.2.2 +1.2.0 +1.559 +6.097 +2.841 + + +Linux +Ryzen 7 1700 +4.2.2 +1.3.0 +1.230 +4.333 +2.187 + @@ -2193,6 +2244,42 @@ t11 <- system.time(mmkin_bench(list(m_synth_DFOP_par), list(DFOP_par_c), 1.744 2.566 + +Linux +Ryzen 7 1700 +4.2.1 +1.1.2 +0.861 +1.295 +1.507 +3.102 +1.961 +2.852 + + +Linux +Ryzen 7 1700 +4.2.2 +1.2.0 +0.911 +1.328 +1.519 +2.986 +1.957 +2.769 + + +Linux +Ryzen 7 1700 +4.2.2 +1.3.0 +0.693 +0.996 +1.121 +2.174 +1.427 +2.026 + diff --git a/vignettes/web_only/mkin_benchmarks.rda b/vignettes/web_only/mkin_benchmarks.rda index 2d3deb26..c07def65 100644 Binary files a/vignettes/web_only/mkin_benchmarks.rda and b/vignettes/web_only/mkin_benchmarks.rda differ 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 {

Benchmark timings for saem.mmkin

Johannes Ranke

-

Last change 14 November 2022 (rebuilt 2022-11-14)

+

Last change 14 November 2022 (rebuilt 2022-11-15)

@@ -1781,10 +1781,20 @@ t11 <- system.time(sforb_sfo3_plus_const <- saem(three_met_sep_tc["SF Linux 1.2.0 3.2 -2.996 -5.207 -5.317 -5.171 +2.110 +4.632 +4.264 +4.930 + + +Ryzen 7 1700 +Linux +1.3.0 +3.2 +2.394 +4.748 +4.883 +4.937 @@ -1808,10 +1818,20 @@ t11 <- system.time(sforb_sfo3_plus_const <- saem(three_met_sep_tc["SF Linux 1.2.0 3.2 -5.671 -7.696 -8.166 -8.168 +5.602 +7.373 +7.815 +7.831 + + +Ryzen 7 1700 +Linux +1.3.0 +3.2 +5.622 +7.445 +8.297 +7.740 @@ -1836,8 +1856,16 @@ t11 <- system.time(sforb_sfo3_plus_const <- saem(three_met_sep_tc["SF Linux 1.2.0 3.2 -24.883 -818.157 +24.014 +749.699 + + +Ryzen 7 1700 +Linux +1.3.0 +3.2 +24.480 +519.087 @@ -1861,7 +1889,14 @@ t11 <- system.time(sforb_sfo3_plus_const <- saem(three_met_sep_tc["SF Linux 1.2.0 3.2 -1355.036 +1249.834 + + +Ryzen 7 1700 +Linux +1.3.0 +3.2 +944.471 diff --git a/vignettes/web_only/saem_benchmarks.rda b/vignettes/web_only/saem_benchmarks.rda index e8b139da..992b58cf 100644 Binary files a/vignettes/web_only/saem_benchmarks.rda and b/vignettes/web_only/saem_benchmarks.rda differ -- cgit v1.2.1