From 382552a94e49803700fd352bca91ff5826843a16 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 12 Nov 2024 12:16:50 -0500
Subject: [PATCH] benchmarks/ecal_gaps: move output to
results/{DETECTOR_CONFIG}
---
benchmarks/ecal_gaps/Snakefile | 8 +++-----
benchmarks/ecal_gaps/config.yml | 6 +++---
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/benchmarks/ecal_gaps/Snakefile b/benchmarks/ecal_gaps/Snakefile
index df6107a5..76d32c05 100644
--- a/benchmarks/ecal_gaps/Snakefile
+++ b/benchmarks/ecal_gaps/Snakefile
@@ -49,23 +49,20 @@ exec env DETECTOR_CONFIG={wildcards.DETECTOR_CONFIG} \
"""
-DETECTOR_CONFIG=os.environ["DETECTOR_CONFIG"]
-
rule ecal_gaps:
input:
matplotlibrc=".matplotlibrc",
script="benchmarks/ecal_gaps/ecal_gaps.py",
# TODO pass as a file list?
_=expand(
- "sim_output/ecal_gaps/{DETECTOR_CONFIG}/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.{INDEX:04d}.eicrecon.tree.edm4eic.root",
- DETECTOR_CONFIG=DETECTOR_CONFIG,
+ "sim_output/ecal_gaps/{{DETECTOR_CONFIG}}/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.{INDEX:04d}.eicrecon.tree.edm4eic.root",
PARTICLE=["e-"],
ENERGY=["500MeV", "5GeV", "20GeV"],
PHASE_SPACE=["3to50deg", "45to135deg", "130to177deg"],
INDEX=range(1),
),
output:
- directory("results/ecal_gaps"),
+ directory("results/{DETECTOR_CONFIG}/ecal_gaps"),
threads: workflow.cores
shell:
"""
@@ -85,5 +82,6 @@ WORKER_PID=$!
env \
MATPLOTLIBRC={input.matplotlibrc} \
OUTPUT_DIR={output} \
+DETECTOR_CONFIG={wildcards.DETECTOR_CONFIG} \
python {input.script}
"""
diff --git a/benchmarks/ecal_gaps/config.yml b/benchmarks/ecal_gaps/config.yml
index 9c0a8a09..f4a5710b 100644
--- a/benchmarks/ecal_gaps/config.yml
+++ b/benchmarks/ecal_gaps/config.yml
@@ -4,7 +4,7 @@ sim:ecal_gaps:
script:
- mkdir -p $LOCAL_DATA_PATH/input
- ln -s $LOCAL_DATA_PATH/input input
- - snakemake $SNAKEMAKE_FLAGS --cache --cores 10 ecal_gaps --omit-from ecal_gaps
+ - snakemake $SNAKEMAKE_FLAGS --cache --cores 10 results/epic/ecal_gaps --omit-from ecal_gaps
bench:ecal_gaps:
extends: .det_benchmark
@@ -15,7 +15,7 @@ bench:ecal_gaps:
- ln -s $LOCAL_DATA_PATH/input input
- export PYTHONUSERBASE=$LOCAL_DATA_PATH/deps
- pip install -r benchmarks/ecal_gaps/requirements.txt
- - snakemake $SNAKEMAKE_FLAGS --cores 8 ecal_gaps
+ - snakemake $SNAKEMAKE_FLAGS --cores 8 results/epic/ecal_gaps
collect_results:ecal_gaps:
extends: .det_benchmark
@@ -25,5 +25,5 @@ collect_results:ecal_gaps:
script:
- ls -lrht
- mv results{,_save}/ # move results directory out of the way to preserve it
- - snakemake $SNAKEMAKE_FLAGS --cores 1 --delete-all-output ecal_gaps
+ - snakemake $SNAKEMAKE_FLAGS --cores 1 --delete-all-output results/epic/ecal_gaps
- mv results{_save,}/
--
GitLab