Merge remote-tracking branch 'origin/master' into zdc_neutron

eic · Nov 10, 2024 · add22a6 · add22a6
2 parents 4bd3a3b + e30c6f3
commit add22a6
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -180,7 +180,7 @@ deploy_results:
     - "collect_results:femc_photon"
     - "collect_results:femc_pi0"
   script:
-    - echo "deploy results!"
+    - snakemake $SNAKEMAKE_FLAGS --cores 1 results/metadata.json
     - find results -print | sort | tee summary.txt
     - xrdfs $XROOTD_RW_ENDPOINT mkdir $XROOTD_OUTPUT_PREFIX/pipeline-$CI_PIPELINE_ID
     - xrdcp -r results $XROOTD_RW_ENDPOINT/$XROOTD_OUTPUT_PREFIX/pipeline-$CI_PIPELINE_ID

diff --git a/Snakefile b/Snakefile
@@ -87,3 +87,23 @@ rule org2py:
         """
 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:-}}",
+  "PIPELINE_NAME": "${{PIPELINE_NAME:-}}"
+}}
+EOF
+# validate JSON
+jq '.' {output}
+"""
diff --git a/benchmarks/backwards_ecal/Snakefile b/benchmarks/backwards_ecal/Snakefile
@@ -22,11 +22,21 @@ def get_spack_package_hash(package_name):
         print(e)
         return ""
 
+@functools.cache
+def find_epic_libraries():
+    # if library is not found (not avaliable) we return an empty list to let DAG still evaluate
+    libs = []
+    lib = ctypes.util.find_library("epic")
+    if lib is not None:
+        libs.append(os.environ["DETECTOR_PATH"] + "/../../lib/" + lib)
+    return libs
+
+
 rule backwards_ecal_sim:
     input:
         steering_file=ancient("EPIC/EVGEN/SINGLE/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.steer"),
         warmup="warmup/{DETECTOR_CONFIG}.edm4hep.root",
-        geometry_lib=os.environ["DETECTOR_PATH"] + "/../../lib/" + ctypes.util.find_library("epic"),
+        geometry_lib=find_epic_libraries(),
     output:
         "sim_output/backwards_ecal/{DETECTOR_CONFIG}/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.{INDEX}.edm4hep.root",
     log: