From: Frederic Suter Date: Tue, 31 May 2016 21:09:14 +0000 (+0200) Subject: kurgan said "there can be only one" X-Git-Tag: v3_14~1080 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9afacaa6e6084b2adf430f647ea64f13f47877b3 kurgan said "there can be only one" it works for "2-clusters platforms" too --- diff --git a/examples/platforms/2clusters.xml b/examples/platforms/2clusters.xml deleted file mode 100644 index d12b59cca7..0000000000 --- a/examples/platforms/2clusters.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/platforms/clusters_routing_full.xml b/examples/platforms/two_clusters.xml similarity index 93% rename from examples/platforms/clusters_routing_full.xml rename to examples/platforms/two_clusters.xml index 6e897bd44e..d26bc29bdf 100644 --- a/examples/platforms/clusters_routing_full.xml +++ b/examples/platforms/two_clusters.xml @@ -10,7 +10,7 @@ l0| l1| l2| l7| l8| |l9 | | | | ........ | | | | | | | - c-0.me c-9.me | +node-0.acme.org node-9.acme.org | __________________________________________| ___|______ | | @@ -20,7 +20,7 @@ l10|l11|l12| l17| l18 | | l19 | | | ........ | | | | | - c-10.me c-19.me --> +node-10.acme.org node-19.acme.org --> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [test/INFO] ------------------- Display all tasks of the loaded DAG --------------------------- > [0.000000] [sd_task/INFO] Displaying task root @@ -186,35 +186,35 @@ $ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:= > [0.000000] [sd_task/INFO] 9 > [0.000000] [test/INFO] ------------------- Schedule tasks --------------------------- > [0.000000] [test/INFO] ------------------- Run the schedule --------------------------- -> [62.002281] [test/INFO] ------------------- Produce the trace file--------------------------- -> [62.002281] [test/INFO] Producing the trace of the run into dag.trace +> [110.006082] [test/INFO] ------------------- Produce the trace file--------------------------- +> [110.006082] [test/INFO] Producing the trace of the run into dag.trace $ cat ${srcdir:=.}/dag-dotload/dag.trace -> [0.000000->0.000000] C2-05 compute 0.000000 flops # root -> [0.000000->2.000000] C2-06 compute 10000000129.452715 flops # 0 -> [2.000380->4.000380] C2-07 compute 10000000131.133657 flops # 1 -> [4.000760->6.000760] C2-08 compute 10000000121.124870 flops # 2 -> [6.001140->8.001140] C2-09 compute 10000000230.608025 flops # 3 -> [8.001140->18.001140] C1-00 compute 10000000004.994019 flops # 4 -> [18.001520->28.001520] C1-01 compute 10000000046.016401 flops # 5 -> [28.001520->38.001521] C1-02 compute 10000000091.598791 flops # 6 -> [38.001901->48.001901] C1-03 compute 10000000040.679438 flops # 7 -> [48.002281->58.002281] C1-04 compute 10000000250.490017 flops # 8 -> [58.002281->60.002281] C2-05 compute 10000000079.267649 flops # 9 -> [2.000000 -> 2.000380] C2-06 -> C2-07 transfer of 10001 bytes # 0->1 -> [4.000380 -> 4.000760] C2-07 -> C2-08 transfer of 10004 bytes # 1->2 -> [6.000760 -> 6.001140] C2-08 -> C2-09 transfer of 10002 bytes # 2->3 -> [18.001140 -> 18.001520] C1-00 -> C1-01 transfer of 10029 bytes # 4->5 -> [38.001521 -> 38.001901] C1-02 -> C1-03 transfer of 10005 bytes # 6->7 -> [48.001901 -> 48.002281] C1-03 -> C1-04 transfer of 10000 bytes # 7->8 -> [48.001901 -> 48.294118] C1-03 -> C2-05 transfer of 10014000 bytes # 7->end -> [0.000000 -> 0.292217] C2-05 -> C1-01 transfer of 10014000 bytes # root->5 -> [60.002281->62.002281] C2-05 compute 10000000129.452715 flops # end +> [0.000000->0.000000] node-3.acme.org compute 0.000000 flops # root +> [0.000000->10.000000] node-7.acme.org compute 10000000129.452715 flops # 0 +> [10.001680->20.001680] node-10.acme.org compute 10000000131.133657 flops # 1 +> [20.002360->30.002360] node-14.acme.org compute 10000000121.124870 flops # 2 +> [30.003040->40.003041] node-18.acme.org compute 10000000230.608025 flops # 3 +> [40.003041->50.003041] node-0.acme.org compute 10000000004.994019 flops # 4 +> [50.003721->60.003721] node-4.acme.org compute 10000000046.016401 flops # 5 +> [60.003721->70.003721] node-8.acme.org compute 10000000091.598791 flops # 6 +> [70.005401->80.005401] node-11.acme.org compute 10000000040.679438 flops # 7 +> [80.006081->90.006081] node-15.acme.org compute 10000000250.490017 flops # 8 +> [90.006081->100.006081] node-19.acme.org compute 10000000079.267649 flops # 9 +> [10.000000 -> 10.001680] node-7.acme.org -> node-10.acme.org transfer of 10001 bytes # 0->1 +> [20.001680 -> 20.002360] node-10.acme.org -> node-14.acme.org transfer of 10004 bytes # 1->2 +> [30.002360 -> 30.003040] node-14.acme.org -> node-18.acme.org transfer of 10002 bytes # 2->3 +> [50.003041 -> 50.003721] node-0.acme.org -> node-4.acme.org transfer of 10029 bytes # 4->5 +> [70.003721 -> 70.005401] node-8.acme.org -> node-11.acme.org transfer of 10005 bytes # 6->7 +> [80.005401 -> 80.006081] node-11.acme.org -> node-15.acme.org transfer of 10000 bytes # 7->8 +> [80.005401 -> 80.087113] node-11.acme.org -> node-3.acme.org transfer of 10014000 bytes # 7->end +> [0.000000 -> 0.080712] node-3.acme.org -> node-4.acme.org transfer of 10014000 bytes # root->5 +> [100.006081->110.006082] node-3.acme.org compute 10000000129.452715 flops # end $ rm -f ${srcdir:=.}/dag-dotload/dag.trace ${srcdir:=.}/dot.dot ! expect return 2 -$ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=.}/../platforms/2clusters.xml ${srcdir:=.}/dag-dotload/dag_with_cycle.dot +$ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=.}/../platforms/two_clusters.xml ${srcdir:=.}/dag-dotload/dag_with_cycle.dot > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [sd_daxparse/WARNING] the task root is not marked > [0.000000] [sd_daxparse/WARNING] the task 0 is in a cycle diff --git a/examples/simdag/daxload/sd_daxload.tesh b/examples/simdag/daxload/sd_daxload.tesh index badc49b1c2..fbb6c252ff 100644 --- a/examples/simdag/daxload/sd_daxload.tesh +++ b/examples/simdag/daxload/sd_daxload.tesh @@ -1,7 +1,7 @@ #! ./tesh p Test the DAX loader on a small DAX instance -$ $SG_TEST_EXENV ${bindir:=.}/daxload/sd_daxload --log=no_loc ${srcdir:=.}/../platforms/2clusters.xml ${srcdir:=.}/daxload/smalldax.xml +$ $SG_TEST_EXENV ${bindir:=.}/daxload/sd_daxload --log=no_loc ${srcdir:=.}/../platforms/two_clusters.xml ${srcdir:=.}/daxload/smalldax.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [sd_daxparse/WARNING] Ignore file o1 size redefinition from 1000000 to 304 > [0.000000] [sd_daxparse/WARNING] Ignore file o2 size redefinition from 1000000 to 304 @@ -100,32 +100,32 @@ $ $SG_TEST_EXENV ${bindir:=.}/daxload/sd_daxload --log=no_loc ${srcdir:=.}/../pl > [0.000000] [sd_task/INFO] 3@task1_o3_end > [0.000000] [test/INFO] ------------------- Schedule tasks --------------------------- > [0.000000] [test/INFO] ------------------- Run the schedule --------------------------- -> [84.066238] [test/INFO] ------------------- Produce the trace file--------------------------- -> [84.066238] [test/INFO] Producing the trace of the run into smalldax.trace +> [84.068138] [test/INFO] ------------------- Produce the trace file--------------------------- +> [84.068138] [test/INFO] Producing the trace of the run into smalldax.trace $ cat ${srcdir:=.}/daxload/smalldax.trace -> [0.000000] C1-00 compute 0.000000 # root -> [0.016300] C1-01 compute 42000000000.000000 # 1@task1 -> [0.016300] C1-02 compute 42000000000.000000 # 2@task2 -> [42.032600] C1-03 compute 42000000000.000000 # 3@task1 -> [0.000000] C1-00 send C1-02 1000000.000000 # root_i2_2@task2 -> [0.016300] C1-02 recv C1-00 1000000.000000 # root_i2_2@task2 -> [42.016300] C1-01 send C1-03 1000000.000000 # 1@task1_o1_3@task1 -> [42.032600] C1-03 recv C1-01 1000000.000000 # 1@task1_o1_3@task1 -> [42.016300] C1-02 send C1-03 1000000.000000 # 2@task2_o2_3@task1 -> [42.032600] C1-03 recv C1-02 1000000.000000 # 2@task2_o2_3@task1 -> [84.032600] C1-03 send C1-00 4167312.000000 # 3@task1_o3_end -> [84.066238] C1-00 recv C1-03 4167312.000000 # 3@task1_o3_end -> [0.000000] C1-00 send C1-01 1000000.000000 # root_i1_1@task1 -> [0.016300] C1-01 recv C1-00 1000000.000000 # root_i1_1@task1 -> [84.066238] C1-00 compute 0.000000 # end +> [0.000000] node-0.acme.org compute 0.000000 # root +> [0.015600] node-1.acme.org compute 42000000000.000000 # 1@task1 +> [0.016600] node-10.acme.org compute 42000000000.000000 # 2@task2 +> [42.033200] node-11.acme.org compute 42000000000.000000 # 3@task1 +> [0.000000] node-0.acme.org send node-10.acme.org 1000000.000000 # root_i2_2@task2 +> [0.016600] node-10.acme.org recv node-0.acme.org 1000000.000000 # root_i2_2@task2 +> [42.015600] node-1.acme.org send node-11.acme.org 1000000.000000 # 1@task1_o1_3@task1 +> [42.033200] node-11.acme.org recv node-1.acme.org 1000000.000000 # 1@task1_o1_3@task1 +> [42.016600] node-10.acme.org send node-11.acme.org 1000000.000000 # 2@task2_o2_3@task1 +> [42.033200] node-11.acme.org recv node-10.acme.org 1000000.000000 # 2@task2_o2_3@task1 +> [84.033200] node-11.acme.org send node-0.acme.org 4167312.000000 # 3@task1_o3_end +> [84.068138] node-0.acme.org recv node-11.acme.org 4167312.000000 # 3@task1_o3_end +> [0.000000] node-0.acme.org send node-1.acme.org 1000000.000000 # root_i1_1@task1 +> [0.015600] node-1.acme.org recv node-0.acme.org 1000000.000000 # root_i1_1@task1 +> [84.068138] node-0.acme.org compute 0.000000 # end $ cmake -E remove -f ${srcdir:=.}/dax.dot ${srcdir:=.}/daxload/smalldax.trace p Test the DAX loader with a DAX comprising a cycle. ! expect return 255 -$ $SG_TEST_EXENV ${bindir:=.}/daxload/sd_daxload --log=no_loc ${srcdir:=.}/../platforms/2clusters.xml ${srcdir:=.}/daxload/simple_dax_with_cycle.xml +$ $SG_TEST_EXENV ${bindir:=.}/daxload/sd_daxload --log=no_loc ${srcdir:=.}/../platforms/two_clusters.xml ${srcdir:=.}/daxload/simple_dax_with_cycle.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [sd_daxparse/WARNING] the task root is not marked > [0.000000] [sd_daxparse/WARNING] the task 1@task1 is in a cycle diff --git a/examples/simdag/ptg-dotload/sd_ptg-dotload.tesh b/examples/simdag/ptg-dotload/sd_ptg-dotload.tesh index 2a33eafe93..116eef3ef2 100644 --- a/examples/simdag/ptg-dotload/sd_ptg-dotload.tesh +++ b/examples/simdag/ptg-dotload/sd_ptg-dotload.tesh @@ -1,7 +1,7 @@ #! ./tesh p Test the loader of PTG (Parallel Task Graph) written in the DOT format -$ $SG_TEST_EXENV ${bindir:=.}/ptg-dotload/sd_ptg-dotload ${srcdir:=.}/../platforms/2clusters.xml ${srcdir:=.}/ptg-dotload/ptg.dot +$ $SG_TEST_EXENV ${bindir:=.}/ptg-dotload/sd_ptg-dotload ${srcdir:=.}/../platforms/two_clusters.xml ${srcdir:=.}/ptg-dotload/ptg.dot > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [test/INFO] ------------------- Display all tasks of the loaded DAG --------------------------- > [0.000000] [sd_task/INFO] Displaying task root @@ -90,4 +90,5 @@ $ $SG_TEST_EXENV ${bindir:=.}/ptg-dotload/sd_ptg-dotload ${srcdir:=.}/../platfo > [0.000000] [sd_task/INFO] c3->end > [0.000000] [test/INFO] ------------------- Schedule tasks --------------------------- > [0.000000] [test/INFO] ------------------- Run the schedule --------------------------- -> [3.290271] [test/INFO] Makespan: 3.290271 +> [3.126200] [test/INFO] Makespan: 3.126200 + diff --git a/examples/simdag/schedule-dotload/sd_schedule-dotload.tesh b/examples/simdag/schedule-dotload/sd_schedule-dotload.tesh index 9ac46d239e..b59adcbe61 100644 --- a/examples/simdag/schedule-dotload/sd_schedule-dotload.tesh +++ b/examples/simdag/schedule-dotload/sd_schedule-dotload.tesh @@ -2,7 +2,7 @@ p Test the loader of DAG written in the DOT format ! expect return 2 -$ $SG_TEST_EXENV ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc "--log=sd_dotparse.thres:verbose" ${srcdir:=.}/../platforms/2clusters.xml ${srcdir:=.}/schedule-dotload/dag_with_bad_schedule.dot +$ $SG_TEST_EXENV ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc "--log=sd_dotparse.thres:verbose" ${srcdir:=.}/../platforms/two_clusters.xml ${srcdir:=.}/schedule-dotload/dag_with_bad_schedule.dot > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [sd_dotparse/VERBOSE] The schedule is ignored, task 'end' can not be scheduled on -1 hosts > [0.000000] [sd_dotparse/VERBOSE] The schedule is ignored, task '1' can not be scheduled on 0 hosts @@ -12,7 +12,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc > [0.000000] [sd_dotparse/WARNING] The scheduling is ignored > [0.000000] [test/CRITICAL] The dot file with the provided scheduling is wrong, more information with the option : --log=sd_dotparse.thres:verbose -$ $SG_TEST_EXENV ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc ${srcdir:=.}/../platforms/2clusters.xml ${srcdir:=.}/schedule-dotload/dag_with_good_schedule.dot +$ $SG_TEST_EXENV ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc ${srcdir:=.}/../platforms/two_clusters.xml ${srcdir:=.}/schedule-dotload/dag_with_good_schedule.dot > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [test/INFO] ------------------- Display all tasks of the loaded DAG --------------------------- > [0.000000] [sd_task/INFO] Displaying task root @@ -212,30 +212,30 @@ $ $SG_TEST_EXENV ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc > [0.000000] [sd_task/INFO] 9 > [0.000000] [sd_task/INFO] 7 > [0.000000] [test/INFO] ------------------- Run the schedule --------------------------- -> [20.000866] [test/INFO] ------------------- Produce the trace file--------------------------- -> [20.000866] [test/INFO] Producing the trace of the run into dag_with_good_schedule.trace +> [100.003561] [test/INFO] ------------------- Produce the trace file--------------------------- +> [100.003561] [test/INFO] Producing the trace of the run into dag_with_good_schedule.trace $ cat ${srcdir:=.}/schedule-dotload/dag_with_good_schedule.trace -> [0.000000->0.000000] C2-05 compute 0.000000 flops # root -> [0.000000->2.000000] C2-06 compute 10000000129.452715 flops # 0 -> [0.000000->2.000000] C2-05 compute 10000000131.133657 flops # 1 -> [2.000380->4.000380] C2-06 compute 10000000121.124870 flops # 2 -> [4.000415->6.000415] C2-06 compute 10000000230.608025 flops # 3 -> [6.000415->8.000415] C2-05 compute 10000000004.994019 flops # 4 -> [8.000450->10.000450] C2-05 compute 10000000046.016401 flops # 5 -> [10.000450->12.000450] C2-05 compute 10000000091.598791 flops # 6 -> [12.000485->14.000485] C2-05 compute 10000000040.679438 flops # 7 -> [14.000865->16.000866] C2-06 compute 10000000250.490017 flops # 8 -> [16.000866->18.000866] C2-06 compute 10000000079.267649 flops # 9 -> [0.000000 -> 0.020123] C2-05 -> C2-05 transfer of 10014000 bytes # root->5 -> [2.000000 -> 2.000035] C2-06 -> C2-06 transfer of 10001 bytes # 0->2 -> [2.000000 -> 2.000380] C2-05 -> C2-06 transfer of 10004 bytes # 1->2 -> [4.000380 -> 4.000415] C2-06 -> C2-06 transfer of 10002 bytes # 2->3 -> [8.000415 -> 8.000450] C2-05 -> C2-05 transfer of 10029 bytes # 4->5 -> [12.000450 -> 12.000485] C2-05 -> C2-05 transfer of 10005 bytes # 6->7 -> [14.000485 -> 14.000865] C2-05 -> C2-06 transfer of 10000 bytes # 7->8 -> [14.000485 -> 14.020609] C2-05 -> C2-05 transfer of 10014000 bytes # 7->end -> [18.000866->20.000866] C2-05 compute 10000000129.452715 flops # end +> [0.000000->0.000000] node-3.acme.org compute 0.000000 flops # root +> [0.000000->10.000000] node-7.acme.org compute 10000000129.452715 flops # 0 +> [0.000000->10.000000] node-3.acme.org compute 10000000131.133657 flops # 1 +> [10.000760->20.000760] node-7.acme.org compute 10000000121.124870 flops # 2 +> [20.001440->30.001441] node-7.acme.org compute 10000000230.608025 flops # 3 +> [30.001441->40.001441] node-3.acme.org compute 10000000004.994019 flops # 4 +> [40.002121->50.002121] node-3.acme.org compute 10000000046.016401 flops # 5 +> [50.002121->60.002121] node-3.acme.org compute 10000000091.598791 flops # 6 +> [60.002801->70.002801] node-3.acme.org compute 10000000040.679438 flops # 7 +> [70.003561->80.003561] node-7.acme.org compute 10000000250.490017 flops # 8 +> [80.003561->90.003561] node-7.acme.org compute 10000000079.267649 flops # 9 +> [0.000000 -> 0.080712] node-3.acme.org -> node-3.acme.org transfer of 10014000 bytes # root->5 +> [10.000000 -> 10.000760] node-7.acme.org -> node-7.acme.org transfer of 10001 bytes # 0->2 +> [10.000000 -> 10.000760] node-3.acme.org -> node-7.acme.org transfer of 10004 bytes # 1->2 +> [20.000760 -> 20.001440] node-7.acme.org -> node-7.acme.org transfer of 10002 bytes # 2->3 +> [40.001441 -> 40.002121] node-3.acme.org -> node-3.acme.org transfer of 10029 bytes # 4->5 +> [60.002121 -> 60.002801] node-3.acme.org -> node-3.acme.org transfer of 10005 bytes # 6->7 +> [70.002801 -> 70.003561] node-3.acme.org -> node-7.acme.org transfer of 10000 bytes # 7->8 +> [70.002801 -> 70.083593] node-3.acme.org -> node-3.acme.org transfer of 10014000 bytes # 7->end +> [90.003561->100.003561] node-3.acme.org compute 10000000129.452715 flops # end $ rm -f ${srcdir:=.}/schedule-dotload/dag_with_good_schedule.trace diff --git a/examples/simdag/throttling/sd_throttling.tesh b/examples/simdag/throttling/sd_throttling.tesh index aeffa60916..bd795051dd 100644 --- a/examples/simdag/throttling/sd_throttling.tesh +++ b/examples/simdag/throttling/sd_throttling.tesh @@ -1,14 +1,13 @@ #! ./tesh p Modify the rate of communication tasks even when they are auto-scheduled -$ $SG_TEST_EXENV ./throttling/sd_throttling --cfg=network/TCP-gamma:4194304 ${srcdir:=.}/../platforms/2clusters.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' +$ $SG_TEST_EXENV ./throttling/sd_throttling ${srcdir:=.}/../platforms/two_clusters.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. -> [1.000000] [sd_comm_throttling/INFO] Simulation stopped after 1.0000 seconds -> [1.000000] [sd_comm_throttling/INFO] Task 'Task A' start time: 0.000000, finish time: 1.000000 -> [2.080300] [sd_comm_throttling/INFO] Simulation stopped after 2.0803 seconds -> [2.080300] [sd_comm_throttling/INFO] Task 'Task B' start time: 1.000000, finish time: 1.080300 -> [2.080300] [sd_comm_throttling/INFO] Task 'Task C' start time: 1.080300, finish time: 2.080300 -> [3.240600] [sd_comm_throttling/INFO] Simulation stopped after 3.2406 seconds -> [3.240600] [sd_comm_throttling/INFO] Task 'Task D' start time: 2.080300, finish time: 2.240600 -> [3.240600] [sd_comm_throttling/INFO] Task 'Task E' start time: 2.240600, finish time: 3.240600 +> [5.000000] [sd_comm_throttling/INFO] Simulation stopped after 5.0000 seconds +> [5.000000] [sd_comm_throttling/INFO] Task 'Task A' start time: 0.000000, finish time: 5.000000 +> [10.080600] [sd_comm_throttling/INFO] Simulation stopped after 10.0806 seconds +> [10.080600] [sd_comm_throttling/INFO] Task 'Task B' start time: 5.000000, finish time: 5.080600 +> [10.080600] [sd_comm_throttling/INFO] Task 'Task C' start time: 5.080600, finish time: 10.080600 +> [15.241200] [sd_comm_throttling/INFO] Simulation stopped after 15.2412 seconds +> [15.241200] [sd_comm_throttling/INFO] Task 'Task D' start time: 10.080600, finish time: 10.241200 +> [15.241200] [sd_comm_throttling/INFO] Task 'Task E' start time: 10.241200, finish time: 15.241200 diff --git a/examples/simdag/typed_tasks/sd_typed_tasks.tesh b/examples/simdag/typed_tasks/sd_typed_tasks.tesh index 00ef0c314b..3246a800e2 100644 --- a/examples/simdag/typed_tasks/sd_typed_tasks.tesh +++ b/examples/simdag/typed_tasks/sd_typed_tasks.tesh @@ -1,13 +1,12 @@ #! ./tesh p Usage test of simdag's typed tasks -$ $SG_TEST_EXENV ./typed_tasks/sd_typed_tasks --cfg=network/TCP-gamma:4194304 ${srcdir:=.}/../platforms/2clusters.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' +$ $SG_TEST_EXENV ./typed_tasks/sd_typed_tasks ${srcdir:=.}/../platforms/two_clusters.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. -> [2.080300] [sd_typed_tasks_test/INFO] Task 'Seq. comp. 1' start time: 0.000000, finish time: 1.000000 -> [2.080300] [sd_typed_tasks_test/INFO] Task 'Par. Comp. 1' start time: 0.000000, finish time: 0.080000 -> [2.080300] [sd_typed_tasks_test/INFO] Task 'Par. Comp. 3' start time: 0.000000, finish time: 0.400000 -> [2.080300] [sd_typed_tasks_test/INFO] Task 'MxN redist' start time: 0.080000, finish time: 0.480300 -> [2.080300] [sd_typed_tasks_test/INFO] Task 'Par. Comp. 2' start time: 0.480300, finish time: 0.520300 -> [2.080300] [sd_typed_tasks_test/INFO] Task 'E2E comm.' start time: 1.000000, finish time: 1.080300 -> [2.080300] [sd_typed_tasks_test/INFO] Task 'Seq. comp 2.' start time: 1.080300, finish time: 2.080300 \ No newline at end of file +> [2.080600] [sd_typed_tasks_test/INFO] Task 'Seq. comp. 1' start time: 0.000000, finish time: 1.000000 +> [2.080600] [sd_typed_tasks_test/INFO] Task 'Par. Comp. 1' start time: 0.000000, finish time: 0.400000 +> [2.080600] [sd_typed_tasks_test/INFO] Task 'Par. Comp. 3' start time: 0.000000, finish time: 0.400000 +> [2.080600] [sd_typed_tasks_test/INFO] Task 'MxN redist' start time: 0.400000, finish time: 0.721600 +> [2.080600] [sd_typed_tasks_test/INFO] Task 'Par. Comp. 2' start time: 0.721600, finish time: 0.921600 +> [2.080600] [sd_typed_tasks_test/INFO] Task 'E2E comm.' start time: 1.000000, finish time: 1.080600 +> [2.080600] [sd_typed_tasks_test/INFO] Task 'Seq. comp 2.' start time: 1.080600, finish time: 2.080600 diff --git a/teshsuite/smpi/coll-alltoall/clusters.tesh b/teshsuite/smpi/coll-alltoall/clusters.tesh index 8b474e272c..3d41e918dd 100644 --- a/teshsuite/smpi/coll-alltoall/clusters.tesh +++ b/teshsuite/smpi/coll-alltoall/clusters.tesh @@ -43,7 +43,7 @@ $ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_cluster -platform ! output sort p Test separate clusters -$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_cluster -platform ../../../examples/platforms/clusters_routing_full.xml -np 12 --log=xbt_cfg.thres:critical ${bindir:=.}/coll-alltoall -q --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_cluster -platform ../../../examples/platforms/two_clusters.xml -np 12 --log=xbt_cfg.thres:critical ${bindir:=.}/coll-alltoall -q --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error > [rank 0] -> node-0.acme.org > [rank 1] -> node-1.acme.org > [rank 2] -> node-2.acme.org diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index d1040325ce..7e7bb5f0da 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -1027,7 +1027,6 @@ set(CMAKE_SOURCE_FILES ) set(PLATFORMS_EXAMPLES - examples/platforms/2clusters.xml examples/platforms/bypassASroute.xml examples/platforms/bypassRoute.xml examples/platforms/cloud.xml @@ -1035,7 +1034,6 @@ set(PLATFORMS_EXAMPLES examples/platforms/cluster_and_one_host.xml examples/platforms/cluster_prototype.lua examples/platforms/cluster_no_backbone.xml - examples/platforms/clusters_routing_full.xml examples/platforms/crosstraffic.xml examples/platforms/optorsim/gridpp_grid_2004.conf examples/platforms/optorsim/lcg_sept2004_grid.conf @@ -1088,6 +1086,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/syscoord/median_p2psim.syscoord examples/platforms/three_multicore_hosts.xml examples/platforms/torus_cluster.xml + examples/platforms/two_clusters.xml examples/platforms/two_hosts.xml examples/platforms/two_hosts_platform.xml examples/platforms/two_hosts_platform_shared.xml