From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 18 Sep 2018 13:16:09 +0000 (+0200)
Subject: smpirun: make sure that <cluster is on its own line when computing the hostfile autom... 
X-Git-Tag: v3_21~83
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9099504f0b246a1031adb644ac0835d526a33ffd?hp=2cfe340b9729c7ee55cf813f6a36f15dc918696b

smpirun: make sure that <cluster is on its own line when computing the hostfile automatically
---

diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index e8f17431ec..ca795e226a 100755
--- a/src/smpi/smpirun.in
+++ b/src/smpi/smpirun.in
@@ -270,7 +270,9 @@ if [ -z "${HOSTFILE}" ] ; then
     HOSTFILETMP=1
     HOSTFILE="$(mktemp smpitmp-hostfXXXXXX)"
     perl -ne 'print "$1\n" if /.*<host.*?id="(.*?)".*?\/>.*/' ${PLATFORM} > ${HOSTFILE}
-    perl -ne 'if (/.*<cluster.*?prefix="(.*?)".*?radical="(.*?)".*?suffix="(.*?)".*/) {
+    # put all <cluster tag on its own line.
+    cat ${PLATFORM} | tr '\n' ' ' | sed 's/<cluster/\n<cluster/' | \
+      perl -ne 'if (m/.*<cluster.*?prefix="(.*?)".*?radical="(.*?)".*?suffix="(.*?)".*/s) {
                 my ($pre,$rad,$post)=($1,$2,$3);
 	        for my $elm (split(",",$rad)) {
 	          if ($elm=~/^([^-]*?)-([^-]*)$/) {
@@ -282,7 +284,7 @@ if [ -z "${HOSTFILE}" ] ; then
 	          }
 	        }
 	      } elsif (/<cluster/) {
-            die ("Unparsable cluster tag. smpirun uses a primitive regular expression to parse cluster tags. Either provide a hostfile yourself or give the attributes prefix, radical and suffix IN THAT ORDER and ON THE SAME LINE as the opening tag (<cluster)");
+            die ("Unparsable cluster tag. smpirun uses a primitive regular expression to parse cluster tags. Either provide a hostfile yourself or give the attributes prefix, radical and suffix IN THAT ORDER.");
 	      }' ${PLATFORM} >> ${HOSTFILE}
 fi
 UNROLLEDHOSTFILETMP=0