Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Convert another test
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Sat, 20 Feb 2021 18:02:53 +0000 (19:02 +0100)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Sat, 20 Feb 2021 18:10:32 +0000 (19:10 +0100)
MANIFEST.in
teshsuite/models/ptask_L07/ptask_L07 [new file with mode: 0755]
teshsuite/models/ptask_L07/ptask_L07.cpp
teshsuite/models/ptask_L07/ptask_L07.tesh
teshsuite/simdag/CMakeLists.txt
teshsuite/simdag/basic5/basic5.c [deleted file]
teshsuite/simdag/basic5/basic5.tesh [deleted file]

index dbe8494..60e4456 100644 (file)
@@ -764,8 +764,6 @@ include teshsuite/simdag/basic3/basic3.c
 include teshsuite/simdag/basic3/basic3.tesh
 include teshsuite/simdag/basic4/basic4.c
 include teshsuite/simdag/basic4/basic4.tesh
-include teshsuite/simdag/basic5/basic5.c
-include teshsuite/simdag/basic5/basic5.tesh
 include teshsuite/simdag/flatifier/bogus_missing_gateway.tesh
 include teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh
 include teshsuite/simdag/flatifier/flatifier.cpp
diff --git a/teshsuite/models/ptask_L07/ptask_L07 b/teshsuite/models/ptask_L07/ptask_L07
new file mode 100755 (executable)
index 0000000..a325732
Binary files /dev/null and b/teshsuite/models/ptask_L07/ptask_L07 differ
index 7d5acb7..8e1cb29 100644 (file)
@@ -294,6 +294,24 @@ static void main_dispatcher()
    XBT_INFO("Actual result: 1 small and 1 large concurrent communications take %.4f seconds.",
              end_time - start_time);
    XBT_INFO("\n");
+
+   sg4::this_actor::sleep_for(5);
+
+   XBT_INFO("TEST: Concurrent communication and computation.");
+   XBT_INFO("------------------------------------------------------------");
+   XBT_INFO("A host sends 1B to another while the latter compute 2 flop.");
+   XBT_INFO("Should be done in 2 seconds: 1.5s to transfer and 2 seconds to compute.");
+   XBT_INFO("The two activities should overlap smoothly as they use different resources.");
+   XBT_INFO("The completion time is thus the maximum of the time to complete the two activities.");
+
+   start_time = sg4::Engine::get_clock();
+   c1 = sg4::Comm::sendto_async(hosts[0], hosts[4], 1.0);
+   e1 = sg4::Exec::init()->set_flops_amount(2.0)->set_host(hosts[4])->start();
+   e1->wait();
+   c1->wait();
+   end_time = sg4::Engine::get_clock();
+   XBT_INFO("Actual result: Sending 1B while computing 2 flops takes %.4f seconds.", end_time - start_time);
+   XBT_INFO("\n");
 }
 
 int main(int argc, char** argv)
index 06ec6af..9884258 100644 (file)
@@ -135,3 +135,12 @@ $ ${bindir:=.}/ptask_L07 --cfg=host/model:ptask_L07 ${platfdir}/ptask_L07.xml --
 > The small communication has a negligible impact on the large one.
 > This corresponds to paying latency once and having the full bandwidth for the large communication.
 > Actual result: 1 small and 1 large concurrent communications take 0.8001 seconds.
+> 
+> 
+> TEST: Concurrent communication and computation.
+> ------------------------------------------------------------
+> A host sends 1B to another while the latter compute 2 flop.
+> Should be done in 2 seconds: 1.5s to transfer and 2 seconds to compute.
+> The two activities should overlap smoothly as they use different resources.
+> The completion time is thus the maximum of the time to complete the two activities.
+> Actual result: Sending 1B while computing 2 flops takes 2.0000 seconds.
index 683ccb5..e04e89a 100644 (file)
@@ -1,4 +1,4 @@
-foreach(x availability basic1 basic3 basic4 basic5 incomplete)
+foreach(x availability basic1 basic3 basic4 incomplete)
   add_executable       (${x}  EXCLUDE_FROM_ALL ${x}/${x}.c)
   target_link_libraries(${x}  simgrid)
   set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
@@ -50,7 +50,7 @@ set(txt_files     ${txt_files}      ${CMAKE_CURRENT_SOURCE_DIR}/platforms/carol.
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/link.fail
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/link.lat                         PARENT_SCOPE)
 
-foreach(x availability basic1 basic3 basic4 basic5 flatifier incomplete)
+foreach(x availability basic1 basic3 basic4 flatifier incomplete)
   ADD_TESH(tesh-simdag-${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/${x} ${x}.tesh)
 endforeach()
 
diff --git a/teshsuite/simdag/basic5/basic5.c b/teshsuite/simdag/basic5/basic5.c
deleted file mode 100644 (file)
index 8ff4396..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright (c) 2007-2021. 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"
-#include "xbt/log.h"
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic5, sd, "SimDag test basic5");
-
-/* Basic SimDag Test 5
- * Scenario:
- *   - Create a no-op Init task
- *   - Create two tasks: send 100kB and compute 10Mflops
- *   - Schedule them concurrently
- * The two tasks should overlap smoothly as they use different resources.
- * Simulated time should be:
- *          MAX(1e5/(1.25e8), 1e7/4e9) = MAX(.0009, .0025) = 0.0025 seconds
- */
-int main(int argc, char **argv)
-{
-  /* scheduling parameters */
-  double no_cost[] = { 0., 0., 0., 0. };
-  double amount[] = { 0., 100000., 0., 0. };
-  double comput[] = { 10000000. };
-
-  /* initialization of SD */
-  SD_init(&argc, argv);
-
-  /* creation of the environment */
-  SD_create_environment(argv[1]);
-
-  /* creation of the tasks and their dependencies */
-  SD_task_t taskInit = SD_task_create("Task Init", NULL, 1.0);
-  SD_task_t taskA = SD_task_create("Task A", NULL, 1.0);
-  SD_task_t taskB = SD_task_create("Task B", NULL, 1.0);
-
-  SD_task_dependency_add(taskInit, taskA);
-  SD_task_dependency_add(taskInit, taskB);
-
-  sg_host_t *hosts = sg_host_list();
-  SD_task_schedule(taskInit, 1, hosts, no_cost, no_cost, -1.0);
-  SD_task_schedule(taskA, 2, hosts, no_cost, amount, -1.0);
-  SD_task_schedule(taskB, 1, hosts, comput, no_cost, -1.0);
-  xbt_free(hosts);
-
-  /* let's launch the simulation! */
-  SD_simulate(-1.0);
-  SD_task_destroy(taskInit);
-  SD_task_destroy(taskA);
-  SD_task_destroy(taskB);
-
-  XBT_INFO("Simulation time: %f", SD_get_clock());
-
-  return 0;
-}
diff --git a/teshsuite/simdag/basic5/basic5.tesh b/teshsuite/simdag/basic5/basic5.tesh
deleted file mode 100644 (file)
index 55b251b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-$ ${bindir:=.}/basic5 ../../../examples/platforms/two_hosts_platform_shared.xml "--log=root.fmt:[%10.6r]%e%m%n"
-> [  0.000000] Switching to the L07 model to handle parallel tasks.
-> [  0.002500] Simulation time: 0.002500