Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
cleaning some oldies
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Fri, 5 Feb 2016 18:23:21 +0000 (19:23 +0100)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Fri, 5 Feb 2016 18:35:41 +0000 (19:35 +0100)
ok to keep old optorsim files, but not xml that were generated with an
even older version of the provided script.

If one wants to try these GridPP and LCG description circa 2004, just
has to run the script to get the XML.

examples/platforms/conf/gridpp_grid_2004.xml [deleted file]
examples/platforms/conf/lcg_sept2004_grid.xml [deleted file]
examples/platforms/conf/transform_optorsim_platform.pl
tools/cmake/DefinePackages.cmake

diff --git a/examples/platforms/conf/gridpp_grid_2004.xml b/examples/platforms/conf/gridpp_grid_2004.xml
deleted file mode 100644 (file)
index af2d582..0000000
+++ /dev/null
@@ -1,244 +0,0 @@
-<!-- This platform was automatically converted from the OptorSim platform.
-
-  As such, it only contains information of the cluster interconnexion,
-  not on the caracteristics of each cluster. In a sense, it describes
-  the network of a National Research and Education Network (NREN), but
-  not of a computational platform.
-  
-  We hope that you find it useful anyway. I you know how to complete
-  this information with data on the cluster configurations, please
-  drop us a mail so that we can add this information. -->
-
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
-<AS  id="AS0"  routing="Floyd">
-<!--0 WC_Gla-->
-<!--1 WC_Edi-->
-<!--2 WC_Manc-->
-<!--3 WC_Leeds-->
-<!--4 WC_Reading-->
-<!--5 WC_London-->
-<!--6 WC_Bristol-->
-<!--7 WC_Portsmouth-->
-<!--8 Gla_router-->
-<!--9 Edi_router-->
-<!--10 NorMAN-->
-<!--11 YHMAN-->
-<!--12 EastNet-->
-<!--13 LMN-->
-<!--14 SWAN_BWEMAN-->
-<!--15 TVN-->
-<!--16 MidMAN-->
-<!--17 NNW_router-->
-<!--18 Glasgow-->
-<!--19 Edi-->
-<!--20 Durham-->
-<!--21 Sheffield-->
-<!--22 Cam-->
-<!--23 UCL-->
-<!--24 IC-->
-<!--25 QMW-->
-<!--26 Brunel-->
-<!--27 RHNBC-->
-<!--28 Bristol-->
-<!--29 RAL-->
-<!--30 Oxford-->
-<!--31 B_ham-->
-<!--32 L_pool-->
-<!--33 Manc-->
-<!--34 Lanc-->
-<!--35 CERN-->
-       <host id="WC_Edi" power="1f"/>
-       <host id="WC_Manc" power="1f"/>
-       <host id="Gla_router" power="1f"/>
-       <host id="Glasgow" power="20Mf"/>
-       <host id="Edi" power="25.6Mf"/>
-       <host id="Durham" power="4.134Mf"/>
-       <host id="Sheffield" power="49.64Mf"/>
-       <host id="Cam" power="1.32Mf"/>
-       <host id="UCL" power="22.5Mf"/>
-       <host id="IC" power="440Mf"/>
-       <host id="QMW" power="44Mf"/>
-       <host id="Brunel" power="85.68Mf"/>
-       <host id="RHNBC" power="7.2Mf"/>
-       <host id="Bristol" power="60Mf"/>
-       <host id="RAL" power="556.956Mf"/>
-       <host id="Oxford" power="156.56Mf"/>
-       <host id="B_ham" power="13.5Mf"/>
-       <host id="L_pool" power="308.07Mf"/>
-       <host id="Manc" power="22.5Mf"/>
-       <host id="Lanc" power="204.8Mf"/>
-       <host id="CERN" power="1f"/>
-
-       <router id="WC_Gla"/>
-       <router id="WC_Leeds"/>
-       <router id="WC_Reading"/>
-       <router id="WC_London"/>
-       <router id="WC_Bristol"/>
-       <router id="WC_Portsmouth"/>
-       <router id="Edi_router"/>
-       <router id="NorMAN"/>
-       <router id="YHMAN"/>
-       <router id="EastNet"/>
-       <router id="LMN"/>
-       <router id="SWAN_BWEMAN"/>
-       <router id="TVN"/>
-       <router id="MidMAN"/>
-       <router id="NNW_router"/>
-
-       <link id="link0" bandwidth="10kBps"/>
-       <link id="link1" bandwidth="10kBps"/>
-       <link id="link2" bandwidth="1kBps"/>
-       <link id="link3" bandwidth="10kBps"/>
-       <link id="link4" bandwidth="1kBps"/>
-       <link id="link5" bandwidth="10kBps"/>
-       <link id="link6" bandwidth="10kBps"/>
-       <link id="link7" bandwidth="1kBps"/>
-       <link id="link8" bandwidth="1kBps"/>
-       <link id="link9" bandwidth="10kBps"/>
-       <link id="link10" bandwidth="622Bps"/>
-       <link id="link11" bandwidth="1kBps"/>
-       <link id="link12" bandwidth="10kBps"/>
-       <link id="link13" bandwidth="10kBps"/>
-       <link id="link14" bandwidth="622Bps"/>
-       <link id="link15" bandwidth="10kBps"/>
-       <link id="link16" bandwidth="1kBps"/>
-       <link id="link17" bandwidth="1kBps"/>
-       <link id="link18" bandwidth="10kBps"/>
-       <link id="link19" bandwidth="622Bps"/>
-       <link id="link20" bandwidth="2.5kBps"/>
-       <link id="link21" bandwidth="1kBps"/>
-       <link id="link22" bandwidth="1kBps"/>
-       <link id="link23" bandwidth="155Bps"/>
-       <link id="link24" bandwidth="155Bps"/>
-       <link id="link25" bandwidth="155Bps"/>
-       <link id="link26" bandwidth="155Bps"/>
-       <link id="link27" bandwidth="155Bps"/>
-       <link id="link28" bandwidth="155Bps"/>
-       <link id="link29" bandwidth="155Bps"/>
-       <link id="link30" bandwidth="155Bps"/>
-       <link id="link31" bandwidth="622Bps"/>
-       <link id="link32" bandwidth="622Bps"/>
-       <link id="link33" bandwidth="622Bps"/>
-       <link id="link34" bandwidth="622Bps"/>
-       <link id="link35" bandwidth="155Bps"/>
-       <link id="link36" bandwidth="1kBps"/>
-       <link id="link37" bandwidth="155Bps"/>
-
-       <route src="WC_Gla" dst="WC_Gla">
-               <link_ctn id="link0"/>
-       </route>
-       <route src="WC_Gla" dst="WC_Edi">
-               <link_ctn id="link1"/>
-       </route>
-       <route src="WC_Gla" dst="WC_Portsmouth">
-               <link_ctn id="link2"/>
-       </route>
-       <route src="WC_Edi" dst="WC_Manc">
-               <link_ctn id="link3"/>
-       </route>
-       <route src="WC_Edi" dst="Gla_router">
-               <link_ctn id="link4"/>
-       </route>
-       <route src="WC_Manc" dst="WC_Manc">
-               <link_ctn id="link5"/>
-       </route>
-       <route src="WC_Manc" dst="WC_Leeds">
-               <link_ctn id="link6"/>
-       </route>
-       <route src="WC_Manc" dst="TVN">
-               <link_ctn id="link7"/>
-       </route>
-       <route src="WC_Manc" dst="MidMAN">
-               <link_ctn id="link8"/>
-       </route>
-       <route src="WC_Leeds" dst="WC_Reading">
-               <link_ctn id="link9"/>
-       </route>
-       <route src="WC_Leeds" dst="Edi_router">
-               <link_ctn id="link10"/>
-       </route>
-       <route src="WC_Leeds" dst="NorMAN">
-               <link_ctn id="link11"/>
-       </route>
-       <route src="WC_Reading" dst="WC_Reading">
-               <link_ctn id="link12"/>
-       </route>
-       <route src="WC_Reading" dst="WC_London">
-               <link_ctn id="link13"/>
-       </route>
-       <route src="WC_Reading" dst="SWAN_BWEMAN">
-               <link_ctn id="link14"/>
-       </route>
-       <route src="WC_London" dst="WC_Bristol">
-               <link_ctn id="link15"/>
-       </route>
-       <route src="WC_London" dst="YHMAN">
-               <link_ctn id="link16"/>
-       </route>
-       <route src="WC_London" dst="EastNet">
-               <link_ctn id="link17"/>
-       </route>
-       <route src="WC_Bristol" dst="WC_Bristol">
-               <link_ctn id="link18"/>
-       </route>
-       <route src="WC_Bristol" dst="LMN">
-               <link_ctn id="link19"/>
-       </route>
-       <route src="WC_Portsmouth" dst="Lanc">
-               <link_ctn id="link20"/>
-       </route>
-       <route src="Gla_router" dst="NNW_router">
-               <link_ctn id="link21"/>
-       </route>
-       <route src="Edi_router" dst="Glasgow">
-               <link_ctn id="link22"/>
-       </route>
-       <route src="NorMAN" dst="Edi">
-               <link_ctn id="link23"/>
-       </route>
-       <route src="YHMAN" dst="Durham">
-               <link_ctn id="link24"/>
-       </route>
-       <route src="EastNet" dst="Sheffield">
-               <link_ctn id="link25"/>
-       </route>
-       <route src="LMN" dst="Cam">
-               <link_ctn id="link26"/>
-       </route>
-       <route src="LMN" dst="UCL">
-               <link_ctn id="link27"/>
-       </route>
-       <route src="LMN" dst="IC">
-               <link_ctn id="link28"/>
-       </route>
-       <route src="LMN" dst="QMW">
-               <link_ctn id="link29"/>
-       </route>
-       <route src="LMN" dst="Brunel">
-               <link_ctn id="link30"/>
-       </route>
-       <route src="SWAN_BWEMAN" dst="RHNBC">
-               <link_ctn id="link31"/>
-       </route>
-       <route src="TVN" dst="Bristol">
-               <link_ctn id="link32"/>
-       </route>
-       <route src="TVN" dst="RAL">
-               <link_ctn id="link33"/>
-       </route>
-       <route src="MidMAN" dst="Oxford">
-               <link_ctn id="link34"/>
-       </route>
-       <route src="NNW_router" dst="B_ham">
-               <link_ctn id="link35"/>
-       </route>
-       <route src="NNW_router" dst="L_pool">
-               <link_ctn id="link36"/>
-       </route>
-       <route src="NNW_router" dst="Manc">
-               <link_ctn id="link37"/>
-       </route>
-</AS>
-</platform> 
diff --git a/examples/platforms/conf/lcg_sept2004_grid.xml b/examples/platforms/conf/lcg_sept2004_grid.xml
deleted file mode 100644 (file)
index fced84a..0000000
+++ /dev/null
@@ -1,618 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
-<AS  id="AS0"  routing="Floyd">
-       <host id="0" power="1.47Tf"/>
-       <host id="1" power="1.82Gf"/>
-       <host id="2" power="1f"/>
-       <host id="4" power="593.46Gf"/>
-       <host id="5" power="560Mf"/>
-       <host id="6" power="560Mf"/>
-       <host id="7" power="560Mf"/>
-       <host id="8" power="96Mf"/>
-       <host id="9" power="7.68Gf"/>
-       <host id="10" power="910Mf"/>
-       <host id="12" power="250Mf"/>
-       <host id="13" power="448Mf"/>
-       <host id="15" power="12.5Mf"/>
-       <host id="16" power="12.5Mf"/>
-       <host id="18" power="78Mf"/>
-       <host id="20" power="560Mf"/>
-       <host id="23" power="60Mf"/>
-       <host id="24" power="154.524Gf"/>
-       <host id="25" power="60Mf"/>
-       <host id="26" power="60Mf"/>
-       <host id="27" power="60Mf"/>
-       <host id="28" power="60Mf"/>
-       <host id="29" power="60Mf"/>
-       <host id="30" power="60Mf"/>
-       <host id="31" power="1f"/>
-       <host id="32" power="2.1Gf"/>
-       <host id="33" power="21Gf"/>
-       <host id="35" power="442Mf"/>
-       <host id="36" power="6.5Gf"/>
-       <host id="38" power="300Mf"/>
-       <host id="39" power="1.2Gf"/>
-       <host id="42" power="540Mf"/>
-       <host id="43" power="390Mf"/>
-       <host id="44" power="208Mf"/>
-       <host id="45" power="600Mf"/>
-       <host id="49" power="44.352Gf"/>
-       <host id="50" power="4.564Gf"/>
-       <host id="52" power="78.522Gf"/>
-       <host id="54" power="9.2Gf"/>
-       <host id="56" power="142.476Gf"/>
-       <host id="57" power="448Mf"/>
-       <host id="59" power="3.78Gf"/>
-       <host id="60" power="250Mf"/>
-       <host id="61" power="650Mf"/>
-       <host id="64" power="9.2Gf"/>
-       <host id="65" power="250Mf"/>
-       <host id="66" power="250Mf"/>
-       <host id="67" power="592Mf"/>
-       <host id="68" power="250Mf"/>
-       <host id="69" power="250Mf"/>
-       <host id="70" power="250Mf"/>
-       <host id="71" power="4Mf"/>
-       <host id="72" power="250Mf"/>
-       <host id="73" power="250Mf"/>
-       <host id="74" power="1f"/>
-       <host id="75" power="53.6Gf"/>
-       <host id="77" power="14.248Gf"/>
-       <host id="79" power="24Mf"/>
-       <host id="82" power="240Mf"/>
-       <host id="83" power="2.56Gf"/>
-       <host id="86" power="2.28Gf"/>
-       <host id="89" power="20Mf"/>
-       <host id="93" power="250Mf"/>
-       <host id="95" power="8.636Gf"/>
-       <host id="97" power="250Mf"/>
-       <host id="98" power="250Mf"/>
-       <host id="99" power="28.098Gf"/>
-       <host id="100" power="250Mf"/>
-
-       <router id="3"/>
-       <router id="11"/>
-       <router id="14"/>
-       <router id="17"/>
-       <router id="19"/>
-       <router id="21"/>
-       <router id="22"/>
-       <router id="34"/>
-       <router id="37"/>
-       <router id="40"/>
-       <router id="41"/>
-       <router id="46"/>
-       <router id="47"/>
-       <router id="48"/>
-       <router id="51"/>
-       <router id="53"/>
-       <router id="55"/>
-       <router id="58"/>
-       <router id="62"/>
-       <router id="63"/>
-       <router id="76"/>
-       <router id="78"/>
-       <router id="80"/>
-       <router id="81"/>
-       <router id="84"/>
-       <router id="85"/>
-       <router id="87"/>
-       <router id="88"/>
-       <router id="90"/>
-       <router id="91"/>
-       <router id="92"/>
-       <router id="94"/>
-       <router id="96"/>
-
-       <link id="link0" bandwidth="1kBps"/>
-       <link id="link1" bandwidth="10kBps"/>
-       <link id="link2" bandwidth="10kBps"/>
-       <link id="link3" bandwidth="155Bps"/>
-       <link id="link4" bandwidth="10kBps"/>
-       <link id="link5" bandwidth="10kBps"/>
-       <link id="link6" bandwidth="10kBps"/>
-       <link id="link7" bandwidth="155Bps"/>
-       <link id="link8" bandwidth="155Bps"/>
-       <link id="link9" bandwidth="155Bps"/>
-       <link id="link10" bandwidth="155Bps"/>
-       <link id="link11" bandwidth="155Bps"/>
-       <link id="link12" bandwidth="155Bps"/>
-       <link id="link13" bandwidth="155Bps"/>
-       <link id="link14" bandwidth="155Bps"/>
-       <link id="link15" bandwidth="10kBps"/>
-       <link id="link16" bandwidth="10kBps"/>
-       <link id="link17" bandwidth="155Bps"/>
-       <link id="link18" bandwidth="155Bps"/>
-       <link id="link19" bandwidth="155Bps"/>
-       <link id="link20" bandwidth="155Bps"/>
-       <link id="link21" bandwidth="155Bps"/>
-       <link id="link22" bandwidth="622Bps"/>
-       <link id="link23" bandwidth="622Bps"/>
-       <link id="link24" bandwidth="155Bps"/>
-       <link id="link25" bandwidth="10kBps"/>
-       <link id="link26" bandwidth="2.5kBps"/>
-       <link id="link27" bandwidth="155Bps"/>
-       <link id="link28" bandwidth="2.5kBps"/>
-       <link id="link29" bandwidth="1kBps"/>
-       <link id="link30" bandwidth="10kBps"/>
-       <link id="link31" bandwidth="10kBps"/>
-       <link id="link32" bandwidth="155Bps"/>
-       <link id="link33" bandwidth="1kBps"/>
-       <link id="link34" bandwidth="155Bps"/>
-       <link id="link35" bandwidth="155Bps"/>
-       <link id="link36" bandwidth="155Bps"/>
-       <link id="link37" bandwidth="155Bps"/>
-       <link id="link38" bandwidth="155Bps"/>
-       <link id="link39" bandwidth="155Bps"/>
-       <link id="link40" bandwidth="1kBps"/>
-       <link id="link41" bandwidth="1kBps"/>
-       <link id="link42" bandwidth="10kBps"/>
-       <link id="link43" bandwidth="2.5kBps"/>
-       <link id="link44" bandwidth="10kBps"/>
-       <link id="link45" bandwidth="155Bps"/>
-       <link id="link46" bandwidth="155Bps"/>
-       <link id="link47" bandwidth="2.5kBps"/>
-       <link id="link48" bandwidth="155Bps"/>
-       <link id="link49" bandwidth="155Bps"/>
-       <link id="link50" bandwidth="10kBps"/>
-       <link id="link51" bandwidth="155Bps"/>
-       <link id="link52" bandwidth="10kBps"/>
-       <link id="link53" bandwidth="155Bps"/>
-       <link id="link54" bandwidth="155Bps"/>
-       <link id="link55" bandwidth="155Bps"/>
-       <link id="link56" bandwidth="155Bps"/>
-       <link id="link57" bandwidth="2.5kBps"/>
-       <link id="link58" bandwidth="1kBps"/>
-       <link id="link59" bandwidth="10kBps"/>
-       <link id="link60" bandwidth="2.5kBps"/>
-       <link id="link61" bandwidth="2.5kBps"/>
-       <link id="link62" bandwidth="155Bps"/>
-       <link id="link63" bandwidth="10kBps"/>
-       <link id="link64" bandwidth="10kBps"/>
-       <link id="link65" bandwidth="1kBps"/>
-       <link id="link66" bandwidth="155Bps"/>
-       <link id="link67" bandwidth="10kBps"/>
-       <link id="link68" bandwidth="10kBps"/>
-       <link id="link69" bandwidth="1kBps"/>
-       <link id="link70" bandwidth="10kBps"/>
-       <link id="link71" bandwidth="1kBps"/>
-       <link id="link72" bandwidth="10kBps"/>
-       <link id="link73" bandwidth="622Bps"/>
-       <link id="link74" bandwidth="1kBps"/>
-       <link id="link75" bandwidth="1kBps"/>
-       <link id="link76" bandwidth="1kBps"/>
-       <link id="link77" bandwidth="10kBps"/>
-       <link id="link78" bandwidth="155Bps"/>
-       <link id="link79" bandwidth="155Bps"/>
-       <link id="link80" bandwidth="155Bps"/>
-       <link id="link81" bandwidth="155Bps"/>
-       <link id="link82" bandwidth="155Bps"/>
-       <link id="link83" bandwidth="155Bps"/>
-       <link id="link84" bandwidth="155Bps"/>
-       <link id="link85" bandwidth="155Bps"/>
-       <link id="link86" bandwidth="155Bps"/>
-       <link id="link87" bandwidth="155Bps"/>
-       <link id="link88" bandwidth="155Bps"/>
-       <link id="link89" bandwidth="2.5kBps"/>
-       <link id="link90" bandwidth="10kBps"/>
-       <link id="link91" bandwidth="3kBps"/>
-       <link id="link92" bandwidth="3kBps"/>
-       <link id="link93" bandwidth="10kBps"/>
-       <link id="link94" bandwidth="10kBps"/>
-       <link id="link95" bandwidth="622Bps"/>
-       <link id="link96" bandwidth="622Bps"/>
-       <link id="link97" bandwidth="1kBps"/>
-       <link id="link98" bandwidth="3kBps"/>
-       <link id="link99" bandwidth="3kBps"/>
-       <link id="link100" bandwidth="10kBps"/>
-       <link id="link101" bandwidth="2.5kBps"/>
-       <link id="link102" bandwidth="155Bps"/>
-       <link id="link103" bandwidth="10kBps"/>
-       <link id="link104" bandwidth="10kBps"/>
-       <link id="link105" bandwidth="155Bps"/>
-       <link id="link106" bandwidth="155Bps"/>
-       <link id="link107" bandwidth="10kBps"/>
-       <link id="link108" bandwidth="10kBps"/>
-       <link id="link109" bandwidth="10kBps"/>
-       <link id="link110" bandwidth="155Bps"/>
-       <link id="link111" bandwidth="10kBps"/>
-       <link id="link112" bandwidth="10kBps"/>
-       <link id="link113" bandwidth="3kBps"/>
-       <link id="link114" bandwidth="155Bps"/>
-       <link id="link115" bandwidth="3kBps"/>
-       <link id="link116" bandwidth="10kBps"/>
-       <link id="link117" bandwidth="622Bps"/>
-       <link id="link118" bandwidth="155Bps"/>
-       <link id="link119" bandwidth="33Bps"/>
-       <link id="link120" bandwidth="1kBps"/>
-       <link id="link121" bandwidth="622Bps"/>
-       <link id="link122" bandwidth="155Bps"/>
-       <link id="link123" bandwidth="155Bps"/>
-       <link id="link124" bandwidth="155Bps"/>
-       <link id="link125" bandwidth="155Bps"/>
-       <link id="link126" bandwidth="622Bps"/>
-
-       <route src="0" dst="2">
-               <link_ctn id="link0"/>
-       </route>
-       <route src="0" dst="31">
-               <link_ctn id="link1"/>
-       </route>
-       <route src="0" dst="74">
-               <link_ctn id="link2"/>
-       </route>
-       <route src="1" dst="2">
-               <link_ctn id="link3"/>
-       </route>
-       <route src="2" dst="2">
-               <link_ctn id="link4"/>
-       </route>
-       <route src="2" dst="16">
-               <link_ctn id="link5"/>
-       </route>
-       <route src="2" dst="57">
-               <link_ctn id="link6"/>
-       </route>
-       <route src="3" dst="3">
-               <link_ctn id="link7"/>
-       </route>
-       <route src="3" dst="4">
-               <link_ctn id="link8"/>
-       </route>
-       <route src="3" dst="5">
-               <link_ctn id="link9"/>
-       </route>
-       <route src="3" dst="6">
-               <link_ctn id="link10"/>
-       </route>
-       <route src="3" dst="7">
-               <link_ctn id="link11"/>
-       </route>
-       <route src="3" dst="8">
-               <link_ctn id="link12"/>
-       </route>
-       <route src="3" dst="9">
-               <link_ctn id="link13"/>
-       </route>
-       <route src="3" dst="10">
-               <link_ctn id="link14"/>
-       </route>
-       <route src="3" dst="20">
-               <link_ctn id="link15"/>
-       </route>
-       <route src="3" dst="61">
-               <link_ctn id="link16"/>
-       </route>
-       <route src="11" dst="11">
-               <link_ctn id="link17"/>
-       </route>
-       <route src="11" dst="12">
-               <link_ctn id="link18"/>
-       </route>
-       <route src="11" dst="30">
-               <link_ctn id="link19"/>
-       </route>
-       <route src="14" dst="14">
-               <link_ctn id="link20"/>
-       </route>
-       <route src="14" dst="15">
-               <link_ctn id="link21"/>
-       </route>
-       <route src="14" dst="20">
-               <link_ctn id="link22"/>
-       </route>
-       <route src="14" dst="45">
-               <link_ctn id="link23"/>
-       </route>
-       <route src="17" dst="17">
-               <link_ctn id="link24"/>
-       </route>
-       <route src="17" dst="18">
-               <link_ctn id="link25"/>
-       </route>
-       <route src="17" dst="20">
-               <link_ctn id="link26"/>
-       </route>
-       <route src="19" dst="19">
-               <link_ctn id="link27"/>
-       </route>
-       <route src="19" dst="33">
-               <link_ctn id="link28"/>
-       </route>
-       <route src="21" dst="21">
-               <link_ctn id="link29"/>
-       </route>
-       <route src="21" dst="30">
-               <link_ctn id="link30"/>
-       </route>
-       <route src="21" dst="57">
-               <link_ctn id="link31"/>
-       </route>
-       <route src="22" dst="22">
-               <link_ctn id="link32"/>
-       </route>
-       <route src="22" dst="23">
-               <link_ctn id="link33"/>
-       </route>
-       <route src="22" dst="24">
-               <link_ctn id="link34"/>
-       </route>
-       <route src="22" dst="25">
-               <link_ctn id="link35"/>
-       </route>
-       <route src="22" dst="26">
-               <link_ctn id="link36"/>
-       </route>
-       <route src="22" dst="27">
-               <link_ctn id="link37"/>
-       </route>
-       <route src="22" dst="28">
-               <link_ctn id="link38"/>
-       </route>
-       <route src="22" dst="29">
-               <link_ctn id="link39"/>
-       </route>
-       <route src="31" dst="31">
-               <link_ctn id="link40"/>
-       </route>
-       <route src="31" dst="32">
-               <link_ctn id="link41"/>
-       </route>
-       <route src="31" dst="45">
-               <link_ctn id="link42"/>
-       </route>
-       <route src="31" dst="57">
-               <link_ctn id="link43"/>
-       </route>
-       <route src="31" dst="73">
-               <link_ctn id="link44"/>
-       </route>
-       <route src="34" dst="34">
-               <link_ctn id="link45"/>
-       </route>
-       <route src="34" dst="35">
-               <link_ctn id="link46"/>
-       </route>
-       <route src="34" dst="36">
-               <link_ctn id="link47"/>
-       </route>
-       <route src="37" dst="37">
-               <link_ctn id="link48"/>
-       </route>
-       <route src="37" dst="38">
-               <link_ctn id="link49"/>
-       </route>
-       <route src="37" dst="39">
-               <link_ctn id="link50"/>
-       </route>
-       <route src="40" dst="40">
-               <link_ctn id="link51"/>
-       </route>
-       <route src="40" dst="45">
-               <link_ctn id="link52"/>
-       </route>
-       <route src="41" dst="41">
-               <link_ctn id="link53"/>
-       </route>
-       <route src="41" dst="42">
-               <link_ctn id="link54"/>
-       </route>
-       <route src="41" dst="43">
-               <link_ctn id="link55"/>
-       </route>
-       <route src="41" dst="44">
-               <link_ctn id="link56"/>
-       </route>
-       <route src="46" dst="46">
-               <link_ctn id="link57"/>
-       </route>
-       <route src="46" dst="56">
-               <link_ctn id="link58"/>
-       </route>
-       <route src="46" dst="57">
-               <link_ctn id="link59"/>
-       </route>
-       <route src="46" dst="75">
-               <link_ctn id="link60"/>
-       </route>
-       <route src="46" dst="79">
-               <link_ctn id="link61"/>
-       </route>
-       <route src="46" dst="95">
-               <link_ctn id="link62"/>
-       </route>
-       <route src="47" dst="47">
-               <link_ctn id="link63"/>
-       </route>
-       <route src="47" dst="54">
-               <link_ctn id="link64"/>
-       </route>
-       <route src="48" dst="48">
-               <link_ctn id="link65"/>
-       </route>
-       <route src="48" dst="49">
-               <link_ctn id="link66"/>
-       </route>
-       <route src="48" dst="50">
-               <link_ctn id="link67"/>
-       </route>
-       <route src="48" dst="54">
-               <link_ctn id="link68"/>
-       </route>
-       <route src="51" dst="51">
-               <link_ctn id="link69"/>
-       </route>
-       <route src="51" dst="52">
-               <link_ctn id="link70"/>
-       </route>
-       <route src="53" dst="53">
-               <link_ctn id="link71"/>
-       </route>
-       <route src="53" dst="54">
-               <link_ctn id="link72"/>
-       </route>
-       <route src="55" dst="55">
-               <link_ctn id="link73"/>
-       </route>
-       <route src="58" dst="58">
-               <link_ctn id="link74"/>
-       </route>
-       <route src="58" dst="59">
-               <link_ctn id="link75"/>
-       </route>
-       <route src="58" dst="60">
-               <link_ctn id="link76"/>
-       </route>
-       <route src="58" dst="61">
-               <link_ctn id="link77"/>
-       </route>
-       <route src="62" dst="62">
-               <link_ctn id="link78"/>
-       </route>
-       <route src="62" dst="65">
-               <link_ctn id="link79"/>
-       </route>
-       <route src="62" dst="66">
-               <link_ctn id="link80"/>
-       </route>
-       <route src="62" dst="67">
-               <link_ctn id="link81"/>
-       </route>
-       <route src="62" dst="68">
-               <link_ctn id="link82"/>
-       </route>
-       <route src="62" dst="69">
-               <link_ctn id="link83"/>
-       </route>
-       <route src="62" dst="70">
-               <link_ctn id="link84"/>
-       </route>
-       <route src="62" dst="71">
-               <link_ctn id="link85"/>
-       </route>
-       <route src="62" dst="72">
-               <link_ctn id="link86"/>
-       </route>
-       <route src="63" dst="63">
-               <link_ctn id="link87"/>
-       </route>
-       <route src="63" dst="64">
-               <link_ctn id="link88"/>
-       </route>
-       <route src="74" dst="74">
-               <link_ctn id="link89"/>
-       </route>
-       <route src="74" dst="75">
-               <link_ctn id="link90"/>
-       </route>
-       <route src="74" dst="80">
-               <link_ctn id="link91"/>
-       </route>
-       <route src="74" dst="83">
-               <link_ctn id="link92"/>
-       </route>
-       <route src="74" dst="89">
-               <link_ctn id="link93"/>
-       </route>
-       <route src="74" dst="90">
-               <link_ctn id="link94"/>
-       </route>
-       <route src="74" dst="95">
-               <link_ctn id="link95"/>
-       </route>
-       <route src="74" dst="99">
-               <link_ctn id="link96"/>
-       </route>
-       <route src="76" dst="76">
-               <link_ctn id="link97"/>
-       </route>
-       <route src="76" dst="77">
-               <link_ctn id="link98"/>
-       </route>
-       <route src="76" dst="80">
-               <link_ctn id="link99"/>
-       </route>
-       <route src="76" dst="90">
-               <link_ctn id="link100"/>
-       </route>
-       <route src="76" dst="93">
-               <link_ctn id="link101"/>
-       </route>
-       <route src="78" dst="78">
-               <link_ctn id="link102"/>
-       </route>
-       <route src="78" dst="79">
-               <link_ctn id="link103"/>
-       </route>
-       <route src="80" dst="80">
-               <link_ctn id="link104"/>
-       </route>
-       <route src="81" dst="81">
-               <link_ctn id="link105"/>
-       </route>
-       <route src="81" dst="82">
-               <link_ctn id="link106"/>
-       </route>
-       <route src="81" dst="83">
-               <link_ctn id="link107"/>
-       </route>
-       <route src="84" dst="84">
-               <link_ctn id="link108"/>
-       </route>
-       <route src="84" dst="86">
-               <link_ctn id="link109"/>
-       </route>
-       <route src="85" dst="85">
-               <link_ctn id="link110"/>
-       </route>
-       <route src="85" dst="86">
-               <link_ctn id="link111"/>
-       </route>
-       <route src="87" dst="87">
-               <link_ctn id="link112"/>
-       </route>
-       <route src="87" dst="89">
-               <link_ctn id="link113"/>
-       </route>
-       <route src="88" dst="88">
-               <link_ctn id="link114"/>
-       </route>
-       <route src="88" dst="89">
-               <link_ctn id="link115"/>
-       </route>
-       <route src="90" dst="90">
-               <link_ctn id="link116"/>
-       </route>
-       <route src="90" dst="91">
-               <link_ctn id="link117"/>
-       </route>
-       <route src="90" dst="95">
-               <link_ctn id="link118"/>
-       </route>
-       <route src="91" dst="93">
-               <link_ctn id="link119"/>
-       </route>
-       <route src="92" dst="92">
-               <link_ctn id="link120"/>
-       </route>
-       <route src="92" dst="93">
-               <link_ctn id="link121"/>
-       </route>
-       <route src="94" dst="94">
-               <link_ctn id="link122"/>
-       </route>
-       <route src="94" dst="95">
-               <link_ctn id="link123"/>
-       </route>
-       <route src="96" dst="96">
-               <link_ctn id="link124"/>
-       </route>
-       <route src="96" dst="97">
-               <link_ctn id="link125"/>
-       </route>
-       <route src="96" dst="98">
-               <link_ctn id="link126"/>
-       </route>
-</AS>
-</platform> 
index d2db4d9..7f9e93f 100644 (file)
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 
-# Copyright (c) 2011, 2014. The SimGrid Team.
+# Copyright (c) 2011, 2014, 2016. The SimGrid Team.
 # All rights reserved.
 
 # This program is free software; you can redistribute it and/or modify it
