From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Sat, 18 May 2019 13:52:38 +0000 (+0200)
Subject: Finish the conversion to python of the hostfile generation
X-Git-Tag: v3.22.4~110
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d46190942d57ad2d774185eda65d775b67219764

Finish the conversion to python of the hostfile generation

 - Fix the XML syntax to please the python stupid parser
   The previous one was not invalid, I think, but anyway
 - Be compatible with both Python 2 and Python 3
 - The host order was changed in one example.
---

diff --git a/examples/platforms/cluster_multi.xml b/examples/platforms/cluster_multi.xml
index 110efda20d..6302d78d8a 100644
--- a/examples/platforms/cluster_multi.xml
+++ b/examples/platforms/cluster_multi.xml
@@ -3,11 +3,11 @@
 <platform version="4.1">
   <zone id="world" routing="Full">
   <!-- this platform models 3 clusters, interconnected over the Internet
-    --
-    -- This example intends to be somewhat exhaustive, your platform should probably be simpler.
-    --
-    -- In particular, the clusters are modeled in very different ways,
-    -- but you should pick the way you prefer, and stick to it.
+    -
+    -  This example intends to be somewhat exhaustive, your platform should probably be simpler.
+    - 
+    -  In particular, the clusters are modeled in very different ways,
+    -  but you should pick the way you prefer, and stick to it.
     -->
 
   <!-- Here comes the first cluster, the simplest one.
@@ -15,11 +15,11 @@
        Every nodes are connected through a private link to a router
        (ie a machine that cannot host computations).
   
-       node-0.1core.org --[l0]--
+       node-0.1core.org __[l0]__
                                 \
-       node-1.1core.org --[l1]-- router -- (outer world)
+       node-1.1core.org __[l1]__router___(outer world)
                 ...             /
-       node-7.1core.org --[l9]--
+       node-7.1core.org __[l9]_/
  
        So the route from node-0 to node-1 is {l0.UP, l1.DOWN}
     -->
@@ -30,11 +30,11 @@
 
 
   <!-- This second cluster has a backbone link, connecting all private links:
-       node-0.2cores.org --[l0]-------+
+       node-0.2cores.org __[l0]______+
                                      |
-       node-1.2cores.org --[l1]--[backbone]-- router -- (outer world)
+       node-1.2cores.org __[l1]__[backbone]__ router __ (outer world)
                 ...                  |
-       node-7.2cores.org --[l7]-------+
+       node-7.2cores.org __[l7]______+
     The route from node-0 to node-1 is: l0.UP ; backbone ; l1.DOWN
     
     The route from node-0 to the outer world begins with: l0.UP ; backbone
@@ -49,11 +49,11 @@
 	   
 
   <!-- This cluster has a backbone link, but no links are splitduplex.
-    -- It means that up and down communications compete as if they
-    -- were using exactly the same resource. If you send and receive
-    -- at the same time, then each get half of the bandwidth.
-    --
-    -- Also, the hosts have 4 cores.
+    -  It means that up and down communications compete as if they
+    -  were using exactly the same resource. If you send and receive
+    -  at the same time, then each get half of the bandwidth.
+    - 
+    -  Also, the hosts have 4 cores.
     -->
   <cluster id="halfduplex" prefix="node-" radical="0-7" suffix=".4cores.org" speed="1Gf" core="4"
               bw="125MBps"      lat="50us"     sharing_policy="SHARED"
@@ -65,13 +65,14 @@
   <!-- And now, we create the routes between the clusters, ie inter-zone routes -->
   
   <!-- We have only one outer link, representing the internet 
-    -- Its sharing is FATPIPE, meaning that communications have no impact on each others.
-    -- Any given comm can use the full provided bandwidth. 
-    --
-    -- This models the big links constituting the backbone of the internet, 
-    -- that users cannot saturate. 
-    -- Users' bandwidth is mostly limited by their outgoing connexion,
-    -- not by the network backbone. -->
+    -  Its sharing is FATPIPE, meaning that communications have no impact on each others.
+    -  Any given comm can use the full provided bandwidth. 
+    - 
+    -  This models the big links constituting the backbone of the internet, 
+    -  that users cannot saturate. 
+    -  Users' bandwidth is mostly limited by their outgoing connexion,
+    -  not by the network backbone.
+    -->
 
     <link id="backbone" bandwidth="1.25GBps" latency="500us" sharing_policy="FATPIPE"/>
 
diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index 8d6d8ad61e..cd36f81379 100755
--- a/src/smpi/smpirun.in
+++ b/src/smpi/smpirun.in
@@ -316,9 +316,9 @@ for elem in tree.findall(".//cluster"):
         m = re.match("^([^-]*?)-([^-]*)$", r)
         if m:
             for i in range(int(m.group(1)), int(m.group(2))):
-                print "{}{}{}".format(prefix, i, suffix)
+                print(prefix + str(i) + suffix)
         else:
-            print "{}{}{}".format(prefix, r, suffix)
+            print(prefix + r + suffix)
             ' < ${PLATFORM} >> ${HOSTFILE}
 fi
 UNROLLEDHOSTFILETMP=0
diff --git a/teshsuite/smpi/coll-alltoall/clusters.tesh b/teshsuite/smpi/coll-alltoall/clusters.tesh
index f31c1dbccf..64fa937839 100644
--- a/teshsuite/smpi/coll-alltoall/clusters.tesh
+++ b/teshsuite/smpi/coll-alltoall/clusters.tesh
@@ -50,11 +50,11 @@ $ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -platform ../../../examples
 > [rank 4] -> node-4.1core.org
 > [rank 5] -> node-5.1core.org
 > [rank 6] -> node-6.1core.org
-> [rank 7] -> node-7.1core.org
-> [rank 8] -> node-0.2cores.org
-> [rank 9] -> node-1.2cores.org
-> [rank 10] -> node-2.2cores.org
-> [rank 11] -> node-3.2cores.org
+> [rank 7] -> node-0.2cores.org
+> [rank 8] -> node-1.2cores.org
+> [rank 9] -> node-2.2cores.org
+> [rank 10] -> node-3.2cores.org
+> [rank 11] -> node-4.2cores.org
 > [0] sndbuf=[0 1 2 3 4 5 6 7 8 9 10 11 ]
 > [1] sndbuf=[12 13 14 15 16 17 18 19 20 21 22 23 ]
 > [2] sndbuf=[24 25 26 27 28 29 30 31 32 33 34 35 ]