From 2fb5efca451d9ae2acf7aec514965870c7627efe Mon Sep 17 00:00:00 2001 From: SUTER Frederic Date: Fri, 24 Dec 2021 09:46:03 +0100 Subject: [PATCH] remove deperecated ptg-dotload example --- MANIFEST.in | 3 - examples/deprecated/simdag/CMakeLists.txt | 5 +- .../deprecated/simdag/ptg-dotload/ptg.dot | 10 -- .../simdag/ptg-dotload/sd_ptg-dotload.c | 57 ----------- .../simdag/ptg-dotload/sd_ptg-dotload.tesh | 97 ------------------- 5 files changed, 2 insertions(+), 170 deletions(-) delete mode 100644 examples/deprecated/simdag/ptg-dotload/ptg.dot delete mode 100644 examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload.c delete mode 100644 examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload.tesh diff --git a/MANIFEST.in b/MANIFEST.in index 8e7a161df1..d1a3e56c56 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -499,9 +499,6 @@ include examples/deprecated/simdag/daxload/sd_daxload.c include examples/deprecated/simdag/daxload/sd_daxload.tesh include examples/deprecated/simdag/daxload/simple_dax_with_cycle.xml include examples/deprecated/simdag/daxload/smalldax.xml -include examples/deprecated/simdag/ptg-dotload/ptg.dot -include examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload.c -include examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload.tesh include examples/deprecated/simdag/schedule-dotload/dag_with_bad_schedule.dot include examples/deprecated/simdag/schedule-dotload/dag_with_good_schedule.dot include examples/deprecated/simdag/schedule-dotload/sd_schedule-dotload.c diff --git a/examples/deprecated/simdag/CMakeLists.txt b/examples/deprecated/simdag/CMakeLists.txt index 6676fec8aa..71289f27ad 100644 --- a/examples/deprecated/simdag/CMakeLists.txt +++ b/examples/deprecated/simdag/CMakeLists.txt @@ -16,7 +16,7 @@ foreach(x test) set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/sd_${x}.tesh) endforeach() -foreach(x dag-dotload ptg-dotload schedule-dotload) +foreach(x dag-dotload schedule-dotload) if(HAVE_GRAPHVIZ) add_executable (sd_${x} EXCLUDE_FROM_ALL ${x}/sd_${x}.c) target_link_libraries(sd_${x} simgrid) @@ -34,7 +34,6 @@ set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/scheduling/Montage ${CMAKE_CURRENT_SOURCE_DIR}/daxload/smalldax.xml PARENT_SCOPE) set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/dag-dotload/dag_with_cycle.dot ${CMAKE_CURRENT_SOURCE_DIR}/dag-dotload/dag.dot - ${CMAKE_CURRENT_SOURCE_DIR}/ptg-dotload/ptg.dot ${CMAKE_CURRENT_SOURCE_DIR}/schedule-dotload/dag_with_bad_schedule.dot ${CMAKE_CURRENT_SOURCE_DIR}/schedule-dotload/dag_with_good_schedule.dot ${CMAKE_CURRENT_SOURCE_DIR}/scheduling/expected_output.jed PARENT_SCOPE) @@ -44,7 +43,7 @@ foreach(x daxload typed_tasks scheduling test) endforeach() if(HAVE_GRAPHVIZ) - foreach(x dag-dotload ptg-dotload schedule-dotload) + foreach(x dag-dotload schedule-dotload) ADD_TESH(simdag-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/deprecated/simdag --cd ${CMAKE_BINARY_DIR}/examples/deprecated/simdag ${CMAKE_HOME_DIRECTORY}/examples/deprecated/simdag/${x}/sd_${x}.tesh) endforeach() endif() diff --git a/examples/deprecated/simdag/ptg-dotload/ptg.dot b/examples/deprecated/simdag/ptg-dotload/ptg.dot deleted file mode 100644 index 4804bdec8d..0000000000 --- a/examples/deprecated/simdag/ptg-dotload/ptg.dot +++ /dev/null @@ -1,10 +0,0 @@ -digraph G { - c1 [size="1e9", alpha="0.2"]; - c2 [size="5e9", alpha="0.5"]; - c3 [size="2e9"]; - root->c1 [size="2e8"]; - root->c2 [size="1e8"]; - c1->c3 [size="5e8"]; - c2->c3 [size="-1."]; - c3->end [size="2e8"]; -} diff --git a/examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload.c b/examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload.c deleted file mode 100644 index 63da7e7dcf..0000000000 --- a/examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload.c +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright (c) 2013-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_CATEGORY(test, "Logging specific to this SimDag example"); - -/* simple test trying to load a Parallel Task Graph (PTG) as a DOT file. */ -int main(int argc, char **argv){ - xbt_dynar_t dot; - unsigned int cursor; - SD_task_t task; - - /* initialization of SD */ - SD_init(&argc, argv); - - /* Check our arguments */ - xbt_assert (argc > 1,"Usage: %s platform_file dot_file example: %s ../2clusters.xml ptg.dot", argv[0], argv[0]); - - /* creation of the environment */ - SD_create_environment(argv[1]); - - /* load the DOT file */ - dot = SD_PTG_dotload(argv[2]); - xbt_assert(dot != NULL, "No dot load may be you have a cycle in your graph"); - - /* Display all the tasks */ - XBT_INFO("------------------- Display all tasks of the loaded DAG ---------------------------"); - xbt_dynar_foreach(dot, cursor, task) { - SD_task_dump(task); - } - - /* Schedule them all on all the first host*/ - XBT_INFO("------------------- Schedule tasks ---------------------------"); - sg_host_t *hosts = sg_host_list(); - int count = sg_host_count(); - xbt_dynar_foreach(dot, cursor, task) { - if (SD_task_get_kind(task) == SD_TASK_COMP_PAR_AMDAHL) { - SD_task_schedulev(task, count, hosts); - } - } - xbt_free(hosts); - - XBT_INFO("------------------- Run the schedule ---------------------------"); - SD_simulate(-1); - XBT_INFO("Makespan: %f", simgrid_get_clock()); - xbt_dynar_foreach(dot, cursor, task) { - SD_task_destroy(task); - } - xbt_dynar_free_container(&dot); - - return 0; -} diff --git a/examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload.tesh b/examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload.tesh deleted file mode 100644 index b11294f218..0000000000 --- a/examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload.tesh +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/env tesh -p Test the loader of PTG (Parallel Task Graph) written in the DOT format - -# The order differ when executed with gcc's thread sanitizer -! output sort - -$ ${bindir:=.}/ptg-dotload/sd_ptg-dotload ${srcdir:=.}/../../platforms/cluster_backbone.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 -> [0.000000] [sd_task/INFO] - state: schedulable not runnable -> [0.000000] [sd_task/INFO] - kind: parallel computation following Amdahl's law -> [0.000000] [sd_task/INFO] - amount: 0 -> [0.000000] [sd_task/INFO] - alpha: 0.00 -> [0.000000] [sd_task/INFO] - Dependencies to satisfy: 0 -> [0.000000] [sd_task/INFO] - post-dependencies: -> [0.000000] [sd_task/INFO] root->c1 -> [0.000000] [sd_task/INFO] root->c2 -> [0.000000] [sd_task/INFO] Displaying task c1 -> [0.000000] [sd_task/INFO] - state: not scheduled not runnable -> [0.000000] [sd_task/INFO] - kind: parallel computation following Amdahl's law -> [0.000000] [sd_task/INFO] - amount: 1000000000 -> [0.000000] [sd_task/INFO] - alpha: 0.20 -> [0.000000] [sd_task/INFO] - Dependencies to satisfy: 1 -> [0.000000] [sd_task/INFO] - pre-dependencies: -> [0.000000] [sd_task/INFO] root->c1 -> [0.000000] [sd_task/INFO] - post-dependencies: -> [0.000000] [sd_task/INFO] c1->c3 -> [0.000000] [sd_task/INFO] Displaying task c2 -> [0.000000] [sd_task/INFO] - state: not scheduled not runnable -> [0.000000] [sd_task/INFO] - kind: parallel computation following Amdahl's law -> [0.000000] [sd_task/INFO] - amount: 5000000000 -> [0.000000] [sd_task/INFO] - alpha: 0.50 -> [0.000000] [sd_task/INFO] - Dependencies to satisfy: 1 -> [0.000000] [sd_task/INFO] - pre-dependencies: -> [0.000000] [sd_task/INFO] root->c2 -> [0.000000] [sd_task/INFO] - post-dependencies: -> [0.000000] [sd_task/INFO] c3 -> [0.000000] [sd_task/INFO] Displaying task c3 -> [0.000000] [sd_task/INFO] - state: not scheduled not runnable -> [0.000000] [sd_task/INFO] - kind: parallel computation following Amdahl's law -> [0.000000] [sd_task/INFO] - amount: 2000000000 -> [0.000000] [sd_task/INFO] - alpha: 0.00 -> [0.000000] [sd_task/INFO] - Dependencies to satisfy: 2 -> [0.000000] [sd_task/INFO] - pre-dependencies: -> [0.000000] [sd_task/INFO] c2 -> [0.000000] [sd_task/INFO] c1->c3 -> [0.000000] [sd_task/INFO] - post-dependencies: -> [0.000000] [sd_task/INFO] c3->end -> [0.000000] [sd_task/INFO] Displaying task c1->c3 -> [0.000000] [sd_task/INFO] - state: not scheduled not runnable -> [0.000000] [sd_task/INFO] - kind: MxN data redistribution assuming 1D block distribution -> [0.000000] [sd_task/INFO] - amount: 500000000 -> [0.000000] [sd_task/INFO] - Dependencies to satisfy: 1 -> [0.000000] [sd_task/INFO] - pre-dependencies: -> [0.000000] [sd_task/INFO] c1 -> [0.000000] [sd_task/INFO] - post-dependencies: -> [0.000000] [sd_task/INFO] c3 -> [0.000000] [sd_task/INFO] Displaying task c3->end -> [0.000000] [sd_task/INFO] - state: not scheduled not runnable -> [0.000000] [sd_task/INFO] - kind: MxN data redistribution assuming 1D block distribution -> [0.000000] [sd_task/INFO] - amount: 200000000 -> [0.000000] [sd_task/INFO] - Dependencies to satisfy: 1 -> [0.000000] [sd_task/INFO] - pre-dependencies: -> [0.000000] [sd_task/INFO] c3 -> [0.000000] [sd_task/INFO] - post-dependencies: -> [0.000000] [sd_task/INFO] end -> [0.000000] [sd_task/INFO] Displaying task root->c1 -> [0.000000] [sd_task/INFO] - state: not scheduled not runnable -> [0.000000] [sd_task/INFO] - kind: MxN data redistribution assuming 1D block distribution -> [0.000000] [sd_task/INFO] - amount: 200000000 -> [0.000000] [sd_task/INFO] - Dependencies to satisfy: 1 -> [0.000000] [sd_task/INFO] - pre-dependencies: -> [0.000000] [sd_task/INFO] root -> [0.000000] [sd_task/INFO] - post-dependencies: -> [0.000000] [sd_task/INFO] c1 -> [0.000000] [sd_task/INFO] Displaying task root->c2 -> [0.000000] [sd_task/INFO] - state: not scheduled not runnable -> [0.000000] [sd_task/INFO] - kind: MxN data redistribution assuming 1D block distribution -> [0.000000] [sd_task/INFO] - amount: 100000000 -> [0.000000] [sd_task/INFO] - Dependencies to satisfy: 1 -> [0.000000] [sd_task/INFO] - pre-dependencies: -> [0.000000] [sd_task/INFO] root -> [0.000000] [sd_task/INFO] - post-dependencies: -> [0.000000] [sd_task/INFO] c2 -> [0.000000] [sd_task/INFO] Displaying task end -> [0.000000] [sd_task/INFO] - state: not scheduled not runnable -> [0.000000] [sd_task/INFO] - kind: parallel computation following Amdahl's law -> [0.000000] [sd_task/INFO] - amount: 0 -> [0.000000] [sd_task/INFO] - alpha: 0.00 -> [0.000000] [sd_task/INFO] - Dependencies to satisfy: 1 -> [0.000000] [sd_task/INFO] - pre-dependencies: -> [0.000000] [sd_task/INFO] c3->end -> [0.000000] [test/INFO] ------------------- Schedule tasks --------------------------- -> [0.000000] [test/INFO] ------------------- Run the schedule --------------------------- -> [2.931978] [test/INFO] Makespan: 2.931978 - -- 2.20.1