diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13f7dd3791b49cc02963113cb0cb9454a28dd92c..ae65151bd33d0590175be29bc57e8c8d3b89fbe5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,6 +32,7 @@ common:setup: if [[ "${COMMON_BENCH_VERSION}" == "" ]] ; then export COMMON_BENCH_VERSION="master" fi + export COMMON_BENCH_VERSION="docs" # temporary echo "COMMON_BENCH_VERSION = ${COMMON_BENCH_VERSION}" git clone -b "${COMMON_BENCH_VERSION}" https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git setup script: diff --git a/benchmarks/dis/analysis/dis_electrons.cxx b/benchmarks/dis/analysis/dis_electrons.cxx index f0a195951096b1aebb1fef02cf5d1036f079236f..434fc9a3b7b422368281850c85b62725a8496368 100644 --- a/benchmarks/dis/analysis/dis_electrons.cxx +++ b/benchmarks/dis/analysis/dis_electrons.cxx @@ -1,9 +1,9 @@ #include "dis.h" #include "plot.h" -#include <benchmark.h> -#include <mt.h> -#include <util.h> +#include <common_bench/benchmark.h> +#include <common_bench/mt.h> +#include <common_bench/util.h> #include "ROOT/RDataFrame.hxx" #include <cmath> @@ -150,7 +150,7 @@ int dis_electrons(const std::string& config_name) // create our test definition // test_tag - eic::util::Test dis_Q2_resolution{ + common_bench::Test dis_Q2_resolution{ {{"name", fmt::format("{}_Q2_resolution", test_tag)}, {"title", "DIS Q2 resolution"}, {"description", @@ -290,7 +290,7 @@ int dis_electrons(const std::string& config_name) c.Print(fmt::format("{}momentum.png", output_prefix).c_str()); } - eic::util::write_test({dis_Q2_resolution}, fmt::format("{}dis_electrons.json", output_prefix)); + common_bench::write_test({dis_Q2_resolution}, fmt::format("{}dis_electrons.json", output_prefix)); return 0; } diff --git a/benchmarks/dvmp/analysis/vm_invar.cxx b/benchmarks/dvmp/analysis/vm_invar.cxx index 5c544e2be49d801889135bd67be94eb86120439e..7235dc42428abd2d7d9fdc1422cdf70d382ea0d5 100644 --- a/benchmarks/dvmp/analysis/vm_invar.cxx +++ b/benchmarks/dvmp/analysis/vm_invar.cxx @@ -1,9 +1,9 @@ #include "dvmp.h" #include "plot.h" -#include <benchmark.h> -#include <mt.h> -#include <util.h> +#include <common_bench/benchmark.h> +#include <common_bench/mt.h> +#include <common_bench/util.h> #include <ROOT/RDataFrame.hxx> #include <cmath> @@ -44,7 +44,7 @@ int vm_invar(const std::string& config_name) // create our test definition // test_tag - eic::util::Test Q2_resolution_test{ + common_bench::Test Q2_resolution_test{ {{"name", fmt::format("{}_Q2_resolution", test_tag)}, {"title", fmt::format("Q^2 Resolution for {} -> {} events with {}", vm_name, decay_name, detector)}, @@ -238,7 +238,7 @@ int vm_invar(const std::string& config_name) Q2_resolution_test.error(-1); // write out our test data - eic::util::write_test(Q2_resolution_test, fmt::format("{}invar.json", output_prefix)); + common_bench::write_test(Q2_resolution_test, fmt::format("{}invar.json", output_prefix)); // That's all! return 0; diff --git a/benchmarks/dvmp/analysis/vm_mass.cxx b/benchmarks/dvmp/analysis/vm_mass.cxx index 577e4a17073b07396502ee6e33c711ead36e02c0..4d534b884f5a2b0ed6656c34b2f0e4c9bc50eeeb 100644 --- a/benchmarks/dvmp/analysis/vm_mass.cxx +++ b/benchmarks/dvmp/analysis/vm_mass.cxx @@ -1,9 +1,9 @@ #include "dvmp.h" #include "plot.h" -#include <benchmark.h> -#include <mt.h> -#include <util.h> +#include <common_bench/benchmark.h> +#include <common_bench/mt.h> +#include <common_bench/util.h> #include <ROOT/RDataFrame.hxx> #include <cmath> @@ -61,7 +61,7 @@ int vm_mass(const std::string& config_name) // create our test definition // test_tag - eic::util::Test mass_resolution_test{ + common_bench::Test mass_resolution_test{ {{"name", fmt::format("{}_mass_resolution", test_tag, vm_name, decay_name)}, {"title", fmt::format("{} Invariant Mass Resolution for {} -> {} with {}", vm_name, vm_name, decay_name, detector)}, @@ -281,7 +281,7 @@ int vm_mass(const std::string& config_name) // write out our test data - eic::util::write_test(mass_resolution_test, fmt::format("{}mass.json", output_prefix)); + common_bench::write_test(mass_resolution_test, fmt::format("{}mass.json", output_prefix)); // That's all! return 0;