From 0c56e9ba0d24d9c85d33a22556f10b5c097a6f28 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Wed, 16 Mar 2016 13:34:38 +0100 Subject: [PATCH] mv bug-17132 to the smpi directory --- .gitignore | 2 +- teshsuite/bug-17132/CMakeLists.txt | 18 ------------------ teshsuite/bug-17132/hostfile.txt | 2 -- teshsuite/smpi/CMakeLists.txt | 2 +- teshsuite/{ => smpi}/bug-17132/bug-17132.c | 0 teshsuite/{ => smpi}/bug-17132/bug-17132.tesh | 6 +++--- tools/cmake/DefinePackages.cmake | 1 - 7 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 teshsuite/bug-17132/CMakeLists.txt delete mode 100644 teshsuite/bug-17132/hostfile.txt rename teshsuite/{ => smpi}/bug-17132/bug-17132.c (100%) rename teshsuite/{ => smpi}/bug-17132/bug-17132.tesh (54%) diff --git a/.gitignore b/.gitignore index 18ec1b3a05..0a8a52ed9a 100644 --- a/.gitignore +++ b/.gitignore @@ -256,7 +256,6 @@ examples/smpi/toto.txt examples/smpi/ttest01 src/replay/replay testall -teshsuite/bug-17132/bug-17132 teshsuite/datadesc_usage.out teshsuite/java/SemaphoreGC/SemaphoreGC_compiled teshsuite/java/SleepHostOff/SleepHostOff_compiled @@ -307,6 +306,7 @@ teshsuite/simdag/platforms/graphicator teshsuite/simdag/platforms/is_router_test teshsuite/simix/check_defaults/check_defaults teshsuite/simix/stack_overflow/stack_overflow +teshsuite/smpi/bug-17132/bug-17132 teshsuite/smpi/coll-allgather/coll-allgather teshsuite/smpi/coll-allgatherv/coll-allgatherv teshsuite/smpi/coll-allreduce/coll-allreduce diff --git a/teshsuite/bug-17132/CMakeLists.txt b/teshsuite/bug-17132/CMakeLists.txt deleted file mode 100644 index 55551b6d7e..0000000000 --- a/teshsuite/bug-17132/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -if(enable_smpi) - if(WIN32) - set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h") - else() - set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") - endif() - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - - add_executable (bug-17132 bug-17132.c) - target_link_libraries(bug-17132 simgrid) - - ADD_TESH_FACTORIES(tesh-smpi-bug-17132 "thread" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/bug-17132 --cd ${CMAKE_BINARY_DIR}/teshsuite/bug-17132 ${CMAKE_HOME_DIRECTORY}/teshsuite/bug-17132/bug-17132.tesh) -endif(enable_smpi) - -set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/bug-17132.tesh PARENT_SCOPE) -set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/bug-17132.c PARENT_SCOPE) -set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/hostfile.txt PARENT_SCOPE) - diff --git a/teshsuite/bug-17132/hostfile.txt b/teshsuite/bug-17132/hostfile.txt deleted file mode 100644 index 3ab05f5e72..0000000000 --- a/teshsuite/bug-17132/hostfile.txt +++ /dev/null @@ -1,2 +0,0 @@ -Tremblay -Jupiter diff --git a/teshsuite/smpi/CMakeLists.txt b/teshsuite/smpi/CMakeLists.txt index 51b69e433d..6c12f2cc05 100644 --- a/teshsuite/smpi/CMakeLists.txt +++ b/teshsuite/smpi/CMakeLists.txt @@ -8,7 +8,7 @@ if(enable_smpi) include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") foreach(x coll-allgather coll-allgatherv coll-allreduce coll-alltoall coll-alltoallv coll-barrier coll-bcast coll-gather coll-reduce coll-reduce-scatter coll-scatter pt2pt-dsend pt2pt-pingpong - type-hvector type-indexed type-struct type-vector) + type-hvector type-indexed type-struct type-vector bug-17132) 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/bug-17132/bug-17132.c b/teshsuite/smpi/bug-17132/bug-17132.c similarity index 100% rename from teshsuite/bug-17132/bug-17132.c rename to teshsuite/smpi/bug-17132/bug-17132.c diff --git a/teshsuite/bug-17132/bug-17132.tesh b/teshsuite/smpi/bug-17132/bug-17132.tesh similarity index 54% rename from teshsuite/bug-17132/bug-17132.tesh rename to teshsuite/smpi/bug-17132/bug-17132.tesh index 02351ba99f..2545b6bcb3 100644 --- a/teshsuite/bug-17132/bug-17132.tesh +++ b/teshsuite/smpi/bug-17132/bug-17132.tesh @@ -1,7 +1,7 @@ -$ ../../smpi_script/bin/smpirun -np 16 -platform ${srcdir:=.}/../../examples/platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile.txt ./bug-17132 --cfg=smpi/cpu_threshold:-1 --log=smpi_kernel.thres:warning -> You requested to use 16 processes, but there is only 2 processes in your hostfile... +$ ${bindir:=.}/../../../bin/smpirun -np 16 -platform ../../../examples/platforms/small_platform.xml -hostfile ../hostfile ${bindir:=.}/bug-17132 --cfg=smpi/cpu_threshold:-1 --log=smpi_kernel.thres:warning +> You requested to use 16 processes, but there is only 5 processes in your hostfile... > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu_threshold' to '-1' -> Walltime = 0.420419 +> Walltime = 0.468274 \ No newline at end of file diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 5047e92390..d5df41aa31 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -987,7 +987,6 @@ set(CMAKEFILES_TXT examples/smpi/energy/f77/CMakeLists.txt examples/smpi/energy/f90/CMakeLists.txt - teshsuite/bug-17132/CMakeLists.txt teshsuite/java/CMakeLists.txt teshsuite/mc/CMakeLists.txt teshsuite/mc/dwarf/CMakeLists.txt -- 2.20.1