From 2ab6ce3855b56e644a07a5934394799809de25c8 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Mon, 22 Feb 2021 09:45:51 +0100 Subject: [PATCH] remove last basic simdag test. redundant with one of the ptask_L07 tests --- MANIFEST.in | 2 - teshsuite/simdag/CMakeLists.txt | 4 +- teshsuite/simdag/basic1/basic1.c | 57 ----------------------------- teshsuite/simdag/basic1/basic1.tesh | 7 ---- 4 files changed, 2 insertions(+), 68 deletions(-) delete mode 100644 teshsuite/simdag/basic1/basic1.c delete mode 100644 teshsuite/simdag/basic1/basic1.tesh diff --git a/MANIFEST.in b/MANIFEST.in index a0059d4f43..9355b3b1d0 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -758,8 +758,6 @@ include teshsuite/s4u/wait-any-for/wait-any-for.cpp include teshsuite/s4u/wait-any-for/wait-any-for.tesh include teshsuite/simdag/availability/availability.c include teshsuite/simdag/availability/availability.tesh -include teshsuite/simdag/basic1/basic1.c -include teshsuite/simdag/basic1/basic1.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/simdag/CMakeLists.txt b/teshsuite/simdag/CMakeLists.txt index 3e9b43bd1b..81c82e9247 100644 --- a/teshsuite/simdag/CMakeLists.txt +++ b/teshsuite/simdag/CMakeLists.txt @@ -1,4 +1,4 @@ -foreach(x availability basic1 incomplete) +foreach(x availability 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 flatifier incomplete) +foreach(x availability 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/basic1/basic1.c b/teshsuite/simdag/basic1/basic1.c deleted file mode 100644 index 13da078b61..0000000000 --- a/teshsuite/simdag/basic1/basic1.c +++ /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/str.h" - -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic1, sd, "SimDag test basic1"); - -/* Basic SimDag Test 1 - * Scenario: - * - Create a no-op Init task - * - Create two communication tasks: 1GB and 1GB - * - Schedule them concurrently on the two hosts of the platform - * The two communications occur simultaneously. They share the network for the - * whole duration of the simulation. - * Simulated time should be: - * 1e9/(1/2*1.25e8) + 1e-4 = 16.0001 seconds - */ -int main(int argc, char **argv) -{ - - /* initialization of SD */ - SD_init(&argc, argv); - - /* creation of the environment */ - SD_create_environment(argv[1]); - /* scheduling parameters */ - double communication_amount1 = xbt_str_parse_double(argv[2], "Invalid communication size: %s"); - double communication_amount2 = xbt_str_parse_double(argv[3], "Invalid communication size: %s"); - - /* creation of the tasks and their dependencies */ - SD_task_t taskInit = SD_task_create("Init", NULL, 1.0); - SD_task_t taskA = SD_task_create("Task Comm A", NULL, 1.0); - SD_task_t taskB = SD_task_create("Task Comm 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, SD_SCHED_NO_COST, SD_SCHED_NO_COST, -1.0); - SD_task_schedule(taskA, 1, &hosts[0], SD_SCHED_NO_COST, &communication_amount1, -1.0); - SD_task_schedule(taskB, 1, &hosts[1], SD_SCHED_NO_COST, &communication_amount2, -1.0); - xbt_free(hosts); - - /* let's launch the simulation! */ - SD_simulate(-1.0); - SD_task_destroy(taskA); - SD_task_destroy(taskB); - SD_task_destroy(taskInit); - - XBT_INFO("Simulation time: %f", SD_get_clock()); - - return 0; -} diff --git a/teshsuite/simdag/basic1/basic1.tesh b/teshsuite/simdag/basic1/basic1.tesh deleted file mode 100644 index dde9e4a97a..0000000000 --- a/teshsuite/simdag/basic1/basic1.tesh +++ /dev/null @@ -1,7 +0,0 @@ -$ ${bindir:=.}/basic1 ../../../examples/platforms/two_hosts_platform_shared.xml 1e9 1e9 "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" -> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. -> [ 16.000100] (0:maestro@) Simulation time: 16.000100 - -$ ${bindir:=.}/basic1 ../../../examples/platforms/two_hosts_platform_shared.xml 1e9 1e8 "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" -> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. -> [ 8.800100] (0:maestro@) Simulation time: 8.800100 -- 2.20.1