Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
remove an example that does not bring much
authorMartin Quinson <martin.quinson@loria.fr>
Sat, 13 Oct 2018 16:37:24 +0000 (18:37 +0200)
committerMartin Quinson <martin.quinson@loria.fr>
Sat, 13 Oct 2018 16:37:24 +0000 (18:37 +0200)
.gitignore
examples/simdag/CMakeLists.txt
examples/simdag/availability/sd_availability.c [deleted file]
examples/simdag/availability/sd_availability.tesh [deleted file]

index 2056478..692991b 100644 (file)
@@ -194,7 +194,6 @@ examples/s4u/synchro-barrier/s4u-synchro-barrier
 examples/s4u/synchro-mutex/s4u-synchro-mutex
 examples/s4u/synchro-semaphore/s4u-synchro-semaphore
 examples/s4u/trace-platform/s4u-trace-platform
 examples/s4u/synchro-mutex/s4u-synchro-mutex
 examples/s4u/synchro-semaphore/s4u-synchro-semaphore
 examples/s4u/trace-platform/s4u-trace-platform
-examples/simdag/availability/sd_availability
 examples/simdag/dag-dotload/sd_dag-dotload
 examples/simdag/daxload/sd_daxload
 examples/simdag/fail/sd_fail
 examples/simdag/dag-dotload/sd_dag-dotload
 examples/simdag/daxload/sd_daxload
 examples/simdag/fail/sd_fail
