X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c4aae34046b764d27402e97349b95aec49fc1ba3..325a6bb78259a0e6835f69ca6fc2341dc620418d:/src/smpi/smpirun.in?ds=sidebyside
diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index d095d29778..466610e323 100755
--- a/src/smpi/smpirun.in
+++ b/src/smpi/smpirun.in
@@ -72,6 +72,7 @@ HOSTFILE=""
HOSTFILETMP=0
MAPOPT=0
REPLAY=0
+QUIET=""
unset pid
@@ -202,6 +203,10 @@ while true; do
SIMOPTS="$SIMOPTS --cfg=smpi/keep-temps:yes"
shift 1
;;
+ "-quiet")
+ QUIET="true"
+ shift 1
+ ;;
"-wrapper")
WRAPPER="$2"
shift 2
@@ -273,7 +278,7 @@ else
shift
fi
-# steel --cfg and --logs options
+# steal --cfg and --logs options
while [ $# -gt 0 ]; do
case "$1" in
"--cfg="*|"--log="*)
@@ -299,8 +304,6 @@ fi
if [ -z "${HOSTFILE}" ] ; then
HOSTFILETMP=1
HOSTFILE="$(mktemp smpitmp-hostfXXXXXX)"
- perl -ne 'print "$1\n" if /.*.*/' ${PLATFORM} > ${HOSTFILE}
- # put all > ${HOSTFILE}
+ ' < ${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
@@ -548,7 +564,7 @@ pid=""
# Keep temporary files on failures to help debugging
#
if [ ${status} -ne 0 ] ; then
- if [ -z "${KEEP}" ]; then
+ if [ -z "${KEEP}" -a -z "${QUIET}" ]; then
echo ${EXEC} ${PRIVATIZE} ${TRACEOPTIONS} ${SIMOPTS} ${PLATFORMTMP} ${APPLICATIONTMP}
if [ ${HOSTFILETMP} = 1 ] ; then
echo "Generated hostfile ${HOSTFILE} kept."
@@ -556,9 +572,9 @@ if [ ${status} -ne 0 ] ; then
if [ ${UNROLLEDHOSTFILETMP} = 1 ] ; then
echo "Generated unrolled hostfile ${UNROLLEDHOSTFILE} kept."
fi
+ KEEP=true
fi
echo "Execution failed with code ${status}."
- KEEP=true
fi
smpirun_cleanup