From adda7dd84ad0b27dc936ae3d65d2a948b3c5a65b Mon Sep 17 00:00:00 2001 From: simonge <simon.gardner@glasgow.ac.uk> Date: Wed, 4 Jun 2025 18:38:50 +0100 Subject: [PATCH] Remove other benchmarks --- .gitlab-ci.yml | 106 +++++++++++++++++++++++++------------------------ Snakefile | 84 +++++++++++++++++++-------------------- 2 files changed, 96 insertions(+), 94 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 943e1862..b76cbd01 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -124,62 +124,64 @@ get_data: - runner_system_failure include: - - local: 'benchmarks/backgrounds/config.yml' - - local: 'benchmarks/backwards_ecal/config.yml' - - local: 'benchmarks/calo_pid/config.yml' - - local: 'benchmarks/ecal_gaps/config.yml' - - local: 'benchmarks/tracking_detectors/config.yml' - - local: 'benchmarks/tracking_performances/config.yml' - - local: 'benchmarks/tracking_performances_dis/config.yml' - - local: 'benchmarks/barrel_ecal/config.yml' - - local: 'benchmarks/barrel_hcal/config.yml' - - local: 'benchmarks/lfhcal/config.yml' - - local: 'benchmarks/zdc/config.yml' - - local: 'benchmarks/zdc_lyso/config.yml' - - local: 'benchmarks/zdc_neutron/config.yml' - - local: 'benchmarks/zdc_photon/config.yml' - - local: 'benchmarks/zdc_pi0/config.yml' - - local: 'benchmarks/material_scan/config.yml' - - local: 'benchmarks/pid/config.yml' - - local: 'benchmarks/timing/config.yml' - - local: 'benchmarks/b0_tracker/config.yml' - - local: 'benchmarks/insert_muon/config.yml' - - local: 'benchmarks/insert_tau/config.yml' - - local: 'benchmarks/zdc_sigma/config.yml' - - local: 'benchmarks/zdc_lambda/config.yml' - - local: 'benchmarks/insert_neutron/config.yml' - - local: 'benchmarks/femc_electron/config.yml' - - local: 'benchmarks/femc_photon/config.yml' - - local: 'benchmarks/femc_pi0/config.yml' + # - local: 'benchmarks/backgrounds/config.yml' + # - local: 'benchmarks/backwards_ecal/config.yml' + # - local: 'benchmarks/calo_pid/config.yml' + # - local: 'benchmarks/ecal_gaps/config.yml' + # - local: 'benchmarks/tracking_detectors/config.yml' + # - local: 'benchmarks/tracking_performances/config.yml' + # - local: 'benchmarks/tracking_performances_dis/config.yml' + # - local: 'benchmarks/barrel_ecal/config.yml' + # - local: 'benchmarks/barrel_hcal/config.yml' + # - local: 'benchmarks/lfhcal/config.yml' + # - local: 'benchmarks/zdc/config.yml' + # - local: 'benchmarks/zdc_lyso/config.yml' + # - local: 'benchmarks/zdc_neutron/config.yml' + # - local: 'benchmarks/zdc_photon/config.yml' + # - local: 'benchmarks/zdc_pi0/config.yml' + # - local: 'benchmarks/material_scan/config.yml' + # - local: 'benchmarks/pid/config.yml' + # - local: 'benchmarks/timing/config.yml' + # - local: 'benchmarks/b0_tracker/config.yml' + # - local: 'benchmarks/insert_muon/config.yml' + # - local: 'benchmarks/insert_tau/config.yml' + # - local: 'benchmarks/zdc_sigma/config.yml' + # - local: 'benchmarks/zdc_lambda/config.yml' + # - local: 'benchmarks/insert_neutron/config.yml' + # - local: 'benchmarks/femc_electron/config.yml' + # - local: 'benchmarks/femc_photon/config.yml' + # - local: 'benchmarks/femc_pi0/config.yml' + - local: 'benchmarks/beamline/config.yml' deploy_results: allow_failure: true stage: deploy needs: - - "collect_results:backgrounds" - - "collect_results:backwards_ecal" - - "collect_results:barrel_ecal" - - "collect_results:barrel_hcal" - - "collect_results:calo_pid" - - "collect_results:ecal_gaps" - - "collect_results:lfhcal" - - "collect_results:material_scan" - - "collect_results:pid" - - "collect_results:tracking_performance" - - "collect_results:tracking_performance_campaigns" - - "collect_results:zdc_sigma" - - "collect_results:zdc_lambda" - - "collect_results:insert_neutron" - - "collect_results:tracking_performances_dis" - - "collect_results:zdc" - - "collect_results:zdc_lyso" - - "collect_results:zdc_neutron" - - "collect_results:insert_muon" - - "collect_results:insert_tau" - - "collect_results:zdc_photon" - - "collect_results:zdc_pi0" - - "collect_results:femc_electron" - - "collect_results:femc_photon" - - "collect_results:femc_pi0" + # - "collect_results:backgrounds" + # - "collect_results:backwards_ecal" + # - "collect_results:barrel_ecal" + # - "collect_results:barrel_hcal" + # - "collect_results:calo_pid" + # - "collect_results:ecal_gaps" + # - "collect_results:lfhcal" + # - "collect_results:material_scan" + # - "collect_results:pid" + # - "collect_results:tracking_performance" + # - "collect_results:tracking_performance_campaigns" + # - "collect_results:zdc_sigma" + # - "collect_results:zdc_lambda" + # - "collect_results:insert_neutron" + # - "collect_results:tracking_performances_dis" + # - "collect_results:zdc" + # - "collect_results:zdc_lyso" + # - "collect_results:zdc_neutron" + # - "collect_results:insert_muon" + # - "collect_results:insert_tau" + # - "collect_results:zdc_photon" + # - "collect_results:zdc_pi0" + # - "collect_results:femc_electron" + # - "collect_results:femc_photon" + # - "collect_results:femc_pi0" + - "collect_results/beamline" script: - snakemake $SNAKEMAKE_FLAGS --cores 1 results/metadata.json - find results -print | sort | tee summary.txt diff --git a/Snakefile b/Snakefile index c001f8b0..3350fb35 100644 --- a/Snakefile +++ b/Snakefile @@ -30,27 +30,27 @@ def find_epic_libraries(): return libs -include: "benchmarks/backgrounds/Snakefile" -include: "benchmarks/backwards_ecal/Snakefile" -include: "benchmarks/barrel_ecal/Snakefile" -include: "benchmarks/calo_pid/Snakefile" -include: "benchmarks/ecal_gaps/Snakefile" -include: "benchmarks/material_scan/Snakefile" -include: "benchmarks/tracking_performances/Snakefile" -include: "benchmarks/tracking_performances_dis/Snakefile" -include: "benchmarks/lfhcal/Snakefile" -include: "benchmarks/zdc_lyso/Snakefile" -include: "benchmarks/zdc_neutron/Snakefile" -include: "benchmarks/insert_muon/Snakefile" -include: "benchmarks/zdc_lambda/Snakefile" -include: "benchmarks/zdc_photon/Snakefile" -include: "benchmarks/zdc_pi0/Snakefile" -include: "benchmarks/zdc_sigma/Snakefile" -include: "benchmarks/insert_neutron/Snakefile" -include: "benchmarks/insert_tau/Snakefile" -include: "benchmarks/femc_electron/Snakefile" -include: "benchmarks/femc_photon/Snakefile" -include: "benchmarks/femc_pi0/Snakefile" +#include: "benchmarks/backgrounds/Snakefile" +#include: "benchmarks/backwards_ecal/Snakefile" +#include: "benchmarks/barrel_ecal/Snakefile" +#include: "benchmarks/calo_pid/Snakefile" +#include: "benchmarks/ecal_gaps/Snakefile" +#include: "benchmarks/material_scan/Snakefile" +#include: "benchmarks/tracking_performances/Snakefile" +#include: "benchmarks/tracking_performances_dis/Snakefile" +#include: "benchmarks/lfhcal/Snakefile" +#include: "benchmarks/zdc_lyso/Snakefile" +#include: "benchmarks/zdc_neutron/Snakefile" +#include: "benchmarks/insert_muon/Snakefile" +#include: "benchmarks/zdc_lambda/Snakefile" +#include: "benchmarks/zdc_photon/Snakefile" +#include: "benchmarks/zdc_pi0/Snakefile" +#include: "benchmarks/zdc_sigma/Snakefile" +#include: "benchmarks/insert_neutron/Snakefile" +#include: "benchmarks/insert_tau/Snakefile" +#include: "benchmarks/femc_electron/Snakefile" +#include: "benchmarks/femc_photon/Snakefile" +#include: "benchmarks/femc_pi0/Snakefile" include: "benchmarks/beamline/Snakefile" use_s3 = config["remote_provider"].lower() == "s3" @@ -121,24 +121,24 @@ awk -f {input.converter} {input.notebook} > {output} """ -rule metadata: - output: - "results/metadata.json" - shell: - """ -cat > {output} <<EOF -{{ - "CI_COMMIT_REF_NAME": "${{CI_COMMIT_REF_NAME:-}}", - "CI_COMMIT_SHA": "${{CI_COMMIT_SHA:-}}", - "CI_PIPELINE_ID": "${{CI_PIPELINE_ID:-}}", - "CI_PIPELINE_SOURCE": "${{CI_PIPELINE_SOURCE:-}}", - "CI_PROJECT_ID": "${{CI_PROJECT_ID:-}}", - "GITHUB_REPOSITORY": "${{GITHUB_REPOSITORY:-}}", - "GITHUB_SHA": "${{GITHUB_SHA:-}}", - "GITHUB_PR": "${{GITHUB_PR:-}}", - "PIPELINE_NAME": "${{PIPELINE_NAME:-}}" -}} -EOF -# validate JSON -jq '.' {output} -""" +#rule metadata: +# output: +# "results/metadata.json" +# shell: +# """ +#cat > {output} <<EOF +#{{ +# "CI_COMMIT_REF_NAME": "${{CI_COMMIT_REF_NAME:-}}", +# "CI_COMMIT_SHA": "${{CI_COMMIT_SHA:-}}", +# "CI_PIPELINE_ID": "${{CI_PIPELINE_ID:-}}", +# "CI_PIPELINE_SOURCE": "${{CI_PIPELINE_SOURCE:-}}", +# "CI_PROJECT_ID": "${{CI_PROJECT_ID:-}}", +# "GITHUB_REPOSITORY": "${{GITHUB_REPOSITORY:-}}", +# "GITHUB_SHA": "${{GITHUB_SHA:-}}", +# "GITHUB_PR": "${{GITHUB_PR:-}}", +# "PIPELINE_NAME": "${{PIPELINE_NAME:-}}" +#}} +#EOF +## validate JSON +#jq '.' {output} +#""" -- GitLab