From: Martin Quinson Date: Mon, 17 Sep 2018 22:16:46 +0000 (+0200) Subject: docs: prefer svg to png, and inclusion to copy/paste X-Git-Tag: v3_21~95 X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a6e4771564d3d041955f630ce71e6123a911ce78 docs: prefer svg to png, and inclusion to copy/paste --- diff --git a/docs/source/tuto_smpi.rst b/docs/source/tuto_smpi.rst index 4599f92040..18b5d9adb7 100644 --- a/docs/source/tuto_smpi.rst +++ b/docs/source/tuto_smpi.rst @@ -61,9 +61,8 @@ to predict the time taken by each communications. Any computations occuring between two MPI calls are benchmarked, and the corresponding time is reported into the simulator. -.. image:: /tuto_smpi/img/big-picture.png - :align: center - +.. image:: /tuto_smpi/img/big-picture.svg + :align: center Describing Your Platform ------------------------ @@ -85,30 +84,30 @@ graph of hosts and network links. For instance: .. image:: /tuto_smpi/img/3hosts.png :align: center -.. hidden-code-block:: xml - :starthidden: True - :label: See the XML platform description file... - - - - - - - - - - - - - - - - - -In this XML, note the way in which hosts, links, and routes are -defined. All hosts are defined with a power (i.e., compute speed in -Gflops), and links with a latency (in us) and bandwidth (in MBytes per -second). Other units are possible and written as expected. By default, -routes are symmetrical. +.. literalinclude:: /tuto_smpi/3hosts.xml + :language: xml + +Note the way in which hosts, links, and routes are defined in +this XML. All hosts are defined with a speed (in Gflops), and links +with a latency (in us) and bandwidth (in MBytes per second). Other +units are possible and written as expected. Routes specify the list of +links encountered from one route to another. Routes are symmetrical by +default. + +Cluster with a Crossbar +^^^^^^^^^^^^^^^^^^^^^^^ + +A very common parallel computing platform is a homogeneous cluster in +which hosts are interconnected via a crossbar switch with as many +ports as hosts, so that any disjoint pairs of hosts can communicate +concurrently at full speed. For instance: + +Cluster with a Shared Backbone +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Another popular model for a parallel platform is that of a set of +homogeneous hosts connected to a shared communication medium, a +backbone, with some finite bandwidth capacity and on which +communicating host pairs can experience contention. For instance: .. LocalWords: SimGrid diff --git a/docs/source/tuto_smpi/img/big-picture.png b/docs/source/tuto_smpi/img/big-picture.png deleted file mode 100644 index d51189a128..0000000000 Binary files a/docs/source/tuto_smpi/img/big-picture.png and /dev/null differ diff --git a/docs/source/tuto_smpi/img/big-picture.svg b/docs/source/tuto_smpi/img/big-picture.svg index 6ee76a9515..5d219647df 100644 --- a/docs/source/tuto_smpi/img/big-picture.svg +++ b/docs/source/tuto_smpi/img/big-picture.svg @@ -13,9 +13,9 @@ version="1.1" id="svg2" xml:space="preserve" - width="565.80103" - height="299.24734" - viewBox="0 0 565.80104 299.24735" + width="465.43008" + height="242.93895" + viewBox="0 0 465.4301 242.93896" sodipodi:docname="big-picture.svg" inkscape:version="0.92.3 (2405546, 2018-03-11)" inkscape:export-filename="/home/mquinson/Code/simgrid/docs/source/tuto_smpi/img/big-picture.png" @@ -25,167 +25,176 @@ rdf:about="">image/svg+xml + + + + + + + + + + transform="matrix(1.3333333,0,0,-1.3333333,116.57887,243.09502)"> -host 2 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.00000191px;line-height:18.75px;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.02902877px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve">host 2 host 3 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.00000191px;line-height:18.75px;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.02902877px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve">host 3 host 0 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.00000191px;line-height:18.75px;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.02902877px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve">host 0 host 1 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.00000191px;line-height:18.75px;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.02902877px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve">host 1 Network -Network +rank 2 rank 3 rank 0 + style="opacity:1;fill:#ffffff;fill-opacity:0.75444839;stroke:#000000;stroke-width:1.37203836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />rank 0 rank 1 + style="opacity:1;fill:#ffffff;fill-opacity:0.75444839;stroke:#000000;stroke-width:1.37203836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />rank 1 single UNIX process + x="109.23109" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.00000191px;line-height:18.75px;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.02902877px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve">single UNIX process Simulated Network rank 0 + style="opacity:1;fill:none;fill-opacity:0.75444839;stroke:#0f85d1;stroke-width:0.96042693;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />rank 0 rank 1 + style="opacity:1;fill:none;fill-opacity:0.75444839;stroke:#0f85d1;stroke-width:1.0306493;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />rank 1 rank 2 + style="opacity:1;fill:none;fill-opacity:0.75444839;stroke:#0f85d1;stroke-width:1.0306493;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />rank 2 rank 3 + style="opacity:1;fill:none;fill-opacity:0.75444839;stroke:#0f85d1;stroke-width:1.0306493;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />rank 3 Real Settings + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;line-height:18.75px;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#3333b3;fill-opacity:1;stroke:none;stroke-width:1.02902877px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve">Real Settings SimGrid Simulation + x="198.50871" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;line-height:18.75px;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#3333b3;fill-opacity:1;stroke:none;stroke-width:1.02902877px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve">SimGrid Simulation + \ No newline at end of file