Logo AND Algorithmique Numérique Distribuée
Public GIT Repository
projects / simgrid.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 972f3d3)
Put the good Gflops of clusters.
authorNavarrop <Pierre.Navarro@imag.fr>
Tue, 26 Apr 2011 09:32:12 +0000 (11:32 +0200)
committerNavarrop <Pierre.Navarro@imag.fr>
Tue, 26 Apr 2011 09:32:12 +0000 (11:32 +0200)
buildtools/Cmake/generate_g5k_platform.pl patch | blob | history
buildtools/Cmake/test_g5k.xml patch | blob | history

diff --git a/buildtools/Cmake/generate_g5k_platform.pl b/buildtools/Cmake/generate_g5k_platform.pl
index f815c21..c213ee7 100755 (executable)
--- a/buildtools/Cmake/generate_g5k_platform.pl
+++ b/buildtools/Cmake/generate_g5k_platform.pl
@@ -1,5 +1,6 @@
 #!/usr/bin/perl -w
 use strict;
 #!/usr/bin/perl -w
 use strict;
+use Switch;
 my $toversion=3;
 
 if($#ARGV!=1) {
 my $toversion=3;
 
 if($#ARGV!=1) {
@@ -77,7 +78,9 @@ while(defined($line=<SITES_LIGNE>))
                                while(defined($line=<NODES_LIGNE>))
                                {
                                        if($line =~ /"total": (.*),/){
                                while(defined($line=<NODES_LIGNE>))
                                {
                                        if($line =~ /"total": (.*),/){
-                                               print "\t\t\t\tradical=\"1-$1\" power=\"3.542E9\" bw=\"1.25E8\" lat=\"1.0E-4\""."\n";
+                                               print "\t\t\t\tradical=\"1-$1\" power=\"";
+                                               &get_gflops($cluster);
+                                               print "\" bw=\"1.25E8\" lat=\"1.0E-4\""."\n";
                                                print "\t\t\t\tbb_bw=\"1.25E9\" bb_lat=\"1.0E-4\"></cluster>\n";
                                        }
                                }
                                                print "\t\t\t\tbb_bw=\"1.25E9\" bb_lat=\"1.0E-4\"></cluster>\n";
                                        }
                                }
@@ -156,4 +159,46 @@ while(@AS_route)
 print "\t</AS>\n";
 print "</platform>\n";
 `rm sites`;
 print "\t</AS>\n";
 print "</platform>\n";
 `rm sites`;
-close SITES_LIGNE;
\ No newline at end of file
+close SITES_LIGNE;
+
+
+sub get_gflops {
+       switch ($_[0]) {
+               case "bordeplage" { print "5.2297E9" }
+               case "bordereau"  { print "8.8925E9" }
+               case "borderline" { print "13.357E9" }
+               
+               case "chicon"     { print "8.9618E9" }
+               case "chimint"    { print "23.531E9" }
+               case "chinqchint" { print "22.270E9" }
+               case "chirloute"  { print "24.473E9" }
+               
+               case "adonis"     { print "23.681E9" }
+               case "edel"       { print "23.492E9" }
+               case "genepi"     { print "21.175E9" }
+               
+               case "capricorne" { print "4.7233E9" }
+               case "sagittaire" { print "5.6693E9" }
+               
+               case "graphene"   { print "16.673E9" }
+               case "griffon"    { print "20.678E9" }
+               
+               case "gdx"        { print "4.7153E9" }
+               case "netgdx"     { print "4.7144E9" }
+               
+               case "paradent"   { print "21.496E9" }
+               case "paramount"  { print "12.910E9" }
+               case "parapide"   { print "30.130E9" }
+               case "parapluie"  { print "27.391E9" }
+               
+               case "helios"     { print "7.7318E9" }
+               case "sol"        { print "8.9388E9" }
+               case "suno"       { print "23.530E9" }
+               
+               case "pastel"     { print "9.5674E9" }
+               case "violette"   { print "5.1143E9" }
+               
+               case "default"    {     print "3.542E9" }
+               else                      {     print "xxxxxxx" }
+       }
+}
\ No newline at end of file
diff --git a/buildtools/Cmake/test_g5k.xml b/buildtools/Cmake/test_g5k.xml
index 0acda05..46898bd 100644 (file)
--- a/buildtools/Cmake/test_g5k.xml
+++ b/buildtools/Cmake/test_g5k.xml
@@ -36,17 +36,17 @@
                </AS>
                <AS id="AS_bordeaux" routing="RuleBased" >
                        <cluster id="AS_bordeplage" prefix="bordeplage-" suffix=".bordeplage.grid5000.fr"
                </AS>
                <AS id="AS_bordeaux" routing="RuleBased" >
                        <cluster id="AS_bordeplage" prefix="bordeplage-" suffix=".bordeplage.grid5000.fr"
-                               radical="1-51" power="3.542E9" bw="1.25E8" lat="1.0E-4"
+                               radical="1-51" power="5.2297E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_bordeplage" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_bordereau" prefix="bordereau-" suffix=".bordereau.grid5000.fr"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_bordeplage" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_bordereau" prefix="bordereau-" suffix=".bordereau.grid5000.fr"
-                               radical="1-93" power="3.542E9" bw="1.25E8" lat="1.0E-4"
+                               radical="1-93" power="8.8925E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_bordereau" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_borderline" prefix="borderline-" suffix=".borderline.grid5000.fr"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_bordereau" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_borderline" prefix="borderline-" suffix=".borderline.grid5000.fr"
-                               radical="1-10" power="3.542E9" bw="1.25E8" lat="1.0E-4"
+                               radical="1-10" power="13.357E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_borderline" bandwidth="1.25E9" latency="1.0E-4"/>
 
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_borderline" bandwidth="1.25E9" latency="1.0E-4"/>
 
@@ -80,17 +80,17 @@
                </AS>
                <AS id="AS_grenoble" routing="RuleBased" >
                        <cluster id="AS_adonis" prefix="adonis-" suffix=".adonis.grid5000.fr"
                </AS>
                <AS id="AS_grenoble" routing="RuleBased" >
                        <cluster id="AS_adonis" prefix="adonis-" suffix=".adonis.grid5000.fr"
-                               radical="1-12" power="3.542E9" bw="1.25E8" lat="1.0E-4"
+                               radical="1-12" power="23.681E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_adonis" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_edel" prefix="edel-" suffix=".edel.grid5000.fr"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_adonis" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_edel" prefix="edel-" suffix=".edel.grid5000.fr"
-                               radical="1-72" power="3.542E9" bw="1.25E8" lat="1.0E-4"
+                               radical="1-72" power="23.492E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_edel" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_genepi" prefix="genepi-" suffix=".genepi.grid5000.fr"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_edel" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_genepi" prefix="genepi-" suffix=".genepi.grid5000.fr"
-                               radical="1-34" power="3.542E9" bw="1.25E8" lat="1.0E-4"
+                               radical="1-34" power="21.175E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_genepi" bandwidth="1.25E9" latency="1.0E-4"/>
 
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_genepi" bandwidth="1.25E9" latency="1.0E-4"/>
 
@@ -124,12 +124,12 @@
                </AS>
                <AS id="AS_lille" routing="RuleBased" >
                        <cluster id="AS_chicon" prefix="chicon-" suffix=".chicon.grid5000.fr"
                </AS>
                <AS id="AS_lille" routing="RuleBased" >
                        <cluster id="AS_chicon" prefix="chicon-" suffix=".chicon.grid5000.fr"
-                               radical="1-26" power="3.542E9" bw="1.25E8" lat="1.0E-4"
+                               radical="1-26" power="8.9618E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_chicon" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_chinqchint" prefix="chinqchint-" suffix=".chinqchint.grid5000.fr"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_chicon" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_chinqchint" prefix="chinqchint-" suffix=".chinqchint.grid5000.fr"
-                               radical="1-46" power="3.542E9" bw="1.25E8" lat="1.0E-4"
+                               radical="1-46" power="22.270E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_chinqchint" bandwidth="1.25E9" latency="1.0E-4"/>
 
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_chinqchint" bandwidth="1.25E9" latency="1.0E-4"/>
 
@@ -163,12 +163,12 @@
                </AS>
                <AS id="AS_lyon" routing="RuleBased" >
                        <cluster id="AS_capricorne" prefix="capricorne-" suffix=".capricorne.grid5000.fr"
                </AS>
                <AS id="AS_lyon" routing="RuleBased" >
                        <cluster id="AS_capricorne" prefix="capricorne-" suffix=".capricorne.grid5000.fr"
-                               radical="1-56" power="3.542E9" bw="1.25E8" lat="1.0E-4"
+                               radical="1-56" power="4.7233E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_capricorne" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_sagittaire" prefix="sagittaire-" suffix=".sagittaire.grid5000.fr"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_capricorne" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_sagittaire" prefix="sagittaire-" suffix=".sagittaire.grid5000.fr"
-                               radical="1-79" power="3.542E9" bw="1.25E8" lat="1.0E-4"
+                               radical="1-79" power="5.6693E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_sagittaire" bandwidth="1.25E9" latency="1.0E-4"/>
 
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_sagittaire" bandwidth="1.25E9" latency="1.0E-4"/>
 
@@ -202,12 +202,12 @@
                </AS>
                <AS id="AS_nancy" routing="RuleBased" >
                        <cluster id="AS_graphene" prefix="graphene-" suffix=".graphene.grid5000.fr"
                </AS>
                <AS id="AS_nancy" routing="RuleBased" >
                        <cluster id="AS_graphene" prefix="graphene-" suffix=".graphene.grid5000.fr"
-                               radical="1-144" power="3.542E9" bw="1.25E8" lat="1.0E-4"
+                               radical="1-144" power="16.673E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_graphene" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_griffon" prefix="griffon-" suffix=".griffon.grid5000.fr"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_graphene" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_griffon" prefix="griffon-" suffix=".griffon.grid5000.fr"
-                               radical="1-92" power="3.542E9" bw="1.25E8" lat="1.0E-4"
+                               radical="1-92" power="20.678E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_griffon" bandwidth="1.25E9" latency="1.0E-4"/>
 
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_griffon" bandwidth="1.25E9" latency="1.0E-4"/>
 
@@ -241,12 +241,12 @@
                </AS>
                <AS id="AS_orsay" routing="RuleBased" >
                        <cluster id="AS_gdx" prefix="gdx-" suffix=".gdx.grid5000.fr"
                </AS>
                <AS id="AS_orsay" routing="RuleBased" >
                        <cluster id="AS_gdx" prefix="gdx-" suffix=".gdx.grid5000.fr"
-                               radical="1-310" power="3.542E9" bw="1.25E8" lat="1.0E-4"
+                               radical="1-310" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_gdx" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_netgdx" prefix="netgdx-" suffix=".netgdx.grid5000.fr"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_gdx" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_netgdx" prefix="netgdx-" suffix=".netgdx.grid5000.fr"
-                               radical="1-30" power="3.542E9" bw="1.25E8" lat="1.0E-4"
+                               radical="1-30" power="4.7144E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_netgdx" bandwidth="1.25E9" latency="1.0E-4"/>
 
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_netgdx" bandwidth="1.25E9" latency="1.0E-4"/>
 
@@ -280,22 +280,22 @@
                </AS>
                <AS id="AS_rennes" routing="RuleBased" >
                        <cluster id="AS_paradent" prefix="paradent-" suffix=".paradent.grid5000.fr"
                </AS>
                <AS id="AS_rennes" routing="RuleBased" >
                        <cluster id="AS_paradent" prefix="paradent-" suffix=".paradent.grid5000.fr"
-                               radical="1-64" power="3.542E9" bw="1.25E8" lat="1.0E-4"
+                               radical="1-64" power="21.496E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_paradent" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_paramount" prefix="paramount-" suffix=".paramount.grid5000.fr"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_paradent" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_paramount" prefix="paramount-" suffix=".paramount.grid5000.fr"
-                               radical="1-33" power="3.542E9" bw="1.25E8" lat="1.0E-4"
+                               radical="1-33" power="12.910E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_paramount" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_parapide" prefix="parapide-" suffix=".parapide.grid5000.fr"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_paramount" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_parapide" prefix="parapide-" suffix=".parapide.grid5000.fr"
-                               radical="1-25" power="3.542E9" bw="1.25E8" lat="1.0E-4"
+                               radical="1-25" power="30.130E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_parapide" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_parapluie" prefix="parapluie-" suffix=".parapluie.grid5000.fr"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_parapide" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_parapluie" prefix="parapluie-" suffix=".parapluie.grid5000.fr"
-                               radical="1-40" power="3.542E9" bw="1.25E8" lat="1.0E-4"
+                               radical="1-40" power="27.391E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_parapluie" bandwidth="1.25E9" latency="1.0E-4"/>
 
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_parapluie" bandwidth="1.25E9" latency="1.0E-4"/>
 
@@ -329,17 +329,17 @@
                </AS>
                <AS id="AS_sophia" routing="RuleBased" >
                        <cluster id="AS_helios" prefix="helios-" suffix=".helios.grid5000.fr"
                </AS>
                <AS id="AS_sophia" routing="RuleBased" >
                        <cluster id="AS_helios" prefix="helios-" suffix=".helios.grid5000.fr"
-                               radical="1-56" power="3.542E9" bw="1.25E8" lat="1.0E-4"
+                               radical="1-56" power="7.7318E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_helios" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_sol" prefix="sol-" suffix=".sol.grid5000.fr"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_helios" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_sol" prefix="sol-" suffix=".sol.grid5000.fr"
-                               radical="1-50" power="3.542E9" bw="1.25E8" lat="1.0E-4"
+                               radical="1-50" power="8.9388E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_sol" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_suno" prefix="suno-" suffix=".suno.grid5000.fr"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_sol" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_suno" prefix="suno-" suffix=".suno.grid5000.fr"
-                               radical="1-45" power="3.542E9" bw="1.25E8" lat="1.0E-4"
+                               radical="1-45" power="23.530E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_suno" bandwidth="1.25E9" latency="1.0E-4"/>
 
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_suno" bandwidth="1.25E9" latency="1.0E-4"/>
 
@@ -373,12 +373,12 @@
                </AS>
                <AS id="AS_toulouse" routing="RuleBased" >
                        <cluster id="AS_pastel" prefix="pastel-" suffix=".pastel.grid5000.fr"
                </AS>
                <AS id="AS_toulouse" routing="RuleBased" >
                        <cluster id="AS_pastel" prefix="pastel-" suffix=".pastel.grid5000.fr"
-                               radical="1-80" power="3.542E9" bw="1.25E8" lat="1.0E-4"
+                               radical="1-80" power="9.5674E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_pastel" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_violette" prefix="violette-" suffix=".violette.grid5000.fr"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_pastel" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <cluster id="AS_violette" prefix="violette-" suffix=".violette.grid5000.fr"
-                               radical="1-52" power="3.542E9" bw="1.25E8" lat="1.0E-4"
+                               radical="1-52" power="5.1143E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_violette" bandwidth="1.25E9" latency="1.0E-4"/>
 
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_violette" bandwidth="1.25E9" latency="1.0E-4"/>
 
Clone of SimGrid repository with local patches