From 45992316ba8016d8de07e60d2eadc3d0c4f32a09 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Mon, 7 Oct 2024 12:08:53 +0100 Subject: [PATCH 1/6] Updated to 'Armadillo-4.10.0' image --- docker-compose_armadillo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose_armadillo.yml b/docker-compose_armadillo.yml index f8cb030e..3b9492ee 100644 --- a/docker-compose_armadillo.yml +++ b/docker-compose_armadillo.yml @@ -3,7 +3,7 @@ services: hostname: armadillo ports: - 8080:8080 - image: datashield/armadillo_citest:4.8.1 + image: datashield/armadillo_citest:4.10.0 environment: LOGGING_CONFIG: 'classpath:logback-file.xml' AUDIT_LOG_PATH: '/app/logs/audit.log' From 11576e02ef95e1fc5f682e9932d3b152958f24a5 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Tue, 8 Oct 2024 15:46:02 +0100 Subject: [PATCH 2/6] Switch to 'knot-devel' profile --- docker-compose_armadillo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose_armadillo.yml b/docker-compose_armadillo.yml index 3b9492ee..733edd5e 100644 --- a/docker-compose_armadillo.yml +++ b/docker-compose_armadillo.yml @@ -16,6 +16,6 @@ services: default: hostname: default - image: datashield/rock-junction-devel-permissive:latest + image: datashield/rock-knot-devel-permissive:latest environment: DEBUG: "FALSE" From ef6d93f25f2427d03b621f80794a02b56c47553f Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Tue, 8 Oct 2024 15:47:12 +0100 Subject: [PATCH 3/6] Switch to 'Armadillo - Azure Pipeline' --- .../perf_files/default_perf_profile.csv | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/testthat/perf_files/default_perf_profile.csv b/tests/testthat/perf_files/default_perf_profile.csv index 9d5c755f..85018d8b 100644 --- a/tests/testthat/perf_files/default_perf_profile.csv +++ b/tests/testthat/perf_files/default_perf_profile.csv @@ -1,14 +1,14 @@ "refer_name","rate","lower_tolerance","upper_tolerance" -"conndisconn::perf::simple0","0.229","0.5","2" -"ds.abs::perf::0","1.796","0.5","2" -"ds.asInteger::perf:0","1.538","0.5","2" -"ds.asList::perf:0","3.061","0.5","2" -"ds.asNumeric::perf:0","1.548","0.5","2" -"ds.assign::perf::0","3.556","0.5","2" -"ds.class::perf::combine:0","3.149","0.5","2" -"ds.colnames::perf:0","2.584","0.5","2" -"ds.exists::perf::combine:0","7.138","0.5","2" -"ds.length::perf::combine:0","6.385","0.5","2" -"ds.mean::perf::combine:0","5.982","0.5","2" -"ds.mean::perf::split:0","6.923","0.5","2" -"void::perf::void::0","41810.0","0.5","2" +"conndisconn::perf::simple0","0.06223","0.5","2" +"ds.abs::perf::0","0.8101","0.5","2" +"ds.asInteger::perf:0","0.8950","0.5","2" +"ds.asList::perf:0","1.754","0.5","2" +"ds.asNumeric::perf:0","0.8654","0.5","2" +"ds.assign::perf::0","1.683","0.5","2" +"ds.class::perf::combine:0","1.755","0.5","2" +"ds.colnames::perf:0","1.099","0.5","2" +"ds.exists::perf::combine:0","3.627","0.5","2" +"ds.length::perf::combine:0","3.556","0.5","2" +"ds.mean::perf::combine:0","3.548","0.5","2" +"ds.mean::perf::split:0","3.508","0.5","2" +"void::perf::void::0","24560.0","0.5","2" From 48e9c70daf478bb38c2024f25e5f1b6e249ab6b8 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Tue, 8 Oct 2024 16:46:47 +0100 Subject: [PATCH 4/6] Updated values --- .../perf_files/armadillo_hp-laptop_quay.csv | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/testthat/perf_files/armadillo_hp-laptop_quay.csv b/tests/testthat/perf_files/armadillo_hp-laptop_quay.csv index f3273574..417e89f4 100644 --- a/tests/testthat/perf_files/armadillo_hp-laptop_quay.csv +++ b/tests/testthat/perf_files/armadillo_hp-laptop_quay.csv @@ -1,14 +1,14 @@ "refer_name","rate","lower_tolerance","upper_tolerance" -"conndisconn::perf::simple0","0.05471","0.5","2" -"ds.abs::perf::0","0.5769","0.5","2" -"ds.asInteger::perf:0","0.6371","0.5","2" -"ds.asList::perf:0","1.296","0.5","2" -"ds.asNumeric::perf:0","0.6456","0.5","2" -"ds.assign::perf::0","1.349","0.5","2" -"ds.class::perf::combine:0","1.490","0.5","2" -"ds.colnames::perf:0","0.9683","0.5","2" -"ds.exists::perf::combine:0","2.999","0.5","2" -"ds.length::perf::combine:0","2.963","0.5","2" -"ds.mean::perf::combine:0","2.976","0.5","2" -"ds.mean::perf::split:0","2.758","0.5","2" -"void::perf::void::0","23050","0.5","2" +"conndisconn::perf::simple0","0.0728825086646545","0.5","2" +"ds.abs::perf::0","1.82780826738886","0.5","2" +"ds.asInteger::perf:0","1.82494215205532","0.5","2" +"ds.asList::perf:0","4.63744814345485","0.5","2" +"ds.asNumeric::perf:0","2.17634899364127","0.5","2" +"ds.assign::perf::0","4.03888444894903","0.5","2" +"ds.class::perf::combine:0","4.99978056980171","0.5","2" +"ds.colnames::perf:0","3.24967546869707","0.5","2" +"ds.exists::perf::combine:0","9.59415959170337","0.5","2" +"ds.length::perf::combine:0","9.9987761882776","0.5","2" +"ds.mean::perf::combine:0","8.62936433290321","0.5","2" +"ds.mean::perf::split:0","8.55029467108351","0.5","2" +"void::perf::void::0","21874.0401780822","0.5","2" From bc369586deccc2d784a91ce3b60ccd1771f9c176 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Wed, 9 Oct 2024 12:04:51 +0100 Subject: [PATCH 5/6] Update mesurements --- .../perf_files/armadillo_azure-pipeline.csv | 26 +++++++++---------- .../perf_files/default_perf_profile.csv | 26 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/tests/testthat/perf_files/armadillo_azure-pipeline.csv b/tests/testthat/perf_files/armadillo_azure-pipeline.csv index 85018d8b..5fd247c9 100644 --- a/tests/testthat/perf_files/armadillo_azure-pipeline.csv +++ b/tests/testthat/perf_files/armadillo_azure-pipeline.csv @@ -1,14 +1,14 @@ "refer_name","rate","lower_tolerance","upper_tolerance" -"conndisconn::perf::simple0","0.06223","0.5","2" -"ds.abs::perf::0","0.8101","0.5","2" -"ds.asInteger::perf:0","0.8950","0.5","2" -"ds.asList::perf:0","1.754","0.5","2" -"ds.asNumeric::perf:0","0.8654","0.5","2" -"ds.assign::perf::0","1.683","0.5","2" -"ds.class::perf::combine:0","1.755","0.5","2" -"ds.colnames::perf:0","1.099","0.5","2" -"ds.exists::perf::combine:0","3.627","0.5","2" -"ds.length::perf::combine:0","3.556","0.5","2" -"ds.mean::perf::combine:0","3.548","0.5","2" -"ds.mean::perf::split:0","3.508","0.5","2" -"void::perf::void::0","24560.0","0.5","2" +"conndisconn::perf::simple0","0.1050","0.5","2" +"ds.abs::perf::0","3.896","0.5","2" +"ds.asInteger::perf:0","3.550","0.5","2" +"ds.asList::perf:0","8.040","0.5","2" +"ds.asNumeric::perf:0","3.577","0.5","2" +"ds.assign::perf::0","6.739","0.5","2" +"ds.class::perf::combine:0","8.171","0.5","2" +"ds.colnames::perf:0","6.292","0.5","2" +"ds.exists::perf::combine:0","16.33","0.5","2" +"ds.length::perf::combine:0","16.08","0.5","2" +"ds.mean::perf::combine:0","16.08","0.5","2" +"ds.mean::perf::split:0","15.83","0.5","2" +"void::perf::void::0","36510.0","0.5","2" diff --git a/tests/testthat/perf_files/default_perf_profile.csv b/tests/testthat/perf_files/default_perf_profile.csv index 85018d8b..5fd247c9 100644 --- a/tests/testthat/perf_files/default_perf_profile.csv +++ b/tests/testthat/perf_files/default_perf_profile.csv @@ -1,14 +1,14 @@ "refer_name","rate","lower_tolerance","upper_tolerance" -"conndisconn::perf::simple0","0.06223","0.5","2" -"ds.abs::perf::0","0.8101","0.5","2" -"ds.asInteger::perf:0","0.8950","0.5","2" -"ds.asList::perf:0","1.754","0.5","2" -"ds.asNumeric::perf:0","0.8654","0.5","2" -"ds.assign::perf::0","1.683","0.5","2" -"ds.class::perf::combine:0","1.755","0.5","2" -"ds.colnames::perf:0","1.099","0.5","2" -"ds.exists::perf::combine:0","3.627","0.5","2" -"ds.length::perf::combine:0","3.556","0.5","2" -"ds.mean::perf::combine:0","3.548","0.5","2" -"ds.mean::perf::split:0","3.508","0.5","2" -"void::perf::void::0","24560.0","0.5","2" +"conndisconn::perf::simple0","0.1050","0.5","2" +"ds.abs::perf::0","3.896","0.5","2" +"ds.asInteger::perf:0","3.550","0.5","2" +"ds.asList::perf:0","8.040","0.5","2" +"ds.asNumeric::perf:0","3.577","0.5","2" +"ds.assign::perf::0","6.739","0.5","2" +"ds.class::perf::combine:0","8.171","0.5","2" +"ds.colnames::perf:0","6.292","0.5","2" +"ds.exists::perf::combine:0","16.33","0.5","2" +"ds.length::perf::combine:0","16.08","0.5","2" +"ds.mean::perf::combine:0","16.08","0.5","2" +"ds.mean::perf::split:0","15.83","0.5","2" +"void::perf::void::0","36510.0","0.5","2" From e472e5a0d729a93561c531f78d59f53ea1c04583 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Mon, 14 Oct 2024 14:28:15 +0100 Subject: [PATCH 6/6] Set options datashield.return_errors to FALSE --- armadillo_azure-pipelines.yml | 2 ++ azure-pipelines.yml | 2 ++ opal_azure-pipelines.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/armadillo_azure-pipelines.yml b/armadillo_azure-pipelines.yml index 192bf470..f92125a1 100644 --- a/armadillo_azure-pipelines.yml +++ b/armadillo_azure-pipelines.yml @@ -289,6 +289,7 @@ jobs: junit_rep <- JunitReporter$new(file = "test_results_dsbase.xml"); progress_rep <- ProgressReporter$new(max_failures = 999999); multi_rep <- MultiReporter$new(reporters = list(progress_rep, junit_rep)); + options("datashield.return_errors" = FALSE); options("default_driver" = "ArmadilloDriver"); testthat::test_package("$(projectName)", filter = "_-|datachk-|smk-|arg-|disc-|perf-|smk_expt-|expt-|math-", reporter = multi_rep, stop_on_failure = FALSE) '"'"' @@ -410,6 +411,7 @@ jobs: junit_rep <- JunitReporter$new(file = "test_results_dsdanger.xml"); progress_rep <- ProgressReporter$new(max_failures = 999999); multi_rep <- MultiReporter$new(reporters = list(progress_rep, junit_rep)); + options("datashield.return_errors" = FALSE); options("default_driver" = "ArmadilloDriver"); testthat::test_package("$(projectName)", filter = "__dgr-|datachk_dgr-|smk_dgr-|arg_dgr-|disc_dgr-|smk_expt_dgr-|expt_dgr-|math_dgr-", reporter = multi_rep, stop_on_failure = FALSE) '"'"' diff --git a/azure-pipelines.yml b/azure-pipelines.yml index faea6e89..db0f4f30 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -288,6 +288,7 @@ jobs: junit_rep <- JunitReporter$new(file = "test_results_dsbase.xml"); progress_rep <- ProgressReporter$new(max_failures = 999999); multi_rep <- MultiReporter$new(reporters = list(progress_rep, junit_rep)); + options("datashield.return_errors" = FALSE); options("default_driver" = "OpalDriver"); testthat::test_package("$(projectName)", filter = "_-|datachk-|smk-|arg-|disc-|perf-|smk_expt-|expt-|math-", reporter = multi_rep, stop_on_failure = FALSE) '"'"' @@ -401,6 +402,7 @@ jobs: junit_rep <- JunitReporter$new(file = "test_results_dsdanger.xml"); progress_rep <- ProgressReporter$new(max_failures = 999999); multi_rep <- MultiReporter$new(reporters = list(progress_rep, junit_rep)); + options("datashield.return_errors" = FALSE); options("default_driver" = "OpalDriver"); testthat::test_package("$(projectName)", filter = "__dgr-|datachk_dgr-|smk_dgr-|arg_dgr-|disc_dgr-|smk_expt_dgr-|expt_dgr-|math_dgr-", reporter = multi_rep, stop_on_failure = FALSE) '"'"' diff --git a/opal_azure-pipelines.yml b/opal_azure-pipelines.yml index 7d312c54..59602751 100644 --- a/opal_azure-pipelines.yml +++ b/opal_azure-pipelines.yml @@ -287,6 +287,7 @@ jobs: junit_rep <- JunitReporter$new(file = "test_results_dsbase.xml"); progress_rep <- ProgressReporter$new(max_failures = 999999); multi_rep <- MultiReporter$new(reporters = list(progress_rep, junit_rep)); + options("datashield.return_errors" = FALSE); options("default_driver" = "OpalDriver"); testthat::test_package("$(projectName)", filter = "_-|datachk-|smk-|arg-|disc-|perf-|smk_expt-|expt-|math-", reporter = multi_rep, stop_on_failure = FALSE) '"'"' @@ -402,6 +403,7 @@ jobs: junit_rep <- JunitReporter$new(file = "test_results_dsdanger.xml"); progress_rep <- ProgressReporter$new(max_failures = 999999); multi_rep <- MultiReporter$new(reporters = list(progress_rep, junit_rep)); + options("datashield.return_errors" = FALSE); options("default_driver" = "OpalDriver"); testthat::test_package("$(projectName)", filter = "__dgr-|datachk_dgr-|smk_dgr-|arg_dgr-|disc_dgr-|smk_expt_dgr-|expt_dgr-|math_dgr-", reporter = multi_rep, stop_on_failure = FALSE) '"'"'