From: Frederic Suter Date: Fri, 4 Mar 2016 14:06:39 +0000 (+0100) Subject: cmake refactoring in teshuite/smpi cont'd X-Git-Tag: v3_13~561^2~3 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/bcd50afc8279afbeed3aa52ff1976b7d11da2ccb cmake refactoring in teshuite/smpi cont'd --- diff --git a/.gitignore b/.gitignore index 752821955e..34a055fca5 100644 --- a/.gitignore +++ b/.gitignore @@ -313,8 +313,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/allgather/allgather_coll -teshsuite/smpi/allgather_coll +teshsuite/smpi/coll-allgather/coll-allgather teshsuite/smpi/allgatherv/allgatherv_coll teshsuite/smpi/allgatherv_coll teshsuite/smpi/allreduce/allreduce @@ -331,11 +330,7 @@ teshsuite/smpi/alltoallv/alltoallv_coll teshsuite/smpi/alltoallv_coll teshsuite/smpi/barrier/barrier_coll teshsuite/smpi/barrier_coll -teshsuite/smpi/bcast/bcast -teshsuite/smpi/bcast/bcast_coll -teshsuite/smpi/bcast_coll -teshsuite/smpi/compute2 -teshsuite/smpi/compute3 +teshsuite/smpi/coll-bcast/coll-bcast teshsuite/smpi/compute/compute teshsuite/smpi/compute/compute2 teshsuite/smpi/compute/compute3 @@ -343,8 +338,7 @@ teshsuite/smpi/dsend teshsuite/smpi/gather_coll teshsuite/smpi/gather/gather_coll teshsuite/smpi/type-hvector/type-hvector -teshsuite/smpi/indexed/indexed_test -teshsuite/smpi/indexed_test +teshsuite/smpi/type-indexed/type-indexed teshsuite/smpi/isp/umpire/abort teshsuite/smpi/isp/umpire/abort1 teshsuite/smpi/isp/umpire/abort2 diff --git a/teshsuite/smpi/CMakeLists.txt b/teshsuite/smpi/CMakeLists.txt index 6b946c1e8b..530c91ad7c 100644 --- a/teshsuite/smpi/CMakeLists.txt +++ b/teshsuite/smpi/CMakeLists.txt @@ -6,7 +6,7 @@ if(enable_smpi) endif() include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - foreach(x type-hvector type-struct type-vector) + foreach(x coll-allgather coll-bcast type-hvector type-indexed type-struct type-vector) add_executable (${x} ${x}/${x}.c) target_link_libraries(${x} simgrid) set_target_properties(${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x}) @@ -14,7 +14,19 @@ if(enable_smpi) set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh) set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.c) - ADD_TESH_FACTORIES(tesh-smpi-${x} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/${x} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/${x} ${x}.tesh) + ADD_TESH_FACTORIES(tesh-smpi-${x} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/${x} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/${x} ${x}.tesh) + endforeach() + + foreach (ALLGATHER_COLL 2dmesh 3dmesh bruck GB loosely_lr NTSLR_NB pair rdb rhv ring SMP_NTS smp_simple + spreading_simple ompi mpich ompi_neighborexchange mvapich2 mvapich2_smp impi) + ADD_TESH(tesh-smpi-coll-allgather-${ALLGATHER_COLL} --cfg smpi/allgather:${ALLGATHER_COLL} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/coll-allgather --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/coll-allgather coll-allgather.tesh) + endforeach() + + foreach (BCAST_COLL arrival_pattern_aware arrival_pattern_aware_wait arrival_scatter binomial_tree flattree + flattree_pipeline NTSB NTSL NTSL_Isend scatter_LR_allgather scatter_rdb_allgather SMP_binary + SMP_binomial SMP_linear ompi mpich ompi_split_bintree ompi_pipeline mvapich2 mvapich2_intra_node + mvapich2_knomial_intra_node impi) + ADD_TESH(tesh-smpi-coll-bcast-${BCAST_COLL} --cfg smpi/bcast:${BCAST_COLL} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/coll-bcast --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/coll-bcast coll-bcast.tesh) endforeach() endif() diff --git a/teshsuite/smpi/allgather/CMakeLists.txt b/teshsuite/smpi/allgather/CMakeLists.txt deleted file mode 100644 index 115a5216f6..0000000000 --- a/teshsuite/smpi/allgather/CMakeLists.txt +++ /dev/null @@ -1,20 +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 (allgather_coll allgather_coll.c) - target_link_libraries(allgather_coll simgrid) -endif() - -set(tesh_files - ${tesh_files} - ${CMAKE_CURRENT_SOURCE_DIR}/allgather_coll.tesh - PARENT_SCOPE) -set(examples_src - ${examples_src} - ${CMAKE_CURRENT_SOURCE_DIR}/allgather_coll.c - PARENT_SCOPE) diff --git a/teshsuite/smpi/bcast/CMakeLists.txt b/teshsuite/smpi/bcast/CMakeLists.txt deleted file mode 100644 index 9789588162..0000000000 --- a/teshsuite/smpi/bcast/CMakeLists.txt +++ /dev/null @@ -1,24 +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 (bcast bcast.c) - target_link_libraries(bcast simgrid) - add_executable (bcast_coll bcast_coll.c) - target_link_libraries(bcast_coll simgrid) -endif() - -set(tesh_files - ${tesh_files} - ${CMAKE_CURRENT_SOURCE_DIR}/bcast.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/bcast_coll.tesh - PARENT_SCOPE) -set(examples_src - ${examples_src} - ${CMAKE_CURRENT_SOURCE_DIR}/bcast.c - ${CMAKE_CURRENT_SOURCE_DIR}/bcast_coll.c - PARENT_SCOPE) diff --git a/teshsuite/smpi/bcast/bcast.c b/teshsuite/smpi/bcast/bcast.c deleted file mode 100644 index e0bff2db7f..0000000000 --- a/teshsuite/smpi/bcast/bcast.c +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright (c) 2009, 2012-2014. 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 -#include - -int main(int argc, char **argv) -{ - int size, rank; - int value = 3; - double start_timer; - int quiet = 0; - - MPI_Init(&argc, &argv); - MPI_Comm_size(MPI_COMM_WORLD, &size); - MPI_Comm_rank(MPI_COMM_WORLD, &rank); - - if (argc > 1 && !strcmp(argv[1], "-q")) - quiet = 1; - - start_timer = MPI_Wtime(); - - if (0 == rank) { - value = 17; - } - MPI_Bcast(&value, 1, MPI_INT, 0, MPI_COMM_WORLD); - if (value != 17) { - printf("node %d has value %d after broadcast\n", rank, value); - } - - MPI_Barrier(MPI_COMM_WORLD); - if (0 == rank && !quiet) - printf("Elapsed time on rank %d: %f s\n", rank, - MPI_Wtime() - start_timer); - MPI_Finalize(); - return 0; -} diff --git a/teshsuite/smpi/bcast/bcast.tesh b/teshsuite/smpi/bcast/bcast.tesh deleted file mode 100644 index 52b639a3a9..0000000000 --- a/teshsuite/smpi/bcast/bcast.tesh +++ /dev/null @@ -1,44 +0,0 @@ -# use the tested library, not the installed one -# (since we want to pass it to the child, it has to be redefined before each command) -# Go for the first test -p Test Broadcast with less processes than hosts -$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 3 ${bindir:=.}/bcast -q --log=smpi_kernel.thres:warning -> [rank 0] -> Tremblay -> [rank 1] -> Tremblay -> [rank 2] -> Tremblay -> [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' - -# second test -p Test Broadcast with as much processes than hosts -! setenv LD_LIBRARY_PATH=../../lib -$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 5 ${bindir:=.}/bcast -q --log=smpi_kernel.thres:warning -> [rank 0] -> Tremblay -> [rank 1] -> Tremblay -> [rank 2] -> Tremblay -> [rank 3] -> Tremblay -> [rank 4] -> Jupiter -> [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' - -# Another test -p Test Broadcast with more processes than hosts -! setenv LD_LIBRARY_PATH=../../lib -$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 12 ${bindir:=.}/bcast -q --log=smpi_kernel.thres:warning -> [rank 0] -> Tremblay -> [rank 1] -> Tremblay -> [rank 2] -> Tremblay -> [rank 3] -> Tremblay -> [rank 4] -> Jupiter -> [rank 5] -> Jupiter -> [rank 6] -> Jupiter -> [rank 7] -> Jupiter -> [rank 8] -> Fafard -> [rank 9] -> Fafard -> [rank 10] -> Fafard -> [rank 11] -> Fafard -> [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' diff --git a/teshsuite/smpi/allgather/allgather_coll.c b/teshsuite/smpi/coll-allgather/coll-allgather.c similarity index 99% rename from teshsuite/smpi/allgather/allgather_coll.c rename to teshsuite/smpi/coll-allgather/coll-allgather.c index 045154b4cc..753aef82b4 100644 --- a/teshsuite/smpi/allgather/allgather_coll.c +++ b/teshsuite/smpi/coll-allgather/coll-allgather.c @@ -48,7 +48,6 @@ int main(int argc, char *argv[]) printf("%d ", rb[i]); printf("]\n"); - if (rank == 0) { if (status != MPI_SUCCESS) { printf("allgather returned %d\n", status); diff --git a/teshsuite/smpi/allgather/allgather_coll.tesh b/teshsuite/smpi/coll-allgather/coll-allgather.tesh similarity index 97% rename from teshsuite/smpi/allgather/allgather_coll.tesh rename to teshsuite/smpi/coll-allgather/coll-allgather.tesh index d727e4f8dd..6778ee1c5c 100644 --- a/teshsuite/smpi/allgather/allgather_coll.tesh +++ b/teshsuite/smpi/coll-allgather/coll-allgather.tesh @@ -3,7 +3,7 @@ ! output sort p Test all to all -$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/allgather_coll --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/coll-allgather --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error > [rank 0] -> Tremblay > [rank 1] -> Tremblay > [rank 2] -> Tremblay diff --git a/teshsuite/smpi/bcast/bcast_coll.c b/teshsuite/smpi/coll-bcast/coll-bcast.c similarity index 88% rename from teshsuite/smpi/bcast/bcast_coll.c rename to teshsuite/smpi/coll-bcast/coll-bcast.c index bceaf4087c..0e22735ee8 100644 --- a/teshsuite/smpi/bcast/bcast_coll.c +++ b/teshsuite/smpi/coll-bcast/coll-bcast.c @@ -11,14 +11,12 @@ int main(int argc, char **argv) { int i, size, rank; int count = 2048; - int *values; - int status; MPI_Init(&argc, &argv); MPI_Comm_size(MPI_COMM_WORLD, &size); MPI_Comm_rank(MPI_COMM_WORLD, &rank); - - values = (int *) xbt_malloc(count * sizeof(int)); + + int *values = (int *) xbt_malloc(count * sizeof(int)); for (i = 0; i < count; i++) values[i] = (0 == rank) ? 17 : 3; @@ -39,16 +37,13 @@ int main(int argc, char **argv) for (i = 0; i < count; i++) values[i] = (size -1 == rank) ? 17 : 3; - status = MPI_Bcast(values, count, MPI_INT, size-1, MPI_COMM_WORLD); + int status = MPI_Bcast(values, count, MPI_INT, size-1, MPI_COMM_WORLD); good = 0; for (i = 0; i < count; i++) if (values[i]==17) good++; printf("[%d] number of values equals to 17: %d\n", rank, good); - - - if (rank == 0) { if (status != MPI_SUCCESS) { printf("bcast returned %d\n", status); diff --git a/teshsuite/smpi/bcast/bcast_coll.tesh b/teshsuite/smpi/coll-bcast/coll-bcast.tesh similarity index 96% rename from teshsuite/smpi/bcast/bcast_coll.tesh rename to teshsuite/smpi/coll-bcast/coll-bcast.tesh index d4201b9bce..9155454d25 100644 --- a/teshsuite/smpi/bcast/bcast_coll.tesh +++ b/teshsuite/smpi/coll-bcast/coll-bcast.tesh @@ -2,7 +2,7 @@ p Test Broadcast with more processes than hosts ! setenv LD_LIBRARY_PATH=../../lib ! output sort -$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/bcast_coll --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/coll-bcast --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error > [rank 0] -> Tremblay > [rank 1] -> Tremblay > [rank 2] -> Tremblay diff --git a/teshsuite/smpi/indexed/CMakeLists.txt b/teshsuite/smpi/indexed/CMakeLists.txt deleted file mode 100644 index c0b9b2e545..0000000000 --- a/teshsuite/smpi/indexed/CMakeLists.txt +++ /dev/null @@ -1,20 +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 (indexed_test indexed_test.c) - target_link_libraries(indexed_test simgrid) -endif() - -set(tesh_files - ${tesh_files} - ${CMAKE_CURRENT_SOURCE_DIR}/indexed.tesh - PARENT_SCOPE) -set(examples_src - ${examples_src} - ${CMAKE_CURRENT_SOURCE_DIR}/indexed_test.c - PARENT_SCOPE) diff --git a/teshsuite/smpi/indexed/indexed_test.c b/teshsuite/smpi/type-indexed/type-indexed.c similarity index 94% rename from teshsuite/smpi/indexed/indexed_test.c rename to teshsuite/smpi/type-indexed/type-indexed.c index 4ceed68d32..aba7275ca9 100644 --- a/teshsuite/smpi/indexed/indexed_test.c +++ b/teshsuite/smpi/type-indexed/type-indexed.c @@ -18,8 +18,7 @@ int main(int argc, char *argv[]) MPI_Init(&argc, &argv); MPI_Comm_size(MPI_COMM_WORLD, &size); - if (size < 2) - { + if (size < 2) { printf("Please run with 2 processes.\n"); MPI_Finalize(); return 1; @@ -31,15 +30,13 @@ int main(int argc, char *argv[]) MPI_Type_indexed(3, blocklen, displacement, type2, &type); MPI_Type_commit(&type); - if (rank == 0) - { + if (rank == 0) { for (i=0; i<27; i++) buffer[i] = i; MPI_Send(buffer, 1, type, 1, 123, MPI_COMM_WORLD); } - if (rank == 1) - { + if (rank == 1) { for (i=0; i<27; i++) buffer[i] = -1; MPI_Recv(buffer, 1, type, 0, 123, MPI_COMM_WORLD, &status); diff --git a/teshsuite/smpi/indexed/indexed.tesh b/teshsuite/smpi/type-indexed/type-indexed.tesh similarity index 94% rename from teshsuite/smpi/indexed/indexed.tesh rename to teshsuite/smpi/type-indexed/type-indexed.tesh index 75053c409d..7ee71b54d7 100644 --- a/teshsuite/smpi/indexed/indexed.tesh +++ b/teshsuite/smpi/type-indexed/type-indexed.tesh @@ -1,7 +1,7 @@ p Test indexed ! setenv LD_LIBRARY_PATH=../../lib ! output sort -$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 2 ${bindir:=.}/indexed_test -q --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 2 ${bindir:=.}/type-indexed -q --log=smpi_kernel.thres:warning > [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' diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 0ea82f69d2..03265d66de 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -1052,16 +1052,13 @@ set(CMAKEFILES_TXT teshsuite/simix/stack_overflow/CMakeLists.txt teshsuite/smpi/CMakeLists.txt - teshsuite/smpi/allgather/CMakeLists.txt teshsuite/smpi/allgatherv/CMakeLists.txt teshsuite/smpi/allreduce/CMakeLists.txt teshsuite/smpi/alltoall/CMakeLists.txt teshsuite/smpi/alltoallv/CMakeLists.txt teshsuite/smpi/barrier/CMakeLists.txt - teshsuite/smpi/bcast/CMakeLists.txt teshsuite/smpi/compute/CMakeLists.txt teshsuite/smpi/gather/CMakeLists.txt - teshsuite/smpi/indexed/CMakeLists.txt teshsuite/smpi/pingpong/CMakeLists.txt teshsuite/smpi/reduce/CMakeLists.txt teshsuite/smpi/scatter/CMakeLists.txt diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake index 772a7c6f89..14da841929 100644 --- a/tools/cmake/Tests.cmake +++ b/tools/cmake/Tests.cmake @@ -173,7 +173,6 @@ IF(NOT enable_memcheck) #ADD_TESH(test-xbt-parmap --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/parmap_bench --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/parmap_bench parmap_bench.tesh) # END TESH TESTS - ## INTERFACES ## ### MSG ### # BEGIN TESH TESTS @@ -257,7 +256,6 @@ IF(NOT enable_memcheck) ADD_TESH_FACTORIES(s4u-basic "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/s4u/basic --cd ${CMAKE_HOME_DIRECTORY}/examples/s4u/basic s4u_basic.tesh) ADD_TESH_FACTORIES(s4u-io "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/s4u/io --cd ${CMAKE_HOME_DIRECTORY}/examples/s4u/io s4u_io.tesh) - ### SIMDAG ### # BEGIN TESH TESTS # these tests need the assertion mechanism @@ -307,9 +305,7 @@ IF(NOT enable_memcheck) # BEGIN TESH TESTS # smpi examples ADD_TESH_FACTORIES(tesh-smpi-pt2pt "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/pingpong --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/pingpong pt2pt.tesh) - ADD_TESH_FACTORIES(tesh-smpi-bcast "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/bcast --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/bcast bcast.tesh) ADD_TESH_FACTORIES(tesh-smpi-reduce "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/reduce --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/reduce reduce.tesh) - ADD_TESH_FACTORIES(tesh-smpi-indexed "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/indexed --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/indexed indexed.tesh) ADD_TESH_FACTORIES(tesh-smpi-compute "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/compute --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/compute compute.tesh) # smpi broken usage ADD_TESH_FACTORIES(tesh-smpi-broken "thread" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/pingpong --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/pingpong broken_hostfiles.tesh) @@ -317,11 +313,7 @@ IF(NOT enable_memcheck) FOREACH (GATHER_COLL default ompi mpich ompi_basic_linear ompi_linear_sync ompi_binomial mvapich2 mvapich2_two_level impi) ADD_TESH(tesh-smpi-gather-coll-${GATHER_COLL} --cfg smpi/gather:${GATHER_COLL} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/gather --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/gather gather_coll.tesh) ENDFOREACH() - FOREACH (ALLGATHER_COLL default 2dmesh 3dmesh bruck GB loosely_lr - NTSLR NTSLR_NB pair rdb rhv ring SMP_NTS - smp_simple spreading_simple ompi mpich ompi_neighborexchange mvapich2 mvapich2_smp impi) - ADD_TESH(tesh-smpi-allgather-coll-${ALLGATHER_COLL} --cfg smpi/allgather:${ALLGATHER_COLL} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/allgather --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/allgather allgather_coll.tesh) - ENDFOREACH() + FOREACH (ALLGATHERV_COLL default GB pair ring ompi mpich ompi_neighborexchange ompi_bruck mpich_rdb mpich_ring mvapich2 impi) ADD_TESH(tesh-smpi-allgatherv-coll-${ALLGATHERV_COLL} --cfg smpi/allgatherv:${ALLGATHERV_COLL} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/allgatherv --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/allgatherv allgatherv_coll.tesh) ENDFOREACH() @@ -345,11 +337,7 @@ IF(NOT enable_memcheck) ring_mpi_barrier ring_one_barrier bruck ompi mpich mvapich2 ompi_basic_linear impi) ADD_TESH(tesh-smpi-alltoallv-coll-${ALLTOALLV_COLL} --cfg smpi/alltoallv:${ALLTOALLV_COLL} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/alltoallv --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/alltoallv alltoallv_coll.tesh) ENDFOREACH() - FOREACH (BCAST_COLL default arrival_pattern_aware arrival_pattern_aware_wait arrival_scatter - binomial_tree flattree flattree_pipeline NTSB NTSL NTSL_Isend scatter_LR_allgather - scatter_rdb_allgather SMP_binary SMP_binomial SMP_linear ompi mpich ompi_split_bintree ompi_pipeline mvapich2 mvapich2_intra_node mvapich2_knomial_intra_node impi) - ADD_TESH(tesh-smpi-bcast-coll-${BCAST_COLL} --cfg smpi/bcast:${BCAST_COLL} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/bcast --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/bcast bcast_coll.tesh) - ENDFOREACH() + FOREACH (REDUCE_COLL default arrival_pattern_aware binomial flat_tree NTSL scatter_gather ompi mpich ompi_chain ompi_binary ompi_basic_linear ompi_binomial ompi_in_order_binary mvapich2 mvapich2_knomial mvapich2_two_level impi rab) ADD_TESH(tesh-smpi-reduce-coll-${REDUCE_COLL} --cfg smpi/reduce:${REDUCE_COLL} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/reduce --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/reduce reduce_coll.tesh) ENDFOREACH() @@ -425,9 +413,7 @@ IF(NOT enable_memcheck) ### LUA ### # BEGIN TESH TESTS IF(HAVE_LUA) - # Tests testing simulation from C but using lua for platform files. Executed - # like this - # + # Tests testing simulation from C but using lua for platform files. Executed like this # ~$ ./masterslave platform.lua deploy.lua ADD_TESH(lua-platform-masterslave --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/lua --cd ${CMAKE_BINARY_DIR}/examples/lua ${CMAKE_HOME_DIRECTORY}/teshsuite/lua/lua_platforms.tesh) SET_TESTS_PROPERTIES(lua-platform-masterslave PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") @@ -466,7 +452,6 @@ IF(NOT enable_memcheck) ENDIF() ENDIF() - ## OTHER ## ADD_TEST(testall ${CMAKE_BINARY_DIR}/testall)