From: Frederic Suter Date: Thu, 17 Mar 2016 08:17:07 +0000 (+0100) Subject: further reorg X-Git-Tag: v3_13~392 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d3d2bbd100f6750e1dc9194b18238ce1544d9cba further reorg --- diff --git a/.gitignore b/.gitignore index db80aae4ac..ee1cfbff7f 100644 --- a/.gitignore +++ b/.gitignore @@ -294,8 +294,8 @@ teshsuite/simdag/comm-p2p-latency-2/comm-p2p-latency-2 teshsuite/simdag/comm-p2p-latency-3/comm-p2p-latency-3 teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound teshsuite/simdag/network/test_reinit_costs -teshsuite/simdag/partask/par-comp_only_par -teshsuite/simdag/partask/par-comp_only_seq +teshsuite/simdag/comp-only-par/comp-only-par +teshsuite/simdag/comp-only-seq/comp-only-seq teshsuite/simdag/platforms/basic_link_test teshsuite/simdag/platforms/basic_parsing_test teshsuite/simdag/platforms/basic_tracing diff --git a/teshsuite/simdag/CMakeLists.txt b/teshsuite/simdag/CMakeLists.txt index 65cbe86064..5c9dce472c 100644 --- a/teshsuite/simdag/CMakeLists.txt +++ b/teshsuite/simdag/CMakeLists.txt @@ -1,5 +1,5 @@ foreach(x availability comm-mxn-all2all comm-mxn-independent comm-mxn-scatter comm-p2p-latency-1 comm-p2p-latency-2 - comm-p2p-latency-3 comm-p2p-latency-bound incomplete) + comm-p2p-latency-3 comm-p2p-latency-bound comp-only-par comp-only-seq incomplete) add_executable (${x} ${x}/${x}.c) target_link_libraries(${x} simgrid) set_target_properties(${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x}) diff --git a/teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.tesh b/teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.tesh index cc720c0ea0..daffc5b30a 100644 --- a/teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.tesh +++ b/teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.tesh @@ -1,4 +1,3 @@ - p latency bounded by large latency link ! output sort diff --git a/teshsuite/simdag/partask/par-comp_only_par.c b/teshsuite/simdag/comp-only-par/comp-only-par.c similarity index 100% rename from teshsuite/simdag/partask/par-comp_only_par.c rename to teshsuite/simdag/comp-only-par/comp-only-par.c diff --git a/teshsuite/simdag/comp-only-par/comp-only-par.tesh b/teshsuite/simdag/comp-only-par/comp-only-par.tesh new file mode 100644 index 0000000000..21adaf9428 --- /dev/null +++ b/teshsuite/simdag/comp-only-par/comp-only-par.tesh @@ -0,0 +1,11 @@ +p par task comp only, no comm, homogeneous +! output sort +$ ${bindir:=.}/comp-only-par ../platforms/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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. +> 1 + +p par task comp only, no comm, heterogeneous +! output sort +$ ${bindir:=.}/comp-only-par ../platforms/platform_2p_1sl_hetero.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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. +> 1 diff --git a/teshsuite/simdag/partask/par-comp_only_seq.c b/teshsuite/simdag/comp-only-seq/comp-only-seq.c similarity index 100% rename from teshsuite/simdag/partask/par-comp_only_seq.c rename to teshsuite/simdag/comp-only-seq/comp-only-seq.c diff --git a/teshsuite/simdag/comp-only-seq/comp-only-seq.tesh b/teshsuite/simdag/comp-only-seq/comp-only-seq.tesh new file mode 100644 index 0000000000..9b88759c07 --- /dev/null +++ b/teshsuite/simdag/comp-only-seq/comp-only-seq.tesh @@ -0,0 +1,6 @@ +p seq task comp only, no comm + +! output sort +$ ${bindir:=.}/comp-only-seq ../platforms/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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. +> 1 diff --git a/teshsuite/simdag/partask/CMakeLists.txt b/teshsuite/simdag/partask/CMakeLists.txt deleted file mode 100644 index 3d7143dabf..0000000000 --- a/teshsuite/simdag/partask/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -foreach(x par-comp_only_seq par-comp_only_par) - add_executable (${x} ${x}.c) - target_link_libraries(${x} simgrid) - - set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${x}.tesh) - set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}.c) - - ADD_TESH(tesh-simdag-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/partask/${x}.tesh) -endforeach() - -set(teshsuite_src ${teshsuite_src} PARENT_SCOPE) -set(tesh_files ${tesh_files} PARENT_SCOPE) -set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1sl_hetero.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1sl.xml PARENT_SCOPE) diff --git a/teshsuite/simdag/partask/par-comp_only_par.tesh b/teshsuite/simdag/partask/par-comp_only_par.tesh deleted file mode 100644 index 48fe9cdd52..0000000000 --- a/teshsuite/simdag/partask/par-comp_only_par.tesh +++ /dev/null @@ -1,12 +0,0 @@ - -p par task comp only, no comm, homogeneous -! output sort -$ simdag/partask/par-comp_only_par ${srcdir:=.}/simdag/partask/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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. -> 1 - -p par task comp only, no comm, heterogeneous -! output sort -$ simdag/partask/par-comp_only_par ${srcdir:=.}/simdag/partask/platform_2p_1sl_hetero.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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. -> 1 diff --git a/teshsuite/simdag/partask/par-comp_only_seq.tesh b/teshsuite/simdag/partask/par-comp_only_seq.tesh deleted file mode 100644 index 71dabe1049..0000000000 --- a/teshsuite/simdag/partask/par-comp_only_seq.tesh +++ /dev/null @@ -1,7 +0,0 @@ - -p seq task comp only, no comm - -! output sort -$ simdag/partask/par-comp_only_seq ${srcdir:=.}/simdag/partask/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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. -> 1 diff --git a/teshsuite/simdag/partask/platform_2p_1sl.xml b/teshsuite/simdag/partask/platform_2p_1sl.xml deleted file mode 100644 index 771d797818..0000000000 --- a/teshsuite/simdag/partask/platform_2p_1sl.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt index 419f5ef872..54f5b75c63 100644 --- a/teshsuite/simdag/platforms/CMakeLists.txt +++ b/teshsuite/simdag/platforms/CMakeLists.txt @@ -51,6 +51,7 @@ set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_Dijks ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1bb.xml ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1fl.xml ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1sl.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1sl_hetero.xml ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1switch.xml ${CMAKE_CURRENT_SOURCE_DIR}/bogus_disk_attachment.xml PARENT_SCOPE) set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/flatifier.cpp diff --git a/teshsuite/simdag/partask/platform_2p_1sl_hetero.xml b/teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml similarity index 100% rename from teshsuite/simdag/partask/platform_2p_1sl_hetero.xml rename to teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index f97e0b5da6..158a54f555 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -998,7 +998,6 @@ set(CMAKEFILES_TXT teshsuite/simdag/CMakeLists.txt teshsuite/simdag/basic/CMakeLists.txt - teshsuite/simdag/partask/CMakeLists.txt teshsuite/simdag/platforms/CMakeLists.txt teshsuite/simix/check_defaults/CMakeLists.txt