From a6431dfb90e73801292fbf50d090b03230355c4b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 19 Oct 2024 22:26:14 -0400 Subject: [PATCH 1/2] .gitlab-ci.yml: remove --rerun-triggers It appears that presence of mtime in the list is simply ignored by Snakemake. Probably, it's not possible to run with ignoring mtimes. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7a19fd1..36abfc8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ variables: DETECTOR_CONFIG: epic_craterlake GITHUB_SHA: '' GITHUB_REPOSITORY: '' - SNAKEMAKE_FLAGS: '--cache --rerun-triggers code input params software-env' + SNAKEMAKE_FLAGS: '--cache' workflow: name: '$PIPELINE_NAME' From 83651e7b63c5c05b0ddee390603e096f90431670 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 19 Oct 2024 22:27:27 -0400 Subject: [PATCH 2/2] backwards_ecal: enable caching for the reco step --- benchmarks/backwards_ecal/Snakefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/benchmarks/backwards_ecal/Snakefile b/benchmarks/backwards_ecal/Snakefile index da90f2e..0edae3a 100644 --- a/benchmarks/backwards_ecal/Snakefile +++ b/benchmarks/backwards_ecal/Snakefile @@ -69,9 +69,13 @@ rule backwards_ecal_recon: "sim_output/backwards_ecal/{DETECTOR_CONFIG}/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.{INDEX}.eicrecon.tree.edm4eic.root.log", wildcard_constraints: INDEX="\d{4}", + params: + DETECTOR_CONFIG=lambda wildcards: wildcards.DETECTOR_CONFIG, + EICRECON_HASH=get_spack_package_hash("eicrecon"), + cache: True shell: """ set -m # monitor mode to prevent lingering processes -exec env DETECTOR_CONFIG={wildcards.DETECTOR_CONFIG} \ +exec env DETECTOR_CONFIG={params.DETECTOR_CONFIG} \ eicrecon {input} -Ppodio:output_file={output} \ -Ppodio:output_collections=MCParticles,EcalEndcapNRecHits,EcalEndcapNClusters """