Skip to content

Commit 18943ef

Browse files
ChSonnabendChSonnabend
committed
Adjusting for comments
1 parent d57d8ab commit 18943ef

2 files changed

Lines changed: 17 additions & 71 deletions

File tree

‎prodtests/full-system-test/dpl-workflow.sh‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,6 @@ EVE_OPT=" --jsons-folder $EDJSONS_DIR"
163163
: ${MFTSTAGGERED:=}
164164
: ${PROXY_INSPEC:=}
165165

166-
if [[ ${MICROSEC_REPORTING:-} == 1 ]]; then
167-
MSLOG="--log-timestamp-us"
168-
else
169-
MSLOG=
170-
fi
171-
172166
[[ -z $ALPIDE_ERR_DUMPS ]] && [[ $EPNSYNCMODE == 1 && $RUNTYPE == "PHYSICS" ]] && ALPIDE_ERR_DUMPS=1 || ALPIDE_ERR_DUMPS=0
173167

174168
[[ "0$DISABLE_ROOT_OUTPUT" == "00" ]] && DISABLE_ROOT_OUTPUT=
@@ -626,14 +620,14 @@ has_detector_gpu ITS && GPU_OUTPUT+=",its-tracks"
626620
# Common reconstruction workflows
627621
(has_detector_reco ITS && ! has_detector_gpu ITS) && ! has_detector_from_global_reader ITS && add_W o2-its-reco-workflow "$ITS_CONFIG $ITS_STAGGERED $DISABLE_MC ${DISABLE_DIGIT_CLUSTER_INPUT:-} $DISABLE_ROOT_OUTPUT --pipeline $(get_N its-tracker ITS REST 1 ITSTRK),$(get_N its-clusterer ITS REST 1 ITSCL)" "$ITS_CONFIG_KEY;$ITSMFT_STROBES;$ITSEXTRAERR"
628622
[[ ${DISABLE_DIGIT_CLUSTER_INPUT:-} =~ "--digits-from-upstream" ]] && has_detector_gpu ITS && ! has_detector_from_global_reader ITS && add_W o2-its-reco-workflow "--disable-tracking ${DISABLE_DIGIT_CLUSTER_INPUT:-} $ITS_STAGGERED $DISABLE_MC $DISABLE_ROOT_OUTPUT --pipeline $(get_N its-clusterer ITS REST 1 ITSCL)" "$ITS_CONFIG_KEY;$ITSMFT_STROBES;$ITSEXTRAERR"
629-
(has_detector_reco TPC || has_detector_ctf TPC) && ! has_detector_from_global_reader TPC && add_W o2-gpu-reco-workflow "--gpu-reconstruction \"$GPU_CONFIG_SELF\" $MSLOG --input-type=$GPU_INPUT $DISABLE_MC --output-type $GPU_OUTPUT $([[ $TPC_CORR_OPT == *--disable-ctp-lumi-request* ]] && echo --disable-ctp-lumi-request) $ITS_STAGGERED --pipeline gpu-reconstruction:${N_TPCTRK:-1},gpu-reconstruction-prepare:${N_TPCTRK:-1} $GPU_CONFIG" "GPU_global.deviceType=$GPUTYPE;GPU_proc.debugLevel=0;$GPU_CONFIG_KEY;$TRACKTUNETPCINNER;"
623+
(has_detector_reco TPC || has_detector_ctf TPC) && ! has_detector_from_global_reader TPC && add_W o2-gpu-reco-workflow "--gpu-reconstruction \"$GPU_CONFIG_SELF\" --input-type=$GPU_INPUT $DISABLE_MC --output-type $GPU_OUTPUT $([[ $TPC_CORR_OPT == *--disable-ctp-lumi-request* ]] && echo --disable-ctp-lumi-request) $ITS_STAGGERED --pipeline gpu-reconstruction:${N_TPCTRK:-1},gpu-reconstruction-prepare:${N_TPCTRK:-1} $GPU_CONFIG" "GPU_global.deviceType=$GPUTYPE;GPU_proc.debugLevel=0;$GPU_CONFIG_KEY;$TRACKTUNETPCINNER;"
630624
(has_detector_reco TOF || has_detector_ctf TOF) && ! has_detector_from_global_reader TOF && add_W o2-tof-reco-workflow "$TOF_CONFIG --input-type $TOF_INPUT --output-type $TOF_OUTPUT $DISABLE_DIGIT_ROOT_INPUT $DISABLE_ROOT_OUTPUT $DISABLE_MC --pipeline $(get_N tof-compressed-decoder TOF RAW 1),$(get_N TOFClusterer TOF REST 1)"
631625
has_detector_reco FT0 && ! has_detector_from_global_reader FT0 && add_W o2-ft0-reco-workflow "$DISABLE_DIGIT_ROOT_INPUT $DISABLE_ROOT_OUTPUT $DISABLE_MC --pipeline $(get_N ft0-reconstructor FT0 REST 1)"
632626
has_detector_reco TRD && ! has_detector_from_global_reader TRD && add_W o2-trd-tracklet-transformer "--disable-irframe-reader $DISABLE_DIGIT_ROOT_INPUT $DISABLE_ROOT_OUTPUT $DISABLE_MC $TRD_FILTER_CONFIG --pipeline $(get_N TRDTRACKLETTRANSFORMER TRD REST 1 TRDTRKTRANS)"
633627
has_detectors_reco ITS TPC && ! has_detector_from_global_reader_tracks ITS-TPC && has_detector_matching ITSTPC && add_W o2-tpcits-match-workflow "$DISABLE_ROOT_INPUT $DISABLE_ROOT_OUTPUT $DISABLE_MC $ITS_STAGGERED $SEND_ITSTPC_DTGL $TPC_CORR_OPT --nthreads $ITSTPC_THREADS --pipeline $(get_N itstpc-track-matcher MATCH REST $ITSTPC_THREADS TPCITS)" "$ITSTPC_CONFIG_KEY;$INTERACTION_TAG_CONFIG_KEY;$ITSMFT_STROBES;$ITSEXTRAERR;"
634628
has_detector_reco TRD && [[ -n "$TRD_SOURCES" ]] && ! has_detector_from_global_reader_tracks "$(echo "$TRD_SOURCES" | cut -d',' -f1)-TRD" && add_W o2-trd-global-tracking "$DISABLE_ROOT_INPUT $DISABLE_ROOT_OUTPUT $DISABLE_MC $TRD_CONFIG $TRD_FILTER_CONFIG $TPC_CORR_OPT --track-sources $TRD_SOURCES --pipeline $(get_N trd-globaltracking_TPC_ITS-TPC_ TRD REST 1 TRDTRK),$(get_N trd-globaltracking_TPC_FT0_ITS-TPC_ TRD REST 1 TRDTRK),$(get_N trd-globaltracking_TPC_FT0_ITS-TPC_CTP_ TRD REST 1 TRDTRK)" "$TRD_CONFIG_KEY;$INTERACTION_TAG_CONFIG_KEY;$ITSMFT_STROBES;$ITSEXTRAERR;"
635629
has_detector_reco TOF && [[ -n "$TOF_SOURCES" ]] && ! has_detector_from_global_reader_tracks "$(echo "$TOF_SOURCES" | cut -d',' -f1)-TOF" && add_W o2-tof-matcher-workflow "$TOF_MATCH_OPT $DISABLE_ROOT_INPUT $DISABLE_ROOT_OUTPUT $DISABLE_MC $TPC_CORR_OPT ${TOFMATCH_THREADS:+--tof-lanes ${TOFMATCH_THREADS}} --track-sources $TOF_SOURCES --pipeline $(get_N tof-matcher TOF REST 1 TOFMATCH)" "$ITSMFT_STROBES;$ITSEXTRAERR;$INTERACTION_TAG_CONFIG_KEY"
636-
has_detectors TPC && [[ -z "$DISABLE_ROOT_OUTPUT" && "${SKIP_TPC_CLUSTERSTRACKS_OUTPUT:-}" != 1 ]] && ! has_detector_from_global_reader TPC && add_W o2-tpc-reco-workflow "--input-type pass-through --output-type clusters,tpc-triggers,tracks,send-clusters-per-sector $DISABLE_MC $MSLOG"
630+
has_detectors TPC && [[ -z "$DISABLE_ROOT_OUTPUT" && "${SKIP_TPC_CLUSTERSTRACKS_OUTPUT:-}" != 1 ]] && ! has_detector_from_global_reader TPC && add_W o2-tpc-reco-workflow "--input-type pass-through --output-type clusters,tpc-triggers,tracks,send-clusters-per-sector $DISABLE_MC"
637631

638632
# ---------------------------------------------------------------------------------------------------------------------
639633
# Reconstruction workflows normally active only in async mode ($LIST_OF_ASYNC_RECO_STEPS), but can be forced via $WORKFLOW_EXTRA_PROCESSING_STEPS

‎prodtests/full-system-test/gen_single_gpu_rtc_benchmark.sh‎

Lines changed: 15 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,26 @@ fi
1919
# ----------------------------------------------------------------------------------------------------------------------
2020
# Benchmark defaults. All can be overridden by exporting variables before calling this script.
2121

22+
case "${GPUTYPE:-}" in
23+
CUDA|HIP)
24+
export GPUTYPE
25+
;;
26+
"")
27+
echo "ERROR: GPUTYPE must be set to either CUDA or HIP" >&2
28+
exit 1
29+
;;
30+
*)
31+
echo "ERROR: Invalid GPUTYPE='$GPUTYPE'. Must be either CUDA or HIP" >&2
32+
exit 1
33+
;;
34+
esac
35+
2236
export DPL_REPORT_PROCESSING="${DPL_REPORT_PROCESSING:-1}"
2337
export WORKFLOW_PARAMETERS="${WORKFLOW_PARAMETERS:-GPU,CTF}"
24-
export GPUTYPE="${GPUTYPE:-CUDA}"
2538
export NGPUS=1
2639
export O2_GPU_DOUBLE_PIPELINE="${O2_GPU_DOUBLE_PIPELINE:-1}"
2740
export O2_GPU_RTC="${O2_GPU_RTC:-1}"
2841
export SYNCMODE="${SYNCMODE:-1}"
29-
export DISABLE_ROOT_OUTPUT="${DISABLE_ROOT_OUTPUT:-1}"
3042

3143
# Double pipeline requires zsraw input. Therefore default to raw TF input, not CTF.
3244
export RAWTFINPUT="${RAWTFINPUT:-1}"
@@ -35,67 +47,10 @@ export NTIMEFRAMES="${NTIMEFRAMES:--1}"
3547
export TFLOOP="${TFLOOP:-100}"
3648
export TFDELAY="${TFDELAY:-0}"
3749
export TIMEFRAME_RATE_LIMIT="${TIMEFRAME_RATE_LIMIT:-5}"
50+
export ARGS_EXTRA_PROCESS_o2_gpu_reco_workflow="${ARGS_EXTRA_PROCESS_o2_gpu_reco_workflow:+$ARGS_EXTRA_PROCESS_o2_gpu_reco_workflow }--log-timestamp-us"
3851

3952
export RUN_BENCHMARK="${RUN_BENCHMARK:-0}"
4053

41-
echo "# Alien/JAliEn environment check:"
42-
echo "# JALIEN_TOKEN_CERT=${JALIEN_TOKEN_CERT:-}"
43-
echo "# JALIEN_TOKEN_KEY=${JALIEN_TOKEN_KEY:-}"
44-
echo "# X509_USER_PROXY=${X509_USER_PROXY:-}"
45-
if command -v alien-token-info >/dev/null 2>&1; then
46-
alien-token-info || true
47-
else
48-
echo "# alien-token-info not found in PATH"
49-
fi
50-
echo
51-
52-
# ----------------------------------------------------------------------------------------------------------------------
53-
# Recover JAliEn token environment if alien-token-info works but token env vars are missing.
54-
55-
if command -v alien-token-info >/dev/null 2>&1; then
56-
if alien-token-info >/dev/null 2>&1; then
57-
uid="$(id -u)"
58-
59-
for cert in \
60-
"/tmp/jalien_token_${uid}.pem" \
61-
"/tmp/jalien_token_${USER}.pem" \
62-
"/tmp/tokencert_${uid}.pem" \
63-
"/tmp/tokencert_${USER}.pem"
64-
do
65-
if [[ -f "$cert" ]]; then
66-
export JALIEN_TOKEN_CERT="${JALIEN_TOKEN_CERT:-$cert}"
67-
break
68-
fi
69-
done
70-
71-
for key in \
72-
"/tmp/jalien_token_${uid}.key" \
73-
"/tmp/jalien_token_${USER}.key" \
74-
"/tmp/tokenkey_${uid}.pem" \
75-
"/tmp/tokenkey_${USER}.pem"
76-
do
77-
if [[ -f "$key" ]]; then
78-
export JALIEN_TOKEN_KEY="${JALIEN_TOKEN_KEY:-$key}"
79-
break
80-
fi
81-
done
82-
83-
# Some older tools only look for X509_USER_PROXY.
84-
if [[ -z "${X509_USER_PROXY:-}" ]]; then
85-
for proxy in \
86-
"/tmp/x509up_u${uid}" \
87-
"/tmp/x509up_${uid}" \
88-
"${JALIEN_TOKEN_CERT:-}"
89-
do
90-
if [[ -n "$proxy" && -f "$proxy" ]]; then
91-
export X509_USER_PROXY="$proxy"
92-
break
93-
fi
94-
done
95-
fi
96-
fi
97-
fi
98-
9954
# ----------------------------------------------------------------------------------------------------------------------
10055
# Benchmark naming / output directory.
10156

@@ -115,9 +70,6 @@ cleanup_rundir() {
11570

11671
trap cleanup_rundir EXIT
11772

118-
# ----------------------------------------------------------------------------------------------------------------------
119-
# Keep accidental files out of the source/original directory.
120-
12173
# Let O2/core dumps land in the benchmark run directory, not in the original working directory.
12274
export CORE_DUMP_DIR="${CORE_DUMP_DIR:-$RUNDIR}"
12375
export O2_CORE_DUMP_DIR="${O2_CORE_DUMP_DIR:-$RUNDIR}"

0 commit comments

Comments
 (0)