@@ -17,10 +17,21 @@ my($conf_file)=$ARGV[0];
 
 open FILE, $conf_file or die "Unable to open $conf_file";
 
+print "<!-- This platform was automatically converted from the OptorSim platform.\n";
+print "\n";
+print "  OptorSim files only describes information of the cluster interconnexion.\n";
+print "  In a sense, it reflects the topology of a National Research and Education\n";
+print "  Network (NREN), but not of a full-fledged computational platform.\n";
+print "  The caracteristics of each cluster have been artificially added.\n";
+print "\n";
+print "  We hope that you find it useful anyway. If you know how to complete\n";
+print "  this information with data on the cluster configurations, please\n";
+print "  drop us a mail so that we can add this information. -->\n\n";
+
 print "<?xml version='1.0'?>\n";
 print "<!DOCTYPE platform SYSTEM \"http://simgrid.gforge.inria.fr/simgrid.dtd\">\n";
 print "<platform version=\"3\">\n";
-print "<AS  id=\"AS0\"  routing=\"Floyd\">\n";
+print "<AS id=\"AS0\" routing=\"Floyd\">\n";
 
 my $line;
 my @tokens;
@@ -39,134 +50,130 @@ my @routes = ();
 my @routes_router = ();
 my @routes_cluster = ();
 my $nb_host;
