X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3a90102759eb860fd96bc294542d3aa38f5b208d..71af21fb892c4e4d6676b8ac14b836e59a1af4bc:/src/smpi/smpirun.in
diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index bf1646c33d..72d381929d 100755
--- a/src/smpi/smpirun.in
+++ b/src/smpi/smpirun.in
@@ -299,32 +299,47 @@ fi
if [ -z "${HOSTFILE}" ] ; then
HOSTFILETMP=1
HOSTFILE="$(mktemp smpitmp-hostfXXXXXX)"
- perl -ne 'print "$1\n" if /.*.*/' ${PLATFORM} > ${HOSTFILE}
- # put all > ${HOSTFILE}
+ @PYTHON_EXECUTABLE@ -c '
+import xml.etree.ElementTree as ET
+import sys
+import re
+
+tree = ET.parse(sys.stdin)
+
+for elem in tree.findall(".//host"):
+ print(elem.attrib["id"])
+
+for elem in tree.findall(".//cluster"):
+ prefix = elem.attrib["prefix"]
+ radical = elem.attrib["radical"]
+ suffix = elem.attrib["suffix"]
+ for r in radical.split(","):
+ m = re.match("^([^-]*?)-([^-]*)$", r)
+ if m:
+ for i in range(int(m.group(1)), int(m.group(2))):
+ print(prefix + str(i) + suffix)
+ else:
+ print(prefix + r + suffix)
+ ' < ${PLATFORM} > ${HOSTFILE}
fi
UNROLLEDHOSTFILETMP=0
-#parse if our lines are terminated by :num_process
-multiple_processes=$(grep -c ":" $HOSTFILE)
-if [ "${multiple_processes}" -gt 0 ] ; then
+# parse if our lines are terminated by :num_process
+if grep -q ':' $HOSTFILE ; then
UNROLLEDHOSTFILETMP=1
UNROLLEDHOSTFILE="$(mktemp smpitmp-hostfXXXXXX)"
- perl -ne ' do{ for ( 1 .. $2 ) { print "$1\n" } } if /(.*?):(\d+).*/' ${HOSTFILE} > ${UNROLLEDHOSTFILE}
+ @PYTHON_EXECUTABLE@ -c '
+import sys
+import re
+
+for line in sys.stdin:
+ m = re.match("(.*):(.*)", line)
+ if m:
+ for i in range(0, int(m.group(2))):
+ print(m.group(1))
+ else:
+ print(line.strip())
+' < ${HOSTFILE} > ${UNROLLEDHOSTFILE}
if [ ${HOSTFILETMP} = 1 ] ; then
rm ${HOSTFILE}
HOSTFILETMP=0
@@ -505,6 +520,8 @@ if [ -n "${TRACE_ACTIVE}" ]; then
fi
##---------------------- end SMPI TRACING OPTIONS ---------------------------------
+# Do not remove, this variable may be used by user code (e.g. StarPU)
+export SMPI_GLOBAL_SIZE=${NUMPROCS}
if [ -n "${KEEP}" ] ; then
echo ${EXEC} ${PRIVATIZE} ${TRACEOPTIONS} ${SIMOPTS} ${PLATFORMTMP} ${APPLICATIONTMP}
if [ ${HOSTFILETMP} = 1 ] ; then