Skip to content

Commit af47d5f

Browse files
committed
GenTopo: update paths to el10
1 parent da52329 commit af47d5f

5 files changed

Lines changed: 10 additions & 10 deletions

File tree

‎DATA/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ Resolving deltas: 100% (64/64), done.
194194
[drohr@epn245 ~]$ cd O2DPG/DATA/testing/
195195
[drohr@epn245 testing]$ mkdir -p private/drohr
196196
[drohr@epn245 testing]$ ls examples/
197-
example-workflow.sh workflows.desc
197+
example-workflow.sh workflows.desc
198198
[drohr@epn245 testing]$ cp examples/* private/drohr/
199199
[drohr@epn245 testing]$ vi private/drohr/workflows.desc
200200
[drohr@epn245 testing]$ mv private/drohr/example-workflow.sh private/drohr/my-workflow.sh
@@ -227,7 +227,7 @@ export WORKFLOW_PARAMETERS= # Additiona
227227
export RECO_NUM_NODES_OVERRIDE=0 # Override the number of EPN compute nodes to use (default is specified in description library file)
228228
export NHBPERTF=256 # Number of HBF per TF
229229
230-
/opt/alisw/el9/GenTopo/bin/gen_topo.sh > $HOME/gen_topo_output.xml
230+
/opt/alisw/el10/GenTopo/bin/gen_topo.sh > $HOME/gen_topo_output.xml
231231
[drohr@epn245 test]$ ./run.sh
232232
Loading ODC/0.36-1
233233
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
277277
export RECO_NUM_NODES_OVERRIDE=0 # Override the number of EPN compute nodes to use (default is specified in description library file)
278278
export NHBPERTF=256 # Number of HBF per TF
279279
280-
/opt/alisw/el9/GenTopo/bin/gen_topo.sh > $HOME/gen_topo_output.xml
280+
/opt/alisw/el10/GenTopo/bin/gen_topo.sh > $HOME/gen_topo_output.xml
281281
[drohr@epn245 test]$ ./run.sh
282282
Loading ODC/0.36-1
283283
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

‎DATA/tools/epn/gen_topo.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Author: David Rohr
55

66
# This script is developed within O2DPG: https://github.com/AliceO2Group/O2DPG/blob/master/DATA/tools/epn/gen_topo.sh
7-
# It is installed as package GenTopo to the updateable RPM path /opt/alisw/el9/GenTopo/bin/ on the EPNs
7+
# It is installed as package GenTopo to the updateable RPM path /opt/alisw/el10/GenTopo/bin/ on the EPNs
88

99
# The purpose of this script is to separate the topology generation (which is in O2DPG) from the setting of the EPN-related settings
1010
# This script contains only the EPN related settings
@@ -55,7 +55,7 @@ else
5555
fi
5656
fi
5757
# Run stage 2 of GenTopo, which does the PDP part, still from hardcoded updatable RPM path
58-
/opt/alisw/el9/GenTopo/bin/gen_topo_o2dpg.sh
58+
/opt/alisw/el10/GenTopo/bin/gen_topo_o2dpg.sh
5959
if [ $? != 0 ]; then
6060
exit 1
6161
fi

‎DATA/tools/epn/gen_topo_logged.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if [[ ! -z $GEN_TOPO_LOGDATE ]]; then
1717
fi
1818

1919
STDERRFILE=$(mktemp)
20-
/opt/alisw/el9/GenTopo/bin/gen_topo.sh 2> $STDERRFILE
20+
/opt/alisw/el10/GenTopo/bin/gen_topo.sh 2> $STDERRFILE
2121
RETVAL=$?
2222

2323
if [[ ! -z $GEN_TOPO_LOGDATE ]]; then

‎DATA/tools/epn/run.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ if [[ "0$GEN_TOPO_RUN_HOME" == "01" ]]; then
3535
[[ -z $O2DPG_ROOT || -z $O2_ROOT ]] && { echo "ERROR: O2 and O2DPG must be in the environment!"; exit 1; }
3636
$O2DPG_ROOT/DATA/tools/epn/gen_topo.sh > $OUTPUT_FILE_NAME
3737
else
38-
[[ ! -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; }
39-
/opt/alisw/el9/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
38+
[[ ! -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; }
39+
/opt/alisw/el10/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
4040
fi
4141
if [[ $? == 0 ]]; then
4242
echo Generated XML topology $OUTPUT_FILE_NAME

‎DATA/tools/parse‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ else:
6060

6161
modulecmd = " module purge ; "
6262
if 'GEN_TOPO_OVERRIDE_MODULE_DIR' in os.environ:
63-
mod.module('unuse', '/opt/alisw/el9/modulefiles')
63+
mod.module('unuse', '/opt/alisw/el10/modulefiles')
6464
mod.module('use', os.environ['GEN_TOPO_OVERRIDE_MODULE_DIR'])
65-
modulecmd += ' module unuse /opt/alisw/el9/modulefiles 2>&1 ; module use ' + os.environ['GEN_TOPO_OVERRIDE_MODULE_DIR'] + ' 2>&1 ; '
65+
modulecmd += ' module unuse /opt/alisw/el10/modulefiles 2>&1 ; module use ' + os.environ['GEN_TOPO_OVERRIDE_MODULE_DIR'] + ' 2>&1 ; '
6666

6767
f = open(sys.argv[1], 'r')
6868
for line in f:

0 commit comments

Comments
 (0)