From 803bcb94d28ba8ed6fb985ef430b707497dc0981 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Fri, 22 Jan 2016 22:37:12 +0100 Subject: [PATCH 1/1] deduplication and tidying --- examples/platforms/simulacrum_7_hosts.xml | 101 ++++++++ .../platforms/trace}/linkBandwidth7.bw | 0 examples/simdag/scheduling/CMakeLists.txt | 1 - .../simdag/scheduling/simulacrum_7_hosts.xml | 131 ---------- examples/simdag/scheduling/test_minmin.tesh | 2 +- teshsuite/simdag/availability/CMakeLists.txt | 5 - .../availability/availability_test.tesh | 2 +- .../availability/simulacrum_7_hosts.xml | 225 ------------------ tools/cmake/DefinePackages.cmake | 2 + 9 files changed, 105 insertions(+), 364 deletions(-) create mode 100644 examples/platforms/simulacrum_7_hosts.xml rename {teshsuite/simdag/availability => examples/platforms/trace}/linkBandwidth7.bw (100%) delete mode 100644 examples/simdag/scheduling/simulacrum_7_hosts.xml delete mode 100644 teshsuite/simdag/availability/simulacrum_7_hosts.xml diff --git a/examples/platforms/simulacrum_7_hosts.xml b/examples/platforms/simulacrum_7_hosts.xml new file mode 100644 index 0000000000..6cbc877761 --- /dev/null +++ b/examples/platforms/simulacrum_7_hosts.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/teshsuite/simdag/availability/linkBandwidth7.bw b/examples/platforms/trace/linkBandwidth7.bw similarity index 100% rename from teshsuite/simdag/availability/linkBandwidth7.bw rename to examples/platforms/trace/linkBandwidth7.bw diff --git a/examples/simdag/scheduling/CMakeLists.txt b/examples/simdag/scheduling/CMakeLists.txt index c1410767ae..5aea70e8d1 100644 --- a/examples/simdag/scheduling/CMakeLists.txt +++ b/examples/simdag/scheduling/CMakeLists.txt @@ -17,7 +17,6 @@ set(tesh_files set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/Montage_25.xml - ${CMAKE_CURRENT_SOURCE_DIR}/simulacrum_7_hosts.xml PARENT_SCOPE ) set(examples_src diff --git a/examples/simdag/scheduling/simulacrum_7_hosts.xml b/examples/simdag/scheduling/simulacrum_7_hosts.xml deleted file mode 100644 index 0db92e86b3..0000000000 --- a/examples/simdag/scheduling/simulacrum_7_hosts.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/simdag/scheduling/test_minmin.tesh b/examples/simdag/scheduling/test_minmin.tesh index 7a04cd330a..9a93e1b60c 100644 --- a/examples/simdag/scheduling/test_minmin.tesh +++ b/examples/simdag/scheduling/test_minmin.tesh @@ -2,7 +2,7 @@ p Simple test of simdag -$ $SG_TEST_EXENV ${bindir:=.}/minmin_test --log=sd_daxparse.thresh:critical ${srcdir:=.}/simulacrum_7_hosts.xml ${srcdir:=.}/Montage_25.xml +$ $SG_TEST_EXENV ${bindir:=.}/minmin_test --log=sd_daxparse.thresh:critical ${srcdir:=.}/../../platforms/simulacrum_7_hosts.xml ${srcdir:=.}/Montage_25.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [test/INFO] Schedule ID00002@mProjectPP on Host 27 > [0.000105] [test/INFO] Schedule ID00000@mProjectPP on Host 26 diff --git a/teshsuite/simdag/availability/CMakeLists.txt b/teshsuite/simdag/availability/CMakeLists.txt index 67e641cefa..ae7ee108aa 100644 --- a/teshsuite/simdag/availability/CMakeLists.txt +++ b/teshsuite/simdag/availability/CMakeLists.txt @@ -14,11 +14,6 @@ set(tesh_files ${CMAKE_CURRENT_SOURCE_DIR}/availability_test.tesh PARENT_SCOPE ) -set(xml_files - ${xml_files} - ${CMAKE_CURRENT_SOURCE_DIR}/simulacrum_7_hosts.xml - PARENT_SCOPE - ) set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/availability_test.c diff --git a/teshsuite/simdag/availability/availability_test.tesh b/teshsuite/simdag/availability/availability_test.tesh index 1db14b10b7..d975690263 100644 --- a/teshsuite/simdag/availability/availability_test.tesh +++ b/teshsuite/simdag/availability/availability_test.tesh @@ -1,6 +1,6 @@ ! output sort -$ simdag/availability/availability_test ${srcdir:=.}/simdag/availability/simulacrum_7_hosts.xml --cfg=path:${srcdir:=.}/simdag/availability/ ${srcdir:=.}/../examples/simdag/scheduling/Montage_25.xml --cfg=network/TCP_gamma:4194304 --log=sd_daxparse.thresh:critical +$ simdag/availability/availability_test ${srcdir:=.}/../examples/platforms/simulacrum_7_hosts.xml --cfg=path:${srcdir:=.}/simdag/availability/ ${srcdir:=.}/../examples/simdag/scheduling/Montage_25.xml --cfg=network/TCP_gamma:4194304 --log=sd_daxparse.thresh:critical > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > Scheduling DAX... diff --git a/teshsuite/simdag/availability/simulacrum_7_hosts.xml b/teshsuite/simdag/availability/simulacrum_7_hosts.xml deleted file mode 100644 index 2e664a5419..0000000000 --- a/teshsuite/simdag/availability/simulacrum_7_hosts.xml +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 7049c5aebe..c6c5889792 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -1254,6 +1254,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/conf/transform_optorsim_platform.pl examples/platforms/config.xml examples/platforms/config_tracing.xml + examples/platforms/trace/linkBandwidth7.bw examples/platforms/trace/trace_A_failure.txt examples/platforms/trace/trace_A.txt examples/platforms/trace/trace_B.txt @@ -1274,6 +1275,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/routing_cluster.xml examples/platforms/routing_cluster.lua examples/platforms/routing_none.xml + examples/platforms/simulacrum_7_hosts.xml examples/platforms/storage/content/small_content.txt examples/platforms/storage/content/storage_content.txt examples/platforms/storage/content/win_storage_content.txt -- 2.20.1