-while(defined($line=<FILE>))
-{
-       
-if($line =~ /^#(.*)\)(.*)$/)
-{
+while(defined($line=<FILE>)){
+    if($line =~ /^#(.*)\)(.*)$/)
+    {
        print "<!--$1 $2-->\n";
        push @list_of_name, $2;
-}
-elsif($line =~ /^([0-9]*) ([0-9]*) ([0-9]*) (.*)$/)
-{
+    }
+    elsif($line =~ /^([0-9]*) ([0-9]*) ([0-9]*) (.*)$/)
+    {
        if($1 == "0"){
-               push @is_router, 1;
-               if(@list_of_name){
-                       push @routers, "\t\t<router id=\"$list_of_name[$src]\"/>\n";
-               }
-               else{
-                       push @routers, "\t\t<router id=\"router$src\"/>\n";
-               }
+           push @is_router, 1;
+           if(@list_of_name){
+               push @routers, "    <router id=\"$list_of_name[$src]\"/>\n";
+           }
+           else{
+               push @routers, "    <router id=\"router$src\"/>\n";
+           }
        }
        else{
-               push @is_router, 0;
-               $nb_host = $1;
-               if(@list_of_name){
-                       push @hosts, "\t<cluster id=\"$list_of_name[$src]\" prefix=\"$list_of_name[$src]-\" suffix=\"\"\n";
-                       push @hosts, "\t         radical=\"1-$nb_host\" power=\"1000000000\"    bw=\"125000000\"     lat=\"5E-5\"\n";
-                       push @hosts, "\t         router_id=\"$list_of_name[$src]-router\"/>\n";
-               }
-               else{
-                       push @hosts, "\t<cluster id=\"cluster$src\" prefix=\"$list_of_name[$src]-\" suffix=\"\"\n";
-                       push @hosts, "\t         radical=\"1-$nb_host\" power=\"1000000000\"    bw=\"125000000\"     lat=\"5E-5\"\n";
-                       push @hosts, "\t         router_id=\"cluster$src-router\"/>\n";
-               }
+           push @is_router, 0;
+           $nb_host = $1;
+           if(@list_of_name){
+               push @hosts, "  <cluster id=\"$list_of_name[$src]\" prefix=\"$list_of_name[$src]-\" suffix=\"\"\n";
+               push @hosts, "           radical=\"1-$nb_host\" power=\"1000000000\" bw=\"125000000\" lat=\"5E-5\"\n";
+               push @hosts, "           router_id=\"$list_of_name[$src]-router\"/>\n";
+           }
+           else{
+               push @hosts, "  <cluster id=\"cluster$src\" prefix=\"$src-\" suffix=\"\"\n";
+               push @hosts, "           radical=\"1-$nb_host\" power=\"1000000000\" bw=\"125000000\" lat=\"5E-5\"\n";
+               push @hosts, "           router_id=\"cluster$src-router\"/>\n";
+           }
        }               
        my $table = $4;
        @tokens = split(/ /,$table);
        foreach $token (@tokens) {
-               if($src >= $dst){
-                       if($token != "0") #if there is a link between src and dst
-                       {       
-                               #Create a link                          
-                               if($1 == "0"){ 
-                                       push @links_router, "\t\t<link id=\"link$num_link\" bandwidth=\"$token\"/>\n";
-                               }
-                               else{
-                                       push @links, "\t<link id=\"link$num_link\" bandwidth=\"$token\"/>\n";
-                               }
-
-                               #Create the route between router and router
-                               if($is_router[$src] && $is_router[$dst]) 
-                               {
-                                       if(@list_of_name){
-                                               push @routes_router, "\t\t<route src=\"$list_of_name[$src]\" dst=\"$list_of_name[$dst]\">\n";
-                                       }
-                                       else{
-                                               push @routes_router, "\t\t<route src=\"router$src\" dst=\"router$dst\">\n";
-                                       }
-                                       push @routes_router, "\t\t\t<link_ctn id=\"link$num_link\"/>\n";
-                                       push @routes_router, "\t\t</route>\n";
-                               }
-
-                               #Create the route between cluster and cluster
-                               elsif(!$is_router[$src] && !$is_router[$dst]) 
-                               {
-                                       if(@list_of_name){
-                                       push @routes_cluster, "\t\t<ASroute src=\"$list_of_name[$src]\" dst=\"$list_of_name[$dst]\"\n";
-                                       push @routes_cluster, "\t\t     gw_src=\"$list_of_name[$src]-router\" gw_dst=\"$list_of_name[$dst]-router\">\n";
-                                       }
-                                       else{
-                                       push @routes_cluster, "\t\t<ASroute src=\"cluster$src\" dst=\"cluster$dst\"\n";
-                                       push @routes_cluster, "\t\t    gw_src=\"cluster$src-router\" dst=\"cluster$dst-router\">\n";
-                                       }
-                                       push @routes_cluster, "\t\t\t<link_ctn id=\"link$num_link\"/>\n";
-                                       push @routes_cluster, "\t\t</ASroute>\n";
-                               }                               
-                               else
-                               {
-                                       push @routes, "\t<ASroute ";
-                                       if(@list_of_name){
-                                               if($is_router[$src])    #router
-                                                       {push @routes, "src=\"AS_intern\" gw_src=\"$list_of_name[$src]\"\n";}
-                                               else                    #cluster
-                                                       {push @routes, "src=\"$list_of_name[$src]\" gw_src=\"$list_of_name[$src]-router\"\n";}
-
-
-                                               if($is_router[$dst])    #router
-                                                       {push @routes, "\t\tdst=\"AS_intern\" gw_dst=\"$list_of_name[$dst]\">\n";}
-                                               else                    #cluster
-                                                       {push @routes, "\t\tdst=\"$list_of_name[$dst]\" gw_dst=\"$list_of_name[$dst]-router\">\n";}
-                                       }
-                                       else{
-                                               if($is_router[$src])    #router
-                                                       {push @routes, "src=\"AS_intern\" gw_src=\"router$src\"\n";}
-                                               else                    #cluster
-                                                       {push @routes, "src=\"cluster$src\" gw_src=\"cluster$src-router\"\n";}
-
-
-                                               if($is_router[$dst])    #router
-                                                       {push @routes, "\t\tdst=\"AS_intern\" gw_dst=\"router$dst\">\n";}
-                                               else                    #cluster
-                                                       {push @routes, "\t\tdst=\"cluster$dst\" gw_dst=\"cluster$dst-router\">\n";}
-                                       }
-                                       push @routes, "\t\t<link_ctn id=\"link$num_link\"/>\n";
-                                       push @routes, "\t</ASroute>\n";
-
-                               }
-
-                               $num_link++;    
+           if($src >= $dst){
+               if($token != "0") #if there is a link between src and dst
+               {       
+                   #Create a link                              
+                   if($1 == "0"){ 
+                       push @links_router, "    <link id=\"link$num_link\" bandwidth=\"$token\"/>\n";
+                   }
+                   else{
+                       push @links, "  <link id=\"link$num_link\" bandwidth=\"$token\"/>\n";
+                   }
+                   
+                   #Create the route between router and router
+                   if($is_router[$src] && $is_router[$dst]) 
+                   {
+                       if(@list_of_name){
+                           push @routes_router, "    <route src=\"$list_of_name[$src]\" dst=\"$list_of_name[$dst]\">";
+                       }
+                       else{
+                           push @routes_router, "    <route src=\"router$src\" dst=\"router$dst\">";
+                       }
+                       push @routes_router, " <link_ctn id=\"link$num_link\"/>";
+                       push @routes_router, " </route>\n";
+                   }
+                   
+                   #Create the route between cluster and cluster
+                   elsif(!$is_router[$src] && !$is_router[$dst]) 
+                   {
+                       if(@list_of_name){
+                           push @routes_cluster, "    <ASroute src=\"$list_of_name[$src]\" dst=\"$list_of_name[$dst]\"";
+                           push @routes_cluster, " gw_src=\"$list_of_name[$src]-router\" gw_dst=\"$list_of_name[$dst]-router\">\n";
+                       }
+                       else{
+                           push @routes_cluster, "    <ASroute src=\"cluster$src\" dst=\"cluster$dst\"";
+                           push @routes_cluster, " gw_src=\"cluster$src-router\" dst=\"cluster$dst-router\">\n";
+                       }
+                       push @routes_cluster, "      <link_ctn id=\"link$num_link\"/>\n";
+                       push @routes_cluster, "    </ASroute>\n";
+                   }                           
+                   else
+                   {
+                       push @routes, "  <ASroute ";
+                       if(@list_of_name){
+                           if($is_router[$src])        #router
+                           {push @routes, "src=\"AS_intern\" gw_src=\"$list_of_name[$src]\" ";}
+                           else                        #cluster
+                           {push @routes, "src=\"$list_of_name[$src]\" gw_src=\"$list_of_name[$src]-router\" ";}
+                           
+                           
+                           if($is_router[$dst])        #router
+                           {push @routes, "dst=\"AS_intern\" gw_dst=\"$list_of_name[$dst]\">\n";}
+                           else                        #cluster
+                           {push @routes, "dst=\"$list_of_name[$dst]\" gw_dst=\"$list_of_name[$dst]-router\">\n";}
                        }
+                       else{
+                           if($is_router[$src])        #router
+                           {push @routes, "src=\"AS_intern\" gw_src=\"router$src\" ";}
+                           else                        #cluster
+                           {push @routes, "src=\"cluster$src\" gw_src=\"cluster$src-router\" ";}
+                           
+                           
+                           if($is_router[$dst])        #router
+                           {push @routes, "dst=\"AS_intern\" gw_dst=\"router$dst\">\n";}
+                           else                        #cluster
+                           {push @routes, "dst=\"cluster$dst\" gw_dst=\"cluster$dst-router\">\n";}
+                       }
+                       push @routes, "    <link_ctn id=\"link$num_link\"/>\n";
+                       push @routes, "  </ASroute>\n";
+                       
+                   }
+                   
+                   $num_link++;        
                }
-               $dst++;
+           }
+           $dst++;
        }
        $src++;
        $dst = 0;
-}
-else
-{
-die;
-}
-       
-       
+    }
+    else
+    {
+       die;
+    }
 }
 close(FILE);
 
-print "\t<AS  id=\"AS_intern\"  routing=\"Floyd\">\n";
+print "  <AS id=\"AS_intern\" routing=\"Floyd\">\n";
 print @routers;
 print @links_router;
 print @routes_router;
-print "\t</AS>\n";
+print "  </AS>\n";
 print "\n";    
 print @hosts;
 print @routes_cluster;
@@ -175,9 +182,6 @@ print "\n";
 print @links;
 print "\n";
 print @routes;
-print "\n";
-
 print "</AS>\n";
 print "</platform>";
-
 print " \n";
index e4926ca..8f72c97 100644 (file)
@@ -1240,9 +1240,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/clusters_routing_full.xml
   examples/platforms/crosstraffic.xml
   examples/platforms/conf/gridpp_grid_2004.conf
-  examples/platforms/conf/gridpp_grid_2004.xml
   examples/platforms/conf/lcg_sept2004_grid.conf
-  examples/platforms/conf/lcg_sept2004_grid.xml
   examples/platforms/conf/transform_optorsim_platform.pl
   examples/platforms/config.xml
   examples/platforms/config_tracing.xml