From 04ffa426266b661616a55124f2746af939c56e9c Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Mon, 23 Aug 2021 21:17:18 +0000
Subject: [PATCH] Updated the final_results with tracking collects
---
.gitlab-ci.yml | 3 ++-
benchmarks/track_finding/config.yml | 8 ++++++++
benchmarks/track_finding/multiple_tracks.sh | 2 +-
benchmarks/track_fitting/config.yml | 7 +++++++
benchmarks/track_fitting/single_tracks.sh | 2 +-
5 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 38edba60..79dff3cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -65,6 +65,7 @@ common:detector:
include:
- local: 'benchmarks/ecal/config.yml'
- local: 'benchmarks/track_finding/config.yml'
+ - local: 'benchmarks/track_fitting/config.yml'
- local: 'benchmarks/tracking/config.yml'
- local: 'benchmarks/clustering/config.yml'
# - local: 'benchmarks/rich/config.yml'
@@ -75,7 +76,7 @@ include:
final_report:
stage: finish
- needs: ["ecal_collect", "tracking_central_electrons", "clustering:results", "full:results"]
+ needs: ["ecal_collect", "tracking_central_electrons", "clustering:results", "full:results","track_finding:collect","track_fitting:collect"]
script:
# disabled while we address ACTS issues
#- mkdir -p results/views && cd results/views && bash ../../bin/download_views
diff --git a/benchmarks/track_finding/config.yml b/benchmarks/track_finding/config.yml
index 5453eab2..a5c02901 100644
--- a/benchmarks/track_finding/config.yml
+++ b/benchmarks/track_finding/config.yml
@@ -4,3 +4,11 @@ track_finding:multiple_tracks:
timeout: 24 hours
script:
- bash benchmarks/track_finding/multiple_tracks.sh
+
+track_finding:collect:
+ stage: collect
+ needs:
+ - ["track_finding:multiple_tracks"]
+ script:
+ - echo "Done collecting artifacts."
+
diff --git a/benchmarks/track_finding/multiple_tracks.sh b/benchmarks/track_finding/multiple_tracks.sh
index 85df9ebc..0ea376ef 100644
--- a/benchmarks/track_finding/multiple_tracks.sh
+++ b/benchmarks/track_finding/multiple_tracks.sh
@@ -80,7 +80,7 @@ rootls -t ${JUGGLER_SIM_FILE}
if [[ -z "${ANALYSIS_ONLY}" ]] ;
then
# Need to figure out how to pass file name to juggler from the commandline
- gaudirun.py benchmarks/tracking/options/track_reconstruction.py
+ xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv gaudirun.py benchmarks/track_finding/options/track_reconstruction.py
if [[ "$?" -ne "0" ]] ; then
echo "ERROR running juggler"
exit 1
diff --git a/benchmarks/track_fitting/config.yml b/benchmarks/track_fitting/config.yml
index 782f19b1..2363c6a7 100644
--- a/benchmarks/track_fitting/config.yml
+++ b/benchmarks/track_fitting/config.yml
@@ -4,4 +4,11 @@ track_fitting:single_tracks:
script:
- bash benchmarks/track_fitting/single_tracks.sh
+track_fitting:collect:
+ stage: collect
+ needs:
+ - ["track_fitting:single_tracks"]
+ script:
+ - echo "Done collecting artifacts."
+
diff --git a/benchmarks/track_fitting/single_tracks.sh b/benchmarks/track_fitting/single_tracks.sh
index dc84059c..e10a71f1 100644
--- a/benchmarks/track_fitting/single_tracks.sh
+++ b/benchmarks/track_fitting/single_tracks.sh
@@ -83,7 +83,7 @@ rootls -t ${JUGGLER_SIM_FILE}
if [[ -z "${ANALYSIS_ONLY}" ]] ;
then
# Need to figure out how to pass file name to juggler from the commandline
- gaudirun.py benchmarks/track_fitting/options/tracker_reconstruction.py
+ xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv gaudirun.py benchmarks/track_fitting/options/track_reconstruction.py
if [[ "$?" -ne "0" ]] ; then
echo "ERROR running juggler"
exit 1
--
GitLab