From f718a4d1eed171c7943c2fdbdbbc947a40f51f2c Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Tue, 22 Feb 2022 10:26:33 -0600
Subject: [PATCH] New stage compile; new jobs .compile_benchmark,
tracking_compile
---
.gitlab-ci.yml | 7 +++++++
benchmarks/tracking/central_pions.sh | 6 +++---
benchmarks/tracking/config.yml | 6 ++++++
benchmarks/tracking/multiple_tracks.sh | 6 +++---
4 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c744b9a..4d4aca87 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,6 +23,7 @@ default:
stages:
- config
- initialize
+ - compile
- run
- benchmarks1
- benchmarks2
@@ -52,6 +53,12 @@ common:detector:
- mkdir -p config
- print_env.sh
+.compile_benchmark:
+ needs:
+ - ["common:detector"]
+ before_script:
+ - source .local/bin/env.sh
+
.rec_benchmark:
needs:
- ["common:detector"]
diff --git a/benchmarks/tracking/central_pions.sh b/benchmarks/tracking/central_pions.sh
index 2db8a7b9..ffed8cdc 100644
--- a/benchmarks/tracking/central_pions.sh
+++ b/benchmarks/tracking/central_pions.sh
@@ -70,7 +70,7 @@ if [[ -z "${REC_ONLY}" && -z "${ANALYSIS_ONLY}" ]] ;
then
## generate the input events
- root -b -q "benchmarks/tracking/scripts/gen_central_pions.cxx(${JUGGLER_N_EVENTS}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
+ root -b -q "benchmarks/tracking/scripts/gen_central_pions.cxx+(${JUGGLER_N_EVENTS}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
if [[ "$?" -ne "0" ]] ; then
echo "ERROR running script"
exit 1
@@ -106,13 +106,13 @@ fi
mkdir -p results/tracking
-root -b -q "benchmarks/tracking/scripts/rec_central_pions.cxx(\"${JUGGLER_REC_FILE}\")"
+root -b -q "benchmarks/tracking/scripts/rec_central_pions.cxx+(\"${JUGGLER_REC_FILE}\")"
if [[ "$?" -ne "0" ]] ; then
echo "ERROR running root script"
exit 1
fi
-root -b -q "benchmarks/tracking/scripts/hits_central_pions.cxx(\"${JUGGLER_SIM_FILE}\")"
+root -b -q "benchmarks/tracking/scripts/hits_central_pions.cxx+(\"${JUGGLER_SIM_FILE}\")"
if [[ "$?" -ne "0" ]] ; then
echo "ERROR running root script"
exit 1
diff --git a/benchmarks/tracking/config.yml b/benchmarks/tracking/config.yml
index 580f4439..da8e48ba 100644
--- a/benchmarks/tracking/config.yml
+++ b/benchmarks/tracking/config.yml
@@ -1,3 +1,9 @@
+tracking_compile:
+ extends: .compile_benchmark
+ stage: compile
+ script:
+ - compile_analyses.py --dir scripts tracking
+
tracking_central_electrons:
extends: .rec_benchmark
stage: run
diff --git a/benchmarks/tracking/multiple_tracks.sh b/benchmarks/tracking/multiple_tracks.sh
index a4b432ab..b9aea549 100644
--- a/benchmarks/tracking/multiple_tracks.sh
+++ b/benchmarks/tracking/multiple_tracks.sh
@@ -71,7 +71,7 @@ if [[ -z "${REC_ONLY}" && -z "${ANALYSIS_ONLY}" ]] ;
then
## generate the input events
- root -b -q "benchmarks/tracking/scripts/gen_multiple_tracks.cxx(${JUGGLER_N_EVENTS}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
+ root -b -q "benchmarks/tracking/scripts/gen_multiple_tracks.cxx+(${JUGGLER_N_EVENTS}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
if [[ "$?" -ne "0" ]] ; then
echo "ERROR running script"
exit 1
@@ -107,13 +107,13 @@ fi
mkdir -p results/tracking
-root -b -q "benchmarks/tracking/scripts/rec_multiple_tracks.cxx(\"${JUGGLER_REC_FILE}\")"
+root -b -q "benchmarks/tracking/scripts/rec_multiple_tracks.cxx+(\"${JUGGLER_REC_FILE}\")"
if [[ "$?" -ne "0" ]] ; then
echo "ERROR running root script"
exit 1
fi
-#root -b -q "benchmarks/tracking/scripts/hits_central_electrons.cxx(\"${JUGGLER_SIM_FILE}\")"
+#root -b -q "benchmarks/tracking/scripts/hits_central_electrons.cxx+(\"${JUGGLER_SIM_FILE}\")"
#if [[ "$?" -ne "0" ]] ; then
# echo "ERROR running root script"
# exit 1
--
GitLab