From f738dcdd4a4a31b2cc25d64249d6469bbcc72c81 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Thu, 25 Feb 2016 13:23:04 +0100 Subject: [PATCH] yet another redundant platform less --- teshsuite/simdag/platforms/CMakeLists.txt | 1 - .../simdag/platforms/basic_parsing_test.tesh | 2 +- .../basic_parsing_test_sym_full.tesh | 2 +- teshsuite/simdag/platforms/flatifier.tesh | 342 ------------------ teshsuite/simdag/platforms/two_clusters.xml | 4 +- .../platforms/two_clusters_symmetric.xml | 18 - 6 files changed, 4 insertions(+), 365 deletions(-) delete mode 100644 teshsuite/simdag/platforms/two_clusters_symmetric.xml diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt index 1f5414a90d..3a95a0767f 100644 --- a/teshsuite/simdag/platforms/CMakeLists.txt +++ b/teshsuite/simdag/platforms/CMakeLists.txt @@ -43,7 +43,6 @@ set(xml_files ${CMAKE_CURRENT_SOURCE_DIR}/three_hosts_non_symmetric_route.xml ${CMAKE_CURRENT_SOURCE_DIR}/two_clusters_one_name.xml ${CMAKE_CURRENT_SOURCE_DIR}/two_clusters_router_id.xml - ${CMAKE_CURRENT_SOURCE_DIR}/two_clusters_symmetric.xml ${CMAKE_CURRENT_SOURCE_DIR}/two_clusters.xml ${CMAKE_CURRENT_SOURCE_DIR}/bogus_missing_src_gateway.xml ${CMAKE_CURRENT_SOURCE_DIR}/bogus_missing_dst_gateway.xml diff --git a/teshsuite/simdag/platforms/basic_parsing_test.tesh b/teshsuite/simdag/platforms/basic_parsing_test.tesh index 31aa1105e8..c6be629b32 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test.tesh +++ b/teshsuite/simdag/platforms/basic_parsing_test.tesh @@ -18,7 +18,7 @@ $ ${bindir:=.}/basic_parsing_test three_hosts_non_symmetric_route.xml "--log=roo $ ${bindir:=.}/basic_parsing_test two_clusters.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. -> Workstation number: 10, link number: 24 +> Workstation number: 4, link number: 12 $ ${bindir:=.}/basic_parsing_test two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. diff --git a/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh b/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh index e16f261d9e..d26514232e 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh +++ b/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh @@ -155,7 +155,7 @@ $ ${bindir:=.}/basic_parsing_test one_cluster_fullduplex.xml FULL_LINK "--log=ro > Link bob_cluster_link_6_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.000600, route bandwidth = 125000000.000000 -$ ${bindir:=.}/basic_parsing_test two_clusters_symmetric.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/basic_parsing_test two_clusters.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 4, link number: 12 > Route between bob1.hamburger.edu and bob1.hamburger.edu diff --git a/teshsuite/simdag/platforms/flatifier.tesh b/teshsuite/simdag/platforms/flatifier.tesh index 55391b0901..fcab6a72d1 100644 --- a/teshsuite/simdag/platforms/flatifier.tesh +++ b/teshsuite/simdag/platforms/flatifier.tesh @@ -372,14 +372,8 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:% > > > -> -> -> > > -> -> -> > > > @@ -388,51 +382,21 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:% > > > -> -> -> -> -> -> > > > > > > -> -> -> -> -> -> > > > -> -> -> -> -> -> -> -> -> > > > -> -> -> -> -> -> > > > -> -> -> > > > @@ -442,141 +406,15 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:% > > > -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> > > > -> -> -> -> -> -> -> -> -> > > > -> -> -> -> -> -> > > > -> -> -> > > > @@ -586,105 +424,15 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:% > > > -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> > > > -> -> -> -> -> -> -> -> -> > > > -> -> -> -> -> -> > > > -> -> -> > > > @@ -694,69 +442,15 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:% > > > -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> > > > -> -> -> -> -> -> -> -> -> > > > -> -> -> -> -> -> > > > -> -> -> > > > @@ -775,30 +469,12 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:% > > > -> -> -> -> -> -> -> -> -> > > > -> -> -> -> -> -> > > > -> -> -> > > > @@ -811,30 +487,12 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:% > > > -> -> -> -> -> -> -> -> -> > > > -> -> -> -> -> -> > > > -> -> -> > > > diff --git a/teshsuite/simdag/platforms/two_clusters.xml b/teshsuite/simdag/platforms/two_clusters.xml index e40b830587..5fa2b2b325 100644 --- a/teshsuite/simdag/platforms/two_clusters.xml +++ b/teshsuite/simdag/platforms/two_clusters.xml @@ -2,9 +2,9 @@ - - diff --git a/teshsuite/simdag/platforms/two_clusters_symmetric.xml b/teshsuite/simdag/platforms/two_clusters_symmetric.xml deleted file mode 100644 index 9afb8cfc7a..0000000000 --- a/teshsuite/simdag/platforms/two_clusters_symmetric.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - -- 2.20.1