From 7159288eef0e3e0223ffa68c872eeb24d6f54bd3 Mon Sep 17 00:00:00 2001 From: Ernst Hellbar Date: Thu, 15 Oct 2026 10:40:47 +0200 Subject: [PATCH] GenTopo: update paths to el10 --- DATA/README.md | 6 +++--- DATA/tools/epn/gen_topo.sh | 4 ++-- DATA/tools/epn/gen_topo_logged.sh | 2 +- DATA/tools/epn/run.sh | 4 ++-- DATA/tools/parse | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/DATA/README.md b/DATA/README.md index f3533ca26..8b3afcb9e 100644 --- a/DATA/README.md +++ b/DATA/README.md @@ -194,7 +194,7 @@ Resolving deltas: 100% (64/64), done. [drohr@epn245 ~]$ cd O2DPG/DATA/testing/ [drohr@epn245 testing]$ mkdir -p private/drohr [drohr@epn245 testing]$ ls examples/ -example-workflow.sh workflows.desc +example-workflow.sh workflows.desc [drohr@epn245 testing]$ cp examples/* private/drohr/ [drohr@epn245 testing]$ vi private/drohr/workflows.desc [drohr@epn245 testing]$ mv private/drohr/example-workflow.sh private/drohr/my-workflow.sh @@ -227,7 +227,7 @@ export WORKFLOW_PARAMETERS= # Additiona export RECO_NUM_NODES_OVERRIDE=0 # Override the number of EPN compute nodes to use (default is specified in description library file) export NHBPERTF=256 # Number of HBF per TF -/opt/alisw/el9/GenTopo/bin/gen_topo.sh > $HOME/gen_topo_output.xml +/opt/alisw/el10/GenTopo/bin/gen_topo.sh > $HOME/gen_topo_output.xml [drohr@epn245 test]$ ./run.sh Loading ODC/0.36-1 Loading requirement: BASE/1.0 GCC-Toolchain/v10.2.0-alice2-3 fmt/7.1.0-10 FairLogger/v1.9.1-7 zlib/v1.2.8-8 OpenSSL/v1.0.2o-9 libpng/v1.6.34-9 sqlite/v3.15.0-2 libffi/v3.2.1-2 FreeType/v2.10.1-8 Python/v3.6.10-12 Python-modules/1.0-16 boost/v1.75.0-13 ZeroMQ/v4.3.3-6 ofi/v1.7.1-8 asio/v1.19.1-2 asiofi/v0.5.1-2 DDS/3.5.16-5 FairMQ/v1.4.40-4 @@ -277,7 +277,7 @@ export WORKFLOW_PARAMETERS=EVENT_DISPLAY,CTF,GPU # Additiona export RECO_NUM_NODES_OVERRIDE=0 # Override the number of EPN compute nodes to use (default is specified in description library file) export NHBPERTF=256 # Number of HBF per TF -/opt/alisw/el9/GenTopo/bin/gen_topo.sh > $HOME/gen_topo_output.xml +/opt/alisw/el10/GenTopo/bin/gen_topo.sh > $HOME/gen_topo_output.xml [drohr@epn245 test]$ ./run.sh Loading ODC/0.36-1 Loading requirement: BASE/1.0 GCC-Toolchain/v10.2.0-alice2-3 fmt/7.1.0-10 FairLogger/v1.9.1-7 zlib/v1.2.8-8 OpenSSL/v1.0.2o-9 libpng/v1.6.34-9 sqlite/v3.15.0-2 libffi/v3.2.1-2 FreeType/v2.10.1-8 Python/v3.6.10-12 Python-modules/1.0-16 boost/v1.75.0-13 ZeroMQ/v4.3.3-6 ofi/v1.7.1-8 asio/v1.19.1-2 asiofi/v0.5.1-2 DDS/3.5.16-5 FairMQ/v1.4.40-4 diff --git a/DATA/tools/epn/gen_topo.sh b/DATA/tools/epn/gen_topo.sh index 0a90ab1da..5e464027f 100755 --- a/DATA/tools/epn/gen_topo.sh +++ b/DATA/tools/epn/gen_topo.sh @@ -4,7 +4,7 @@ # Author: David Rohr # This script is developed within O2DPG: https://github.com/AliceO2Group/O2DPG/blob/master/DATA/tools/epn/gen_topo.sh -# It is installed as package GenTopo to the updateable RPM path /opt/alisw/el9/GenTopo/bin/ on the EPNs +# It is installed as package GenTopo to the updateable RPM path /opt/alisw/el10/GenTopo/bin/ on the EPNs # The purpose of this script is to separate the topology generation (which is in O2DPG) from the setting of the EPN-related settings # This script contains only the EPN related settings @@ -55,7 +55,7 @@ else fi fi # Run stage 2 of GenTopo, which does the PDP part, still from hardcoded updatable RPM path -/opt/alisw/el9/GenTopo/bin/gen_topo_o2dpg.sh +/opt/alisw/el10/GenTopo/bin/gen_topo_o2dpg.sh if [ $? != 0 ]; then exit 1 fi diff --git a/DATA/tools/epn/gen_topo_logged.sh b/DATA/tools/epn/gen_topo_logged.sh index 7d2afbb37..3e0ce0260 100755 --- a/DATA/tools/epn/gen_topo_logged.sh +++ b/DATA/tools/epn/gen_topo_logged.sh @@ -17,7 +17,7 @@ if [[ ! -z $GEN_TOPO_LOGDATE ]]; then fi STDERRFILE=$(mktemp) -/opt/alisw/el9/GenTopo/bin/gen_topo.sh 2> $STDERRFILE +/opt/alisw/el10/GenTopo/bin/gen_topo.sh 2> $STDERRFILE RETVAL=$? if [[ ! -z $GEN_TOPO_LOGDATE ]]; then diff --git a/DATA/tools/epn/run.sh b/DATA/tools/epn/run.sh index cdd422c0a..48bb688b9 100755 --- a/DATA/tools/epn/run.sh +++ b/DATA/tools/epn/run.sh @@ -35,8 +35,8 @@ if [[ "0$GEN_TOPO_RUN_HOME" == "01" ]]; then [[ -z $O2DPG_ROOT || -z $O2_ROOT ]] && { echo "ERROR: O2 and O2DPG must be in the environment!"; exit 1; } $O2DPG_ROOT/DATA/tools/epn/gen_topo.sh > $OUTPUT_FILE_NAME else - [[ ! -f /opt/alisw/el9/GenTopo/bin/gen_topo.sh ]] && { echo "ERROR: EPN installation of gen_topo.sh missing. Are you trying to run at home? Then please set GEN_TOPO_RUN_HOME=1!"; exit 1; } - /opt/alisw/el9/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME + [[ ! -f /opt/alisw/el10/GenTopo/bin/gen_topo.sh ]] && { echo "ERROR: EPN installation of gen_topo.sh missing. Are you trying to run at home? Then please set GEN_TOPO_RUN_HOME=1!"; exit 1; } + /opt/alisw/el10/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME fi if [[ $? == 0 ]]; then echo Generated XML topology $OUTPUT_FILE_NAME diff --git a/DATA/tools/parse b/DATA/tools/parse index cf0335f3f..8c68e55f4 100755 --- a/DATA/tools/parse +++ b/DATA/tools/parse @@ -60,9 +60,9 @@ else: modulecmd = " module purge ; " if 'GEN_TOPO_OVERRIDE_MODULE_DIR' in os.environ: - mod.module('unuse', '/opt/alisw/el9/modulefiles') + mod.module('unuse', '/opt/alisw/el10/modulefiles') mod.module('use', os.environ['GEN_TOPO_OVERRIDE_MODULE_DIR']) - modulecmd += ' module unuse /opt/alisw/el9/modulefiles 2>&1 ; module use ' + os.environ['GEN_TOPO_OVERRIDE_MODULE_DIR'] + ' 2>&1 ; ' + modulecmd += ' module unuse /opt/alisw/el10/modulefiles 2>&1 ; module use ' + os.environ['GEN_TOPO_OVERRIDE_MODULE_DIR'] + ' 2>&1 ; ' f = open(sys.argv[1], 'r') for line in f: