Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
For radical it is "," and not ";"
authorNavarrop <Pierre.Navarro@imag.fr>
Wed, 9 Nov 2011 12:48:06 +0000 (13:48 +0100)
committerNavarrop <Pierre.Navarro@imag.fr>
Wed, 9 Nov 2011 12:48:31 +0000 (13:48 +0100)
buildtools/Cmake/generate_g5k_platform_cabinets.pl
examples/platforms/One_cluster.xml
examples/platforms/One_cluster_no_backbone.xml
examples/platforms/g5k_cabinets.xml

index f5009f3..08fdad0 100644 (file)
@@ -235,7 +235,7 @@ sub get_switch {
                                                {
                                                        if(!($radical =~ /^$/))
                                                        {
                                                {
                                                        if(!($radical =~ /^$/))
                                                        {
-                                                               $radical = $radical.";";
+                                                               $radical = $radical.",";
                                                        }
                                                        $radical = $radical.$deb."-".$fin;
                                                        $deb = $num[$i];
                                                        }
                                                        $radical = $radical.$deb."-".$fin;
                                                        $deb = $num[$i];
@@ -243,7 +243,7 @@ sub get_switch {
                                                }
                                                else
                                                {
                                                }
                                                else
                                                {
-                                                       $radical=$radical.";".$num[$i];
+                                                       $radical=$radical.",".$num[$i];
                                                }
                        
                                        }
                                                }
                        
                                        }
index a638eae..18db17a 100644 (file)
@@ -1,14 +1,14 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<!--              _________
-                               |              |
-                               |  router  |
-       ____________|__________|_____________ backbone
-         |   |   |              |     |   |    
-    l0|        l1|     l2|           l97| l96 |   | l99
-      |          |       |   ........   |     |   |
+<!--             _________
+                |          |
+                |  router  |
+    ____________|__________|_____________ backbone
+      |   |   |              |     |   |       
+    l0|        l1| l2|           l97| l96 |   | l99
+      |   |   |   ........   |     |   |
       |                                |
       |                                |
-   c-0.me                             c-99.me  
+    c-0.me                             c-99.me 
 -->
 <platform version="3">
 <AS  id="AS0"  routing="Full">
 -->
 <platform version="3">
 <AS  id="AS0"  routing="Full">
index 2054334..a5ac514 100644 (file)
@@ -1,16 +1,16 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 
-<!--              _________
-                               |              |
-                               |  router  |
-                               |__________|
-                                       / | \
-                                  /  |  \
-                          l0 / l1|   \l2 
-                                /    |    \
-                               /         |     \
-                       host0   host1   host2   
+<!--             _________
+                |          |
+                |  router  |
+                |__________|
+                    / | \
+                   /  |  \
+               l0 / l1|   \l2 
+                 /    |    \
+                /     |     \
+            host0   host1   host2      
 -->
 
 <platform version="3">
 -->
 
 <platform version="3">
index dfb9502..9d20e6c 100644 (file)
 
                        <AS id="AS_griffon" routing="RuleBased" >
                                <cluster id="AS_sgriffon1" prefix="griffon-" suffix=".nancy.grid5000.fr"
 
                        <AS id="AS_griffon" routing="RuleBased" >
                                <cluster id="AS_sgriffon1" prefix="griffon-" suffix=".nancy.grid5000.fr"
-                                       radical="1-29;58-60" power="20.678E9" bw="1.25E8" lat="1.0E-4"
+                                       radical="1-29,58-60" power="20.678E9" bw="1.25E8" lat="1.0E-4"
                                        bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                                <cluster id="AS_sgriffon2" prefix="griffon-" suffix=".nancy.grid5000.fr"
                                        radical="30-57" power="20.678E9" bw="1.25E8" lat="1.0E-4"
                                        bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                                <cluster id="AS_sgriffon2" prefix="griffon-" suffix=".nancy.grid5000.fr"
                                        radical="30-57" power="20.678E9" bw="1.25E8" lat="1.0E-4"