From: Navarrop Date: Thu, 7 Jul 2011 15:07:21 +0000 (+0200) Subject: "Refresh" example platforms. X-Git-Tag: v3_6_2~198 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e2ca00dae941dff071aa0467d1d5fe7fd074ded0?ds=sidebyside "Refresh" example platforms. Delete unused platforms. Add gdx and griffon clusters. --- diff --git a/buildtools/Cmake/generate_g5k_platform.pl b/buildtools/Cmake/generate_g5k_platform.pl index a2e29ca041..b8ba575d26 100755 --- a/buildtools/Cmake/generate_g5k_platform.pl +++ b/buildtools/Cmake/generate_g5k_platform.pl @@ -99,15 +99,15 @@ while(defined($line=)) print "\n"; print "\t\t\t\n"; print "\t\t\t\t\t\n"; print "\t\t\t\t\t\n"; print "\t\t\t\n\n"; print "\t\t\t\n"; print "\t\t\t\t\t\n"; @@ -115,7 +115,7 @@ while(defined($line=)) print "\t\t\t\n"; print "\t\t\t\t\t\n"; print "\t\t\t\n\n"; diff --git a/examples/platforms/cluster_with_100_hosts.xml b/examples/platforms/One_cluster.xml similarity index 100% rename from examples/platforms/cluster_with_100_hosts.xml rename to examples/platforms/One_cluster.xml diff --git a/examples/platforms/2_clusters_with_30000_hosts.xml b/examples/platforms/Two_clusters.xml similarity index 84% rename from examples/platforms/2_clusters_with_30000_hosts.xml rename to examples/platforms/Two_clusters.xml index 551dcba287..fc63a075a1 100644 --- a/examples/platforms/2_clusters_with_30000_hosts.xml +++ b/examples/platforms/Two_clusters.xml @@ -3,11 +3,11 @@ diff --git a/examples/platforms/cluster_with_100000_hosts.xml b/examples/platforms/cluster_with_100000_hosts.xml deleted file mode 100644 index 83e9d27dc0..0000000000 --- a/examples/platforms/cluster_with_100000_hosts.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/examples/platforms/cluster_with_10000_hosts.xml b/examples/platforms/cluster_with_10000_hosts.xml deleted file mode 100644 index d958dfa73a..0000000000 --- a/examples/platforms/cluster_with_10000_hosts.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/examples/platforms/cluster_with_1000_hosts.xml b/examples/platforms/cluster_with_1000_hosts.xml deleted file mode 100644 index b4a0eb129b..0000000000 --- a/examples/platforms/cluster_with_1000_hosts.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/examples/platforms/cluster_with_300000_hosts.xml b/examples/platforms/cluster_with_300000_hosts.xml deleted file mode 100644 index efed72fd25..0000000000 --- a/examples/platforms/cluster_with_300000_hosts.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/examples/platforms/cluster_with_30000_hosts.xml b/examples/platforms/cluster_with_30000_hosts.xml deleted file mode 100644 index ac0f24e6e1..0000000000 --- a/examples/platforms/cluster_with_30000_hosts.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/examples/platforms/g5k.xml b/examples/platforms/g5k.xml index abdc04003f..664ae30233 100644 --- a/examples/platforms/g5k.xml +++ b/examples/platforms/g5k.xml @@ -56,15 +56,15 @@ @@ -72,7 +72,7 @@ @@ -100,15 +100,15 @@ @@ -116,7 +116,7 @@ @@ -149,15 +149,15 @@ @@ -165,7 +165,7 @@ @@ -188,15 +188,15 @@ @@ -204,7 +204,7 @@ @@ -227,15 +227,15 @@ @@ -243,7 +243,7 @@ @@ -266,15 +266,15 @@ @@ -282,7 +282,7 @@ @@ -315,15 +315,15 @@ @@ -331,7 +331,7 @@ @@ -359,15 +359,15 @@ @@ -375,7 +375,7 @@ @@ -398,15 +398,15 @@ @@ -414,7 +414,7 @@ diff --git a/examples/platforms/gdx.xml b/examples/platforms/gdx.xml new file mode 100644 index 0000000000..2121c96aec --- /dev/null +++ b/examples/platforms/gdx.xml @@ -0,0 +1,606 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/platforms/griffon-cluster.xml b/examples/platforms/griffon.xml similarity index 94% rename from examples/platforms/griffon-cluster.xml rename to examples/platforms/griffon.xml index bc2c323887..1ecc49831a 100644 --- a/examples/platforms/griffon-cluster.xml +++ b/examples/platforms/griffon.xml @@ -5,12 +5,10 @@ - + bb_bw="1.25e9" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/> - + bb_bw="1.25e9" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/> @@ -22,15 +20,13 @@ gw_dst="griffon-griffon_cluster_cabinet2_router.nancy.grid5000.fr" symmetrical="YES"> - - + - - +