index 26a8a1b..c10e920 100644 (file)
@@ -1,4 +1,4 @@
-foreach(x availability daxload fail typed_tasks properties throttling scheduling)
+foreach(x daxload fail typed_tasks properties throttling scheduling)
   add_executable       (sd_${x}     ${x}/sd_${x}.c)
   target_link_libraries(sd_${x}     simgrid)
   set_target_properties(sd_${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
   add_executable       (sd_${x}     ${x}/sd_${x}.c)
   target_link_libraries(sd_${x}     simgrid)
   set_target_properties(sd_${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
@@ -40,7 +40,7 @@ set(txt_files    ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/dag-dotload/dag_wi
                                   ${CMAKE_CURRENT_SOURCE_DIR}/schedule-dotload/dag_with_good_schedule.dot
                                   ${CMAKE_CURRENT_SOURCE_DIR}/scheduling/expected_output.jed               PARENT_SCOPE)
 
                                   ${CMAKE_CURRENT_SOURCE_DIR}/schedule-dotload/dag_with_good_schedule.dot
                                   ${CMAKE_CURRENT_SOURCE_DIR}/scheduling/expected_output.jed               PARENT_SCOPE)
 
-foreach(x availability daxload fail typed_tasks properties throttling scheduling test)
+foreach(x daxload fail typed_tasks properties throttling scheduling test)
   ADD_TESH(simdag-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/${x}/sd_${x}.tesh)
 endforeach()
 
   ADD_TESH(simdag-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/${x}/sd_${x}.tesh)
 endforeach()
 
diff --git a/examples/simdag/availability/sd_availability.c b/examples/simdag/availability/sd_availability.c
deleted file mode 100644 (file)
index 601a6ed..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Copyright (c) 2012-2018. The SimGrid Team.
- * All rights reserved.                                                     */
-
-/* This program is free software; you can redistribute it and/or modify it
- * under the terms of the license (GNU LGPL) which comes with this package. */
-
-#include "simgrid/simdag.h"
-
-XBT_LOG_NEW_DEFAULT_CATEGORY(sd_avail, "Logging specific to this SimDag example");
-
-/* Test of dynamic availability traces
- * Scenario:
- *  - A chain of tasks: t1 -> c1 -> t2 -> c2 -> t3 -> c3 -> t4 alternatively
- *    scheduled across two workstations (Tremblay and Jupiter) connected by a
- *    single link (link1)
- *  - Make the characteristics of the resources change across time
- *      Jupiter
- *         [0.000000 -> 2.000000[ runs at half speed: 12500000
- *         [2.000000 -> end[      runs at full speed: 25000000
- *      Tremblay
- *         [0.000000 -> 1.000000[ runs at half speed: 15000000
- *         [1.000000 -> 4.000000[ runs at full speed: 25000000
- *         [4.000000 -> 6.000000[ runs at half speed: 12500000
- *         then loop back.
- *      link1
- *         [0.000000 -> 2.000000[ bandwidth = 125000000
- *         [2.000000 -> 4.000000[ bandwidth = 62500000
- *         [4.000000 -> 6.000000[ bandwidth = 31250000
- *         then loop back.
- *  - Adjust tasks' amounts to have comprehensive execution times
- *      t1: 25000000 flops, should last 2 seconds
- *      c1: 125000000 bytes, should last 1.0001 seconds
- *      t2: 25000000 flops, should last 1 second
- *      c2: 62500000 bytes, should last 1.0001 seconds
- *      t3: 25000000 flops, should last 1 second
- *      c3: 31250000 bytes, should last 1.0001 seconds
- *      t4: 25000000 flops, should last 1 second
- */
-
-int main(int argc, char **argv)
-{
-  SD_init(&argc, argv);
-  SD_create_environment(argv[1]);
-  sg_host_t *hosts = sg_host_list();
-
-  SD_task_t t1 = SD_task_create_comp_seq("t1", NULL, 25000000);
-  SD_task_t c1 = SD_task_create_comm_e2e("c1", NULL, 125000000);
-  SD_task_t t2 = SD_task_create_comp_seq("t2", NULL, 25000000);
-  SD_task_t c2 = SD_task_create_comm_e2e("c2", NULL, 62500000);
-  SD_task_t t3 = SD_task_create_comp_seq("t3", NULL, 25000000);
-  SD_task_t c3 = SD_task_create_comm_e2e("c3", NULL, 31250000);
-  SD_task_t t4 = SD_task_create_comp_seq("t4", NULL, 25000000);
-
-  /* Add dependencies: t1->c1->t2->c2->t3 */
-  SD_task_dependency_add(t1, c1);
-  SD_task_dependency_add(c1, t2);
-  SD_task_dependency_add(t2, c2);
-  SD_task_dependency_add(c2, t3);
-  SD_task_dependency_add(t3, c3);
-  SD_task_dependency_add(c3, t4);
-
-  /* Schedule tasks t1 and w3 on first host, t2 on second host */
-  /* Transfers are auto-scheduled */
-  SD_task_schedulel(t1, 1, hosts[0]);
-  SD_task_schedulel(t2, 1, hosts[1]);
-  SD_task_schedulel(t3, 1, hosts[0]);
-  SD_task_schedulel(t4, 1, hosts[1]);
-
-  /* Add some watchpoint upon task completion */
-  SD_task_watch(t1, SD_DONE);
-  SD_task_watch(c1, SD_DONE);
-  SD_task_watch(t2, SD_DONE);
-  SD_task_watch(c2, SD_DONE);
-  SD_task_watch(t3, SD_DONE);
-  SD_task_watch(c3, SD_DONE);
-  SD_task_watch(t4, SD_DONE);
-  xbt_dynar_t changed_tasks = xbt_dynar_new(sizeof(SD_task_t), NULL);
-  while (1) {
-    SD_simulate_with_update(-1.0, changed_tasks);
-    if (xbt_dynar_is_empty(changed_tasks))
-      break;
-    XBT_INFO("link1: bw=%.0f, lat=%f", sg_host_route_bandwidth(hosts[0], hosts[1]),
-             sg_host_route_latency(hosts[0], hosts[1]));
-    XBT_INFO("Jupiter: speed=%.0f", sg_host_speed(hosts[0])* sg_host_get_available_speed(hosts[0]));
-    XBT_INFO("Tremblay: speed=%.0f", sg_host_speed(hosts[1])* sg_host_get_available_speed(hosts[1]));
-
-    unsigned int ctr;
-    SD_task_t task;
-    xbt_dynar_foreach(changed_tasks, ctr, task) {
-      XBT_INFO("Task '%s' start time: %f, finish time: %f", SD_task_get_name(task),
-           SD_task_get_start_time(task), SD_task_get_finish_time(task));
-      if (SD_task_get_state(task)==SD_DONE)
-        SD_task_destroy(task);
-    }
-    xbt_dynar_reset(changed_tasks);
-  }
-  xbt_free(hosts);
-  xbt_dynar_free(&changed_tasks);
-  return 0;
-}
diff --git a/examples/simdag/availability/sd_availability.tesh b/examples/simdag/availability/sd_availability.tesh
deleted file mode 100644 (file)
index d067977..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env tesh
-
-p Test of the management of availability traces with simdag
-
-$ $SG_TEST_EXENV ${bindir:=.}/availability/sd_availability ${srcdir:=.}/../platforms/two_hosts.xml
-> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
-> [2.000000] [sd_avail/INFO] link1: bw=62500000, lat=0.000100
-> [2.000000] [sd_avail/INFO] Jupiter: speed=25000000
-> [2.000000] [sd_avail/INFO] Tremblay: speed=12500000
-> [2.000000] [sd_avail/INFO] Task 't1' start time: 0.000000, finish time: 2.000000
-> [4.000200] [sd_avail/INFO] link1: bw=31250000, lat=0.000100
-> [4.000200] [sd_avail/INFO] Jupiter: speed=25000000
-> [4.000200] [sd_avail/INFO] Tremblay: speed=25000000
-> [4.000200] [sd_avail/INFO] Task 'c1' start time: 2.000000, finish time: 4.000200
-> [5.000200] [sd_avail/INFO] link1: bw=31250000, lat=0.000100
-> [5.000200] [sd_avail/INFO] Jupiter: speed=25000000
-> [5.000200] [sd_avail/INFO] Tremblay: speed=25000000
-> [5.000200] [sd_avail/INFO] Task 't2' start time: 4.000200, finish time: 5.000200
-> [7.000300] [sd_avail/INFO] link1: bw=31250000, lat=0.000100
-> [7.000300] [sd_avail/INFO] Jupiter: speed=25000000
-> [7.000300] [sd_avail/INFO] Tremblay: speed=25000000
-> [7.000300] [sd_avail/INFO] Task 'c2' start time: 5.000200, finish time: 7.000300
-> [8.000300] [sd_avail/INFO] link1: bw=31250000, lat=0.000100
-> [8.000300] [sd_avail/INFO] Jupiter: speed=25000000
-> [8.000300] [sd_avail/INFO] Tremblay: speed=25000000
-> [8.000300] [sd_avail/INFO] Task 't3' start time: 7.000300, finish time: 8.000300
-> [9.000400] [sd_avail/INFO] link1: bw=31250000, lat=0.000100
-> [9.000400] [sd_avail/INFO] Jupiter: speed=25000000
-> [9.000400] [sd_avail/INFO] Tremblay: speed=25000000
-> [9.000400] [sd_avail/INFO] Task 'c3' start time: 8.000300, finish time: 9.000400
-> [10.000400] [sd_avail/INFO] link1: bw=31250000, lat=0.000100
-> [10.000400] [sd_avail/INFO] Jupiter: speed=25000000
-> [10.000400] [sd_avail/INFO] Tremblay: speed=25000000
-> [10.000400] [sd_avail/INFO] Task 't4' start time: 9.000400, finish time: 10.000400