From: Paul Bédaride Date: Mon, 5 May 2014 11:38:04 +0000 (+0200) Subject: Restructure teshsuite smpi X-Git-Tag: v3_11~98^2~6 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9c5a3a5cae5517b0bff451bfe850395e8665e84a?ds=sidebyside Restructure teshsuite smpi --- diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index a329585c8b..8d861a3d29 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -287,16 +287,16 @@ if(NOT enable_memcheck) if(enable_smpi) # smpi examples - ADD_TESH_FACTORIES(smpi-bcast "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/bcast.tesh) - ADD_TESH_FACTORIES(smpi-reduce "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/reduce.tesh) - ADD_TESH_FACTORIES(smpi-vector "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/vector.tesh) - ADD_TESH_FACTORIES(smpi-hvector "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/hvector.tesh) - ADD_TESH_FACTORIES(smpi-indexed "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/indexed.tesh) - ADD_TESH_FACTORIES(smpi-struct "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/struct.tesh) - ADD_TESH_FACTORIES(smpi-pt2pt "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/pt2pt.tesh) - ADD_TESH_FACTORIES(smpi-compute "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/compute.tesh) + ADD_TESH_FACTORIES(smpi-bcast "thread;ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/bcast --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/bcast bcast.tesh) + ADD_TESH_FACTORIES(smpi-reduce "thread;ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/reduce --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/reduce reduce.tesh) + ADD_TESH_FACTORIES(smpi-vector "thread;ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/vector --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/vector vector.tesh) + ADD_TESH_FACTORIES(smpi-hvector "thread;ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/hvector --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/hvector hvector.tesh) + ADD_TESH_FACTORIES(smpi-indexed "thread;ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/indexed --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/indexed indexed.tesh) + ADD_TESH_FACTORIES(smpi-struct "thread;ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/struct --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/struct struct.tesh) + ADD_TESH_FACTORIES(smpi-pt2pt "thread;ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/pingpong --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/pingpong pt2pt.tesh) + ADD_TESH_FACTORIES(smpi-compute "thread;ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/compute --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/compute compute.tesh) if (NOT WIN32) - ADD_TESH_FACTORIES(smpi-shared "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/shared.tesh) + ADD_TESH_FACTORIES(smpi-shared "thread;ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/shared --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/shared shared.tesh) endif() # https://gforge.inria.fr/tracker/index.php?func=detail&aid=17132&group_id=12&atid=165 @@ -316,66 +316,66 @@ if(NOT enable_memcheck) if(HAVE_TRACING) ADD_TESH(smpi-tracing-ptp --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/tracing/smpi_traced.tesh) ADD_TESH(smpi-replay --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/replay/smpi_replay.tesh) - ADD_TESH(smpi-replay-ti-tracing --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/TI_output.tesh) + ADD_TESH(smpi-replay-ti-tracing --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/pingpong --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/pingpong TI_output.tesh) endif() FOREACH (GATHER_COLL default ompi mpich ompi_basic_linear ompi_linear_sync ompi_binomial) - ADD_TESH(smpi-gather-coll-${GATHER_COLL} --cfg smpi/gather:${GATHER_COLL} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/gather_coll.tesh) + ADD_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) - ADD_TESH(smpi-allgather-coll-${ALLGATHER_COLL} --cfg smpi/allgather:${ALLGATHER_COLL} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/allgather_coll.tesh) + ADD_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) - ADD_TESH(smpi-allgatherv-coll-${ALLGATHERV_COLL} --cfg smpi/allgatherv:${ALLGATHERV_COLL} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/allgatherv_coll.tesh) + ADD_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() FOREACH (ALLREDUCE_COLL default lr rab1 rab2 rab_rdb rdb smp_binomial smp_binomial_pipeline smp_rdb smp_rsag smp_rsag_lr smp_rsag_rab redbcast ompi mpich ompi_ring_segmented) - ADD_TESH(smpi-allreduce-coll-${ALLREDUCE_COLL} --cfg smpi/allreduce:${ALLREDUCE_COLL} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/allreduce_coll.tesh) + ADD_TESH(smpi-allreduce-coll-${ALLREDUCE_COLL} --cfg smpi/allreduce:${ALLREDUCE_COLL} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/allreduce --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/allreduce allreduce_coll.tesh) ENDFOREACH() FOREACH (ALLREDUCE_COLL_LARGE ompi_ring_segmented) - ADD_TESH(smpi-allreduce-coll-large-${ALLREDUCE_COLL_LARGE} --cfg smpi/allreduce:${ALLREDUCE_COLL_LARGE} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/allreduce_coll_large.tesh) + ADD_TESH(smpi-allreduce-coll-large-${ALLREDUCE_COLL_LARGE} --cfg smpi/allreduce:${ALLREDUCE_COLL_LARGE} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/allreduce --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/allreduce allreduce_coll_large.tesh) ENDFOREACH() FOREACH (ALLTOALL_COLL 2dmesh 3dmesh pair pair_one_barrier pair_light_barrier pair_mpi_barrier rdb ring ring_light_barrier ring_mpi_barrier ring_one_barrier bruck basic_linear ompi mpich) - ADD_TESH(smpi-alltoall-coll-${ALLTOALL_COLL} --cfg smpi/alltoall:${ALLTOALL_COLL} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/alltoall_coll.tesh) + ADD_TESH(smpi-alltoall-coll-${ALLTOALL_COLL} --cfg smpi/alltoall:${ALLTOALL_COLL} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/alltoall --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/alltoall alltoall_coll.tesh) ENDFOREACH() FOREACH (ALLTOALLV_COLL default pair pair_light_barrier pair_mpi_barrier pair_one_barrier ring ring_light_barrier ring_mpi_barrier ring_one_barrier bruck ompi mpich ompi_basic_linear) - ADD_TESH(smpi-alltoallv-coll-${ALLTOALLV_COLL} --cfg smpi/alltoallv:${ALLTOALLV_COLL} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/alltoallv_coll.tesh) + ADD_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) - ADD_TESH(smpi-bcast-coll-${BCAST_COLL} --cfg smpi/bcast:${BCAST_COLL} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/bcast_coll.tesh) + ADD_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) - ADD_TESH(smpi-reduce-coll-${REDUCE_COLL} --cfg smpi/reduce:${REDUCE_COLL} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/reduce_coll.tesh) + ADD_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() FOREACH (REDUCE_SCATTER_COLL default ompi mpich ompi_basic_recursivehalving ompi_ring mpich_noncomm mpich_pair mpich_rdb) - ADD_TESH(smpi-reduce-scatter-coll-${REDUCE_SCATTER_COLL} --cfg smpi/reduce_scatter:${REDUCE_SCATTER_COLL} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/reduce_scatter_coll.tesh) + ADD_TESH(smpi-reduce-scatter-coll-${REDUCE_SCATTER_COLL} --cfg smpi/reduce_scatter:${REDUCE_SCATTER_COLL} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/reduce --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/reduce reduce_scatter_coll.tesh) ENDFOREACH() FOREACH (SCATTER_COLL default ompi mpich ompi_basic_linear ompi_binomial) - ADD_TESH(smpi-scatter-coll-${SCATTER_COLL} --cfg smpi/scatter:${SCATTER_COLL} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/scatter_coll.tesh) + ADD_TESH(smpi-scatter-coll-${SCATTER_COLL} --cfg smpi/scatter:${SCATTER_COLL} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/scatter --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/scatter scatter_coll.tesh) ENDFOREACH() FOREACH (BARRIER_COLL default ompi mpich ompi_basic_linear ompi_tree ompi_bruck ompi_recursivedoubling ompi_doublering) - ADD_TESH(smpi-barrier-coll-${BARRIER_COLL} --cfg smpi/barrier:${BARRIER_COLL} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/barrier_coll.tesh) + ADD_TESH(smpi-barrier-coll-${BARRIER_COLL} --cfg smpi/barrier:${BARRIER_COLL} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/barrier --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/barrier barrier_coll.tesh) ENDFOREACH() endif() diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index d13fad30a4..8a3650d0aa 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -1022,6 +1022,23 @@ set(TESHSUITE_CMAKEFILES_TXT teshsuite/simix/check_defaults/CMakeLists.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/hvector/CMakeLists.txt + teshsuite/smpi/indexed/CMakeLists.txt + teshsuite/smpi/pingpong/CMakeLists.txt + teshsuite/smpi/reduce/CMakeLists.txt + teshsuite/smpi/scatter/CMakeLists.txt + teshsuite/smpi/shared/CMakeLists.txt + teshsuite/smpi/struct/CMakeLists.txt + teshsuite/smpi/vector/CMakeLists.txt teshsuite/smpi/mpich3-test/CMakeLists.txt teshsuite/smpi/mpich3-test/attr/CMakeLists.txt teshsuite/smpi/mpich3-test/coll/CMakeLists.txt diff --git a/buildtools/Cmake/MakeExe.cmake b/buildtools/Cmake/MakeExe.cmake index e1e8876441..8c3a10751d 100644 --- a/buildtools/Cmake/MakeExe.cmake +++ b/buildtools/Cmake/MakeExe.cmake @@ -107,7 +107,24 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/bug-17132) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check_defaults) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simix/stack_overflow) -add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/allgather) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/allgatherv) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/allreduce) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/alltoall) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/alltoallv) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/barrier) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/bcast) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/compute) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/gather) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/hvector) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/indexed) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/pingpong) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/reduce) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/scatter) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/shared) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/struct) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/vector) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/attr) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/coll) diff --git a/teshsuite/smpi/CMakeLists.txt b/teshsuite/smpi/CMakeLists.txt index e24465cf88..e1316e536b 100644 --- a/teshsuite/smpi/CMakeLists.txt +++ b/teshsuite/smpi/CMakeLists.txt @@ -6,102 +6,12 @@ if(enable_smpi) else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(gather_coll gather_coll.c) - add_executable(allgather_coll allgather_coll.c) - add_executable(allgatherv_coll allgatherv_coll.c) - add_executable(alltoall2 alltoall2.c) - add_executable(alltoall_basic alltoall_basic.c) - add_executable(alltoall_coll alltoall_coll.c) - add_executable(alltoallv_coll alltoallv_coll.c) - add_executable(allreduce allreduce.c) - add_executable(allreduce_coll allreduce_coll.c) - add_executable(bcast bcast.c) - add_executable(bcast_coll bcast_coll.c) - add_executable(barrier_coll barrier.c ) - add_executable(compute compute.c) - add_executable(compute2 compute2.c) - add_executable(compute3 compute3.c) - add_executable(pingpong pingpong.c) - add_executable(scatter scatter.c) - add_executable(reduce reduce.c) - add_executable(reduce_coll reduce_coll.c) - add_executable(reduce_scatter_coll reduce_scatter_coll.c) - add_executable(split split.c) - add_executable(smpi_sendrecv sendrecv.c) - add_executable(ttest01 ttest01.c) - add_executable(vector_test vector_test.c) - add_executable(hvector_test hvector_test.c) - add_executable(indexed_test indexed_test.c) - add_executable(struct_test struct_test.c) - add_executable(dsend dsend.c) - - target_link_libraries(gather_coll simgrid) - target_link_libraries(allgather_coll simgrid) - target_link_libraries(allgatherv_coll simgrid) - target_link_libraries(alltoall2 simgrid) - target_link_libraries(alltoall_basic simgrid) - target_link_libraries(alltoall_coll simgrid) - target_link_libraries(alltoallv_coll simgrid) - target_link_libraries(allreduce simgrid) - target_link_libraries(allreduce_coll simgrid) - target_link_libraries(bcast simgrid) - target_link_libraries(bcast_coll simgrid) - target_link_libraries(barrier_coll simgrid) - target_link_libraries(compute simgrid) - target_link_libraries(compute2 simgrid) - target_link_libraries(compute3 simgrid) - target_link_libraries(pingpong simgrid) - target_link_libraries(scatter simgrid) - target_link_libraries(reduce simgrid) - target_link_libraries(reduce_coll simgrid) - target_link_libraries(reduce_scatter_coll simgrid) - target_link_libraries(split simgrid) - target_link_libraries(smpi_sendrecv simgrid) - target_link_libraries(ttest01 simgrid) - target_link_libraries(vector_test simgrid) - target_link_libraries(hvector_test simgrid) - target_link_libraries(indexed_test simgrid) - target_link_libraries(struct_test simgrid) - target_link_libraries(dsend simgrid) - - set_target_properties(smpi_sendrecv PROPERTIES RENAME sendrecv) - - if(NOT WIN32) - add_executable(shared shared.c) - target_link_libraries(shared simgrid) - endif() - endif() set(tesh_files ${tesh_files} - ${CMAKE_CURRENT_SOURCE_DIR}/gather_coll.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/allgather_coll.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/allgatherv_coll.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/allreduce_coll.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/allreduce_coll_large.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/alltoall_coll.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/alltoallv_coll.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/scatter_coll.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/barrier_coll.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/bcast.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/bcast_coll.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/compute.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/shared.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/hvector.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/indexed.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/pt2pt.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/reduce.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/reduce_coll.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/reduce_scatter_coll.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/struct.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/vector.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/TI_output.tesh PARENT_SCOPE ) set(xml_files @@ -110,38 +20,6 @@ set(xml_files ) set(examples_src ${examples_src} - ${CMAKE_CURRENT_SOURCE_DIR}/gather_coll.c - ${CMAKE_CURRENT_SOURCE_DIR}/allgather_coll.c - ${CMAKE_CURRENT_SOURCE_DIR}/allgatherv_coll.c - ${CMAKE_CURRENT_SOURCE_DIR}/allreduce_coll.c - ${CMAKE_CURRENT_SOURCE_DIR}/alltoall_coll.c - ${CMAKE_CURRENT_SOURCE_DIR}/alltoallv_coll.c - ${CMAKE_CURRENT_SOURCE_DIR}/bcast_coll.c - ${CMAKE_CURRENT_SOURCE_DIR}/reduce_coll.c - ${CMAKE_CURRENT_SOURCE_DIR}/reduce_scatter_coll.c - ${CMAKE_CURRENT_SOURCE_DIR}/alltoallv_coll.c - ${CMAKE_CURRENT_SOURCE_DIR}/get_processor_name.c - ${CMAKE_CURRENT_SOURCE_DIR}/pingpong.c - ${CMAKE_CURRENT_SOURCE_DIR}/bcast.c - ${CMAKE_CURRENT_SOURCE_DIR}/allreduce.c - ${CMAKE_CURRENT_SOURCE_DIR}/alltoall_basic.c - ${CMAKE_CURRENT_SOURCE_DIR}/sendrecv.c - ${CMAKE_CURRENT_SOURCE_DIR}/reduce.c - ${CMAKE_CURRENT_SOURCE_DIR}/compute2.c - ${CMAKE_CURRENT_SOURCE_DIR}/shared.c - ${CMAKE_CURRENT_SOURCE_DIR}/split.c - ${CMAKE_CURRENT_SOURCE_DIR}/dsend.c - ${CMAKE_CURRENT_SOURCE_DIR}/ttest01.c - ${CMAKE_CURRENT_SOURCE_DIR}/compute.c - ${CMAKE_CURRENT_SOURCE_DIR}/compute3.c - ${CMAKE_CURRENT_SOURCE_DIR}/alltoall2.c - ${CMAKE_CURRENT_SOURCE_DIR}/scatter.c - ${CMAKE_CURRENT_SOURCE_DIR}/sendtest.c - ${CMAKE_CURRENT_SOURCE_DIR}/barrier.c - ${CMAKE_CURRENT_SOURCE_DIR}/vector_test.c - ${CMAKE_CURRENT_SOURCE_DIR}/hvector_test.c - ${CMAKE_CURRENT_SOURCE_DIR}/indexed_test.c - ${CMAKE_CURRENT_SOURCE_DIR}/struct_test.c PARENT_SCOPE ) set(bin_files diff --git a/teshsuite/smpi/allgather/CMakeLists.txt b/teshsuite/smpi/allgather/CMakeLists.txt new file mode 100644 index 0000000000..ecdaa81fc3 --- /dev/null +++ b/teshsuite/smpi/allgather/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 2.6) + +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() + + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") + + include_directories("${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(xml_files + ${xml_files} + PARENT_SCOPE + ) +set(examples_src + ${examples_src} + ${CMAKE_CURRENT_SOURCE_DIR}/allgather_coll.c + PARENT_SCOPE + ) +set(bin_files + ${bin_files} + PARENT_SCOPE + ) +set(txt_files + ${txt_files} + + PARENT_SCOPE + ) diff --git a/teshsuite/smpi/allgather_coll.c b/teshsuite/smpi/allgather/allgather_coll.c similarity index 100% rename from teshsuite/smpi/allgather_coll.c rename to teshsuite/smpi/allgather/allgather_coll.c diff --git a/teshsuite/smpi/allgather_coll.tesh b/teshsuite/smpi/allgather/allgather_coll.tesh similarity index 92% rename from teshsuite/smpi/allgather_coll.tesh rename to teshsuite/smpi/allgather/allgather_coll.tesh index 3e23a6b6e0..1908b13a6c 100644 --- a/teshsuite/smpi/allgather_coll.tesh +++ b/teshsuite/smpi/allgather/allgather_coll.tesh @@ -3,7 +3,7 @@ ! output sort p Test all to all -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ./allgather_coll --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/allgather_coll --log=smpi_kernel.thres:warning > You requested to use 16 processes, but there is only 5 processes in your hostfile... > [rank 0] -> Tremblay > [rank 1] -> Jupiter diff --git a/teshsuite/smpi/allgatherv/CMakeLists.txt b/teshsuite/smpi/allgatherv/CMakeLists.txt new file mode 100644 index 0000000000..8e1693c5fa --- /dev/null +++ b/teshsuite/smpi/allgatherv/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 2.6) + +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() + + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") + + include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + add_executable(allgatherv_coll allgatherv_coll.c) + target_link_libraries(allgatherv_coll simgrid) +endif() + + +set(tesh_files + ${tesh_files} + ${CMAKE_CURRENT_SOURCE_DIR}/allgatherv_coll.tesh + PARENT_SCOPE + ) +set(xml_files + ${xml_files} + PARENT_SCOPE + ) +set(examples_src + ${examples_src} + ${CMAKE_CURRENT_SOURCE_DIR}/allgatherv_coll.c + PARENT_SCOPE + ) +set(bin_files + ${bin_files} + PARENT_SCOPE + ) +set(txt_files + ${txt_files} + + PARENT_SCOPE + ) diff --git a/teshsuite/smpi/allgatherv_coll.c b/teshsuite/smpi/allgatherv/allgatherv_coll.c similarity index 100% rename from teshsuite/smpi/allgatherv_coll.c rename to teshsuite/smpi/allgatherv/allgatherv_coll.c diff --git a/teshsuite/smpi/allgatherv_coll.tesh b/teshsuite/smpi/allgatherv/allgatherv_coll.tesh similarity index 97% rename from teshsuite/smpi/allgatherv_coll.tesh rename to teshsuite/smpi/allgatherv/allgatherv_coll.tesh index a4a9e46ee7..beb6429fbf 100644 --- a/teshsuite/smpi/allgatherv_coll.tesh +++ b/teshsuite/smpi/allgatherv/allgatherv_coll.tesh @@ -3,7 +3,7 @@ ! output sort p Test allgatherv -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ./allgatherv_coll --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/allgatherv_coll --log=smpi_kernel.thres:warning > You requested to use 16 processes, but there is only 5 processes in your hostfile... > [rank 0] -> Tremblay > [rank 1] -> Jupiter diff --git a/teshsuite/smpi/allreduce/CMakeLists.txt b/teshsuite/smpi/allreduce/CMakeLists.txt new file mode 100644 index 0000000000..a4ad62cb9a --- /dev/null +++ b/teshsuite/smpi/allreduce/CMakeLists.txt @@ -0,0 +1,44 @@ +cmake_minimum_required(VERSION 2.6) + +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() + + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") + + include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + add_executable(allreduce allreduce.c) + add_executable(allreduce_coll allreduce_coll.c) + target_link_libraries(allreduce simgrid) + target_link_libraries(allreduce_coll simgrid) +endif() + + +set(tesh_files + ${tesh_files} + ${CMAKE_CURRENT_SOURCE_DIR}/allreduce_coll.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/allreduce_coll_large.tesh + PARENT_SCOPE + ) +set(xml_files + ${xml_files} + PARENT_SCOPE + ) +set(examples_src + ${examples_src} + ${CMAKE_CURRENT_SOURCE_DIR}/allreduce.c + ${CMAKE_CURRENT_SOURCE_DIR}/allreduce_coll.c + PARENT_SCOPE + ) +set(bin_files + ${bin_files} + PARENT_SCOPE + ) +set(txt_files + ${txt_files} + + PARENT_SCOPE + ) diff --git a/teshsuite/smpi/allreduce.c b/teshsuite/smpi/allreduce/allreduce.c similarity index 100% rename from teshsuite/smpi/allreduce.c rename to teshsuite/smpi/allreduce/allreduce.c diff --git a/teshsuite/smpi/allreduce_coll.c b/teshsuite/smpi/allreduce/allreduce_coll.c similarity index 100% rename from teshsuite/smpi/allreduce_coll.c rename to teshsuite/smpi/allreduce/allreduce_coll.c diff --git a/teshsuite/smpi/allreduce_coll.tesh b/teshsuite/smpi/allreduce/allreduce_coll.tesh similarity index 94% rename from teshsuite/smpi/allreduce_coll.tesh rename to teshsuite/smpi/allreduce/allreduce_coll.tesh index b797b2e0aa..e7aaae0d34 100644 --- a/teshsuite/smpi/allreduce_coll.tesh +++ b/teshsuite/smpi/allreduce/allreduce_coll.tesh @@ -3,7 +3,7 @@ ! output sort p Test allreduce -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ./allreduce_coll --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/allreduce_coll --log=smpi_kernel.thres:warning > You requested to use 16 processes, but there is only 5 processes in your hostfile... > [rank 0] -> Tremblay > [rank 1] -> Jupiter diff --git a/teshsuite/smpi/allreduce_coll_large.tesh b/teshsuite/smpi/allreduce/allreduce_coll_large.tesh similarity index 99% rename from teshsuite/smpi/allreduce_coll_large.tesh rename to teshsuite/smpi/allreduce/allreduce_coll_large.tesh index e13e40c43a..a96dc87666 100644 --- a/teshsuite/smpi/allreduce_coll_large.tesh +++ b/teshsuite/smpi/allreduce/allreduce_coll_large.tesh @@ -4,7 +4,7 @@ ! timeout 20 p Test allreduce -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ./allreduce_coll 30000 --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/allreduce_coll 30000 --log=smpi_kernel.thres:warning > You requested to use 16 processes, but there is only 5 processes in your hostfile... > [rank 0] -> Tremblay > [rank 1] -> Jupiter diff --git a/teshsuite/smpi/alltoall/CMakeLists.txt b/teshsuite/smpi/alltoall/CMakeLists.txt new file mode 100644 index 0000000000..371e7d6964 --- /dev/null +++ b/teshsuite/smpi/alltoall/CMakeLists.txt @@ -0,0 +1,46 @@ +cmake_minimum_required(VERSION 2.6) + +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() + + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") + + include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + add_executable(alltoall2 alltoall2.c) + add_executable(alltoall_basic alltoall_basic.c) + add_executable(alltoall_coll alltoall_coll.c) + target_link_libraries(alltoall2 simgrid) + target_link_libraries(alltoall_basic simgrid) + target_link_libraries(alltoall_coll simgrid) +endif() + + +set(tesh_files + ${tesh_files} + ${CMAKE_CURRENT_SOURCE_DIR}/alltoall_coll.tesh + PARENT_SCOPE + ) +set(xml_files + ${xml_files} + PARENT_SCOPE + ) +set(examples_src + ${examples_src} + ${CMAKE_CURRENT_SOURCE_DIR}/alltoall_coll.c + ${CMAKE_CURRENT_SOURCE_DIR}/alltoall_basic.c + ${CMAKE_CURRENT_SOURCE_DIR}/alltoall2.c + PARENT_SCOPE + ) +set(bin_files + ${bin_files} + PARENT_SCOPE + ) +set(txt_files + ${txt_files} + + PARENT_SCOPE + ) diff --git a/teshsuite/smpi/alltoall2.c b/teshsuite/smpi/alltoall/alltoall2.c similarity index 100% rename from teshsuite/smpi/alltoall2.c rename to teshsuite/smpi/alltoall/alltoall2.c diff --git a/teshsuite/smpi/alltoall_basic.c b/teshsuite/smpi/alltoall/alltoall_basic.c similarity index 100% rename from teshsuite/smpi/alltoall_basic.c rename to teshsuite/smpi/alltoall/alltoall_basic.c diff --git a/teshsuite/smpi/alltoall_coll.c b/teshsuite/smpi/alltoall/alltoall_coll.c similarity index 100% rename from teshsuite/smpi/alltoall_coll.c rename to teshsuite/smpi/alltoall/alltoall_coll.c diff --git a/teshsuite/smpi/alltoall_coll.tesh b/teshsuite/smpi/alltoall/alltoall_coll.tesh similarity index 93% rename from teshsuite/smpi/alltoall_coll.tesh rename to teshsuite/smpi/alltoall/alltoall_coll.tesh index a99b590346..3946dc2def 100644 --- a/teshsuite/smpi/alltoall_coll.tesh +++ b/teshsuite/smpi/alltoall/alltoall_coll.tesh @@ -3,7 +3,7 @@ ! output sort p Test all to all -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ./alltoall_coll -q --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/alltoall_coll -q --log=smpi_kernel.thres:warning > You requested to use 16 processes, but there is only 5 processes in your hostfile... > [rank 0] -> Tremblay > [rank 1] -> Jupiter diff --git a/teshsuite/smpi/alltoallv/CMakeLists.txt b/teshsuite/smpi/alltoallv/CMakeLists.txt new file mode 100644 index 0000000000..00ba90cb9a --- /dev/null +++ b/teshsuite/smpi/alltoallv/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 2.6) + +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() + + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") + + include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + add_executable(alltoallv_coll alltoallv_coll.c) + target_link_libraries(alltoallv_coll simgrid) +endif() + + +set(tesh_files + ${tesh_files} + ${CMAKE_CURRENT_SOURCE_DIR}/alltoallv_coll.tesh + PARENT_SCOPE + ) +set(xml_files + ${xml_files} + PARENT_SCOPE + ) +set(examples_src + ${examples_src} + ${CMAKE_CURRENT_SOURCE_DIR}/alltoallv_coll.c + PARENT_SCOPE + ) +set(bin_files + ${bin_files} + PARENT_SCOPE + ) +set(txt_files + ${txt_files} + + PARENT_SCOPE + ) diff --git a/teshsuite/smpi/alltoallv_coll.c b/teshsuite/smpi/alltoallv/alltoallv_coll.c similarity index 100% rename from teshsuite/smpi/alltoallv_coll.c rename to teshsuite/smpi/alltoallv/alltoallv_coll.c diff --git a/teshsuite/smpi/alltoallv_coll.tesh b/teshsuite/smpi/alltoallv/alltoallv_coll.tesh similarity index 99% rename from teshsuite/smpi/alltoallv_coll.tesh rename to teshsuite/smpi/alltoallv/alltoallv_coll.tesh index 3346488ea1..7815af12ca 100644 --- a/teshsuite/smpi/alltoallv_coll.tesh +++ b/teshsuite/smpi/alltoallv/alltoallv_coll.tesh @@ -3,7 +3,7 @@ ! output sort p Test all to all -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ./alltoallv_coll --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/alltoallv_coll --log=smpi_kernel.thres:warning > You requested to use 16 processes, but there is only 5 processes in your hostfile... > [rank 0] -> Tremblay > [rank 1] -> Jupiter @@ -118,6 +118,6 @@ $ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform $ > [15] sbuf: (#256): [1500][1501][1502][1503][1504][1505][1506][1507][1508][1509][1510][1511][1512][1513][1514][1515][1516][1517][1518][1519][1520][1521][1522][1523][1524][1525][1526][1527][1528][1529][1530][1531][1532][1533][1534][1535][1536][1537][1538][1539][1540][1541][1542][1543][1544][1545][1546][1547][1548][1549][1550][1551][1552][1553][1554][1555][1556][1557][1558][1559][1560][1561][1562][1563][1564][1565][1566][1567][1568][1569][1570][1571][1572][1573][1574][1575][1576][1577][1578][1579][1580][1581][1582][1583][1584][1585][1586][1587][1588][1589][1590][1591][1592][1593][1594][1595][1596][1597][1598][1599][1600][1601][1602][1603][1604][1605][1606][1607][1608][1609][1610][1611][1612][1613][1614][1615][1616][1617][1618][1619][1620][1621][1622][1623][1624][1625][1626][1627][1628][1629][1630][1631][1632][1633][1634][1635][1636][1637][1638][1639][1640][1641][1642][1643][1644][1645][1646][1647][1648][1649][1650][1651][1652][1653][1654][1655][1656][1657][1658][1659][1660][1661][1662][1663][1664][1665][1666][1667][1668][1669][1670][1671][1672][1673][1674][1675][1676][1677][1678][1679][1680][1681][1682][1683][1684][1685][1686][1687][1688][1689][1690][1691][1692][1693][1694][1695][1696][1697][1698][1699][1700][1701][1702][1703][1704][1705][1706][1707][1708][1709][1710][1711][1712][1713][1714][1715][1716][1717][1718][1719][1720][1721][1722][1723][1724][1725][1726][1727][1728][1729][1730][1731][1732][1733][1734][1735][1736][1737][1738][1739][1740][1741][1742][1743][1744][1745][1746][1747][1748][1749][1750][1751][1752][1753][1754][1755] > [15] scount: (#16): [0][1][2][3][4][5][6][7][8][9][10][11][12][13][14][15] > [15] sdisp: (#16): [0][1][3][6][10][15][21][28][36][45][55][66][78][91][105][120] -> +> > Alltoallv TEST COMPLETE. diff --git a/teshsuite/smpi/barrier/CMakeLists.txt b/teshsuite/smpi/barrier/CMakeLists.txt new file mode 100644 index 0000000000..2d7d550cca --- /dev/null +++ b/teshsuite/smpi/barrier/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 2.6) + +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() + + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") + + include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + add_executable(barrier_coll barrier.c ) + target_link_libraries(barrier_coll simgrid) +endif() + + +set(tesh_files + ${tesh_files} + ${CMAKE_CURRENT_SOURCE_DIR}/barrier_coll.tesh + PARENT_SCOPE + ) +set(xml_files + ${xml_files} + PARENT_SCOPE + ) +set(examples_src + ${examples_src} + ${CMAKE_CURRENT_SOURCE_DIR}/barrier.c + PARENT_SCOPE + ) +set(bin_files + ${bin_files} + PARENT_SCOPE + ) +set(txt_files + ${txt_files} + + PARENT_SCOPE + ) diff --git a/teshsuite/smpi/barrier.c b/teshsuite/smpi/barrier/barrier.c similarity index 100% rename from teshsuite/smpi/barrier.c rename to teshsuite/smpi/barrier/barrier.c diff --git a/teshsuite/smpi/barrier_coll.tesh b/teshsuite/smpi/barrier/barrier_coll.tesh similarity index 76% rename from teshsuite/smpi/barrier_coll.tesh rename to teshsuite/smpi/barrier/barrier_coll.tesh index a58751e5a2..e1e4b80bd0 100644 --- a/teshsuite/smpi/barrier_coll.tesh +++ b/teshsuite/smpi/barrier/barrier_coll.tesh @@ -3,7 +3,7 @@ ! output sort p Test barrier -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ./barrier_coll --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/barrier_coll --log=smpi_kernel.thres:warning > ... Barrier .... > You requested to use 16 processes, but there is only 5 processes in your hostfile... > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) diff --git a/teshsuite/smpi/bcast/CMakeLists.txt b/teshsuite/smpi/bcast/CMakeLists.txt new file mode 100644 index 0000000000..0ad7183b57 --- /dev/null +++ b/teshsuite/smpi/bcast/CMakeLists.txt @@ -0,0 +1,44 @@ +cmake_minimum_required(VERSION 2.6) + +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() + + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") + + include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + add_executable(bcast bcast.c) + add_executable(bcast_coll bcast_coll.c) + target_link_libraries(bcast simgrid) + 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(xml_files + ${xml_files} + PARENT_SCOPE + ) +set(examples_src + ${examples_src} + ${CMAKE_CURRENT_SOURCE_DIR}/bcast.c + ${CMAKE_CURRENT_SOURCE_DIR}/bcast_coll.c + PARENT_SCOPE + ) +set(bin_files + ${bin_files} + PARENT_SCOPE + ) +set(txt_files + ${txt_files} + + PARENT_SCOPE + ) diff --git a/teshsuite/smpi/bcast.c b/teshsuite/smpi/bcast/bcast.c similarity index 100% rename from teshsuite/smpi/bcast.c rename to teshsuite/smpi/bcast/bcast.c diff --git a/teshsuite/smpi/bcast.tesh b/teshsuite/smpi/bcast/bcast.tesh similarity index 81% rename from teshsuite/smpi/bcast.tesh rename to teshsuite/smpi/bcast/bcast.tesh index 352f56c78e..f22c7ad91e 100644 --- a/teshsuite/smpi/bcast.tesh +++ b/teshsuite/smpi/bcast/bcast.tesh @@ -2,7 +2,7 @@ # (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 -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 3 ./bcast -q --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 3 ${bindir:=.}/bcast -q --log=smpi_kernel.thres:warning > [rank 0] -> Tremblay > [rank 1] -> Jupiter > [rank 2] -> Fafard @@ -15,7 +15,7 @@ $ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform $ # second test p Test Broadcast with as much processes than hosts ! setenv LD_LIBRARY_PATH=../../lib -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 5 ./bcast -q --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 5 ${bindir:=.}/bcast -q --log=smpi_kernel.thres:warning > [rank 0] -> Tremblay > [rank 1] -> Jupiter > [rank 2] -> Fafard @@ -30,7 +30,7 @@ $ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform $ # Another test p Test Broadcast with more processes than hosts ! setenv LD_LIBRARY_PATH=../../lib -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 12 ./bcast -q --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 12 ${bindir:=.}/bcast -q --log=smpi_kernel.thres:warning > You requested to use 12 processes, but there is only 5 processes in your hostfile... > [rank 0] -> Tremblay > [rank 1] -> Jupiter diff --git a/teshsuite/smpi/bcast_coll.c b/teshsuite/smpi/bcast/bcast_coll.c similarity index 100% rename from teshsuite/smpi/bcast_coll.c rename to teshsuite/smpi/bcast/bcast_coll.c diff --git a/teshsuite/smpi/bcast_coll.tesh b/teshsuite/smpi/bcast/bcast_coll.tesh similarity index 90% rename from teshsuite/smpi/bcast_coll.tesh rename to teshsuite/smpi/bcast/bcast_coll.tesh index 641e8d2dcf..6163065f74 100644 --- a/teshsuite/smpi/bcast_coll.tesh +++ b/teshsuite/smpi/bcast/bcast_coll.tesh @@ -2,7 +2,7 @@ p Test Broadcast with more processes than hosts ! setenv LD_LIBRARY_PATH=../../lib ! output sort -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ./bcast_coll --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/bcast_coll --log=smpi_kernel.thres:warning > You requested to use 16 processes, but there is only 5 processes in your hostfile... > [rank 0] -> Tremblay > [rank 1] -> Jupiter diff --git a/teshsuite/smpi/compute/CMakeLists.txt b/teshsuite/smpi/compute/CMakeLists.txt new file mode 100644 index 0000000000..1f259147b5 --- /dev/null +++ b/teshsuite/smpi/compute/CMakeLists.txt @@ -0,0 +1,46 @@ +cmake_minimum_required(VERSION 2.6) + +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() + + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") + + include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + add_executable(compute compute.c) + add_executable(compute2 compute2.c) + add_executable(compute3 compute3.c) + target_link_libraries(compute simgrid) + target_link_libraries(compute2 simgrid) + target_link_libraries(compute3 simgrid) +endif() + + +set(tesh_files + ${tesh_files} + ${CMAKE_CURRENT_SOURCE_DIR}/compute.tesh + PARENT_SCOPE + ) +set(xml_files + ${xml_files} + PARENT_SCOPE + ) +set(examples_src + ${examples_src} + ${CMAKE_CURRENT_SOURCE_DIR}/compute.c + ${CMAKE_CURRENT_SOURCE_DIR}/compute2.c + ${CMAKE_CURRENT_SOURCE_DIR}/compute3.c + PARENT_SCOPE + ) +set(bin_files + ${bin_files} + PARENT_SCOPE + ) +set(txt_files + ${txt_files} + + PARENT_SCOPE + ) diff --git a/teshsuite/smpi/compute.c b/teshsuite/smpi/compute/compute.c similarity index 100% rename from teshsuite/smpi/compute.c rename to teshsuite/smpi/compute/compute.c diff --git a/teshsuite/smpi/compute.tesh b/teshsuite/smpi/compute/compute.tesh similarity index 71% rename from teshsuite/smpi/compute.tesh rename to teshsuite/smpi/compute/compute.tesh index 8e74bb9b7e..4864e4b842 100644 --- a/teshsuite/smpi/compute.tesh +++ b/teshsuite/smpi/compute/compute.tesh @@ -1,19 +1,19 @@ p Test compute ! timeout 5 -$ ../../smpi_script/bin/smpirun -platform ${srcdir:=.}/../../examples/msg/small_platform_with_routers.xml -hostfile ${srcdir:=.}/hostfile -np 3 --log=root.thres:warning ./compute 7 --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -hostfile ../hostfile -platform ../../../examples/msg/small_platform_with_routers.xml -np 3 --log=root.thres:warning ${bindir:=.}/compute 7 --log=smpi_kernel.thres:warning > 7 16.000000 > 7 16.000000 > 7 16.000000 p Test compute only once ! timeout 5 -$ ../../smpi_script/bin/smpirun -platform ${srcdir:=.}/../../examples/msg/small_platform_with_routers.xml -hostfile ${srcdir:=.}/hostfile -np 3 --log=root.thres:warning ./compute2 7 --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -hostfile ../hostfile -platform ../../../examples/msg/small_platform_with_routers.xml -np 3 --log=root.thres:warning ${bindir:=.}/compute2 7 --log=smpi_kernel.thres:warning > 7 16.000000 p Test compute and bench ! output sort ! timeout 45 -$ ../../smpi_script/bin/smpirun -platform ${srcdir:=.}/../../examples/msg/small_platform_with_routers.xml -hostfile ${srcdir:=.}/hostfile -np 3 --log=root.thres:warning ./compute3 quiet --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -hostfile ../hostfile -platform ../../../examples/msg/small_platform_with_routers.xml -np 3 --log=root.thres:warning ${bindir:=.}/compute3 quiet --log=smpi_kernel.thres:warning > (0) Run the first computation. It's globally benched, and I want no more than 4 benchmarks (thres<0) > (0) Run the first computation. It's globally benched, and I want no more than 4 benchmarks (thres<0) > (0) Run the first computation. It's globally benched, and I want no more than 4 benchmarks (thres<0) diff --git a/teshsuite/smpi/compute2.c b/teshsuite/smpi/compute/compute2.c similarity index 100% rename from teshsuite/smpi/compute2.c rename to teshsuite/smpi/compute/compute2.c diff --git a/teshsuite/smpi/compute3.c b/teshsuite/smpi/compute/compute3.c similarity index 100% rename from teshsuite/smpi/compute3.c rename to teshsuite/smpi/compute/compute3.c diff --git a/teshsuite/smpi/gather/CMakeLists.txt b/teshsuite/smpi/gather/CMakeLists.txt new file mode 100644 index 0000000000..386a6641fe --- /dev/null +++ b/teshsuite/smpi/gather/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 2.6) + +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() + + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") + + include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + add_executable(gather_coll gather_coll.c) + target_link_libraries(gather_coll simgrid) +endif() + + +set(tesh_files + ${tesh_files} + ${CMAKE_CURRENT_SOURCE_DIR}/gather_coll.tesh + PARENT_SCOPE + ) +set(xml_files + ${xml_files} + PARENT_SCOPE + ) +set(examples_src + ${examples_src} + ${CMAKE_CURRENT_SOURCE_DIR}/gather_coll.c + PARENT_SCOPE + ) +set(bin_files + ${bin_files} + PARENT_SCOPE + ) +set(txt_files + ${txt_files} + + PARENT_SCOPE + ) diff --git a/teshsuite/smpi/gather_coll.c b/teshsuite/smpi/gather/gather_coll.c similarity index 100% rename from teshsuite/smpi/gather_coll.c rename to teshsuite/smpi/gather/gather_coll.c diff --git a/teshsuite/smpi/gather_coll.tesh b/teshsuite/smpi/gather/gather_coll.tesh similarity index 84% rename from teshsuite/smpi/gather_coll.tesh rename to teshsuite/smpi/gather/gather_coll.tesh index 9498cf1db7..2ca27518a5 100644 --- a/teshsuite/smpi/gather_coll.tesh +++ b/teshsuite/smpi/gather/gather_coll.tesh @@ -4,7 +4,7 @@ ! timeout 30 p Test all to all -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ./gather_coll --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/gather_coll --log=smpi_kernel.thres:warning > You requested to use 16 processes, but there is only 5 processes in your hostfile... > [rank 0] -> Tremblay > [rank 1] -> Jupiter diff --git a/teshsuite/smpi/get_processor_name.c b/teshsuite/smpi/get_processor_name.c deleted file mode 100644 index 90b9a0bb0e..0000000000 --- a/teshsuite/smpi/get_processor_name.c +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright (c) 2010, 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; - - char name[MPI_MAX_PROCESSOR_NAME]; - int len; - - MPI_Init(&argc, &argv); - MPI_Comm_size(MPI_COMM_WORLD, &size); - MPI_Comm_rank(MPI_COMM_WORLD, &rank); - - MPI_Get_processor_name(name, &len); - printf("rank %d is running on host %s\n", rank, name); - MPI_Finalize(); - return 0; -} diff --git a/teshsuite/smpi/hvector/CMakeLists.txt b/teshsuite/smpi/hvector/CMakeLists.txt new file mode 100644 index 0000000000..fe240c2d74 --- /dev/null +++ b/teshsuite/smpi/hvector/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 2.6) + +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() + + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") + + include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + add_executable(hvector_test hvector_test.c) + target_link_libraries(hvector_test simgrid) +endif() + + +set(tesh_files + ${tesh_files} + ${CMAKE_CURRENT_SOURCE_DIR}/hvector.tesh + PARENT_SCOPE + ) +set(xml_files + ${xml_files} + PARENT_SCOPE + ) +set(examples_src + ${examples_src} + ${CMAKE_CURRENT_SOURCE_DIR}/hvector_test.c + PARENT_SCOPE + ) +set(bin_files + ${bin_files} + PARENT_SCOPE + ) +set(txt_files + ${txt_files} + + PARENT_SCOPE + ) diff --git a/teshsuite/smpi/hvector.tesh b/teshsuite/smpi/hvector/hvector.tesh similarity index 88% rename from teshsuite/smpi/hvector.tesh rename to teshsuite/smpi/hvector/hvector.tesh index b5f789e252..40aec64399 100644 --- a/teshsuite/smpi/hvector.tesh +++ b/teshsuite/smpi/hvector/hvector.tesh @@ -1,7 +1,7 @@ p Test hvector ! setenv LD_LIBRARY_PATH=../../lib ! output sort -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 2 ./hvector_test -q --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 2 ${bindir:=.}/hvector_test -q --log=smpi_kernel.thres:warning > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' diff --git a/teshsuite/smpi/hvector_test.c b/teshsuite/smpi/hvector/hvector_test.c similarity index 100% rename from teshsuite/smpi/hvector_test.c rename to teshsuite/smpi/hvector/hvector_test.c diff --git a/teshsuite/smpi/indexed/CMakeLists.txt b/teshsuite/smpi/indexed/CMakeLists.txt new file mode 100644 index 0000000000..e6c9af4e82 --- /dev/null +++ b/teshsuite/smpi/indexed/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 2.6) + +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() + + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") + + include_directories("${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(xml_files + ${xml_files} + PARENT_SCOPE + ) +set(examples_src + ${examples_src} + ${CMAKE_CURRENT_SOURCE_DIR}/indexed_test.c + PARENT_SCOPE + ) +set(bin_files + ${bin_files} + PARENT_SCOPE + ) +set(txt_files + ${txt_files} + + PARENT_SCOPE + ) diff --git a/teshsuite/smpi/indexed.tesh b/teshsuite/smpi/indexed/indexed.tesh similarity index 84% rename from teshsuite/smpi/indexed.tesh rename to teshsuite/smpi/indexed/indexed.tesh index f8777fb597..211f802c46 100644 --- a/teshsuite/smpi/indexed.tesh +++ b/teshsuite/smpi/indexed/indexed.tesh @@ -1,7 +1,7 @@ p Test indexed ! setenv LD_LIBRARY_PATH=../../lib ! output sort -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 2 ./indexed_test -q --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 2 ${bindir:=.}/indexed_test -q --log=smpi_kernel.thres:warning > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' diff --git a/teshsuite/smpi/indexed_test.c b/teshsuite/smpi/indexed/indexed_test.c similarity index 100% rename from teshsuite/smpi/indexed_test.c rename to teshsuite/smpi/indexed/indexed_test.c diff --git a/teshsuite/smpi/pingpong/CMakeLists.txt b/teshsuite/smpi/pingpong/CMakeLists.txt new file mode 100644 index 0000000000..a7e154741c --- /dev/null +++ b/teshsuite/smpi/pingpong/CMakeLists.txt @@ -0,0 +1,44 @@ +cmake_minimum_required(VERSION 2.6) + +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() + + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") + + include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + add_executable(pingpong pingpong.c) + add_executable(dsend dsend.c) + target_link_libraries(pingpong simgrid) + target_link_libraries(dsend simgrid) +endif() + + +set(tesh_files + ${tesh_files} + ${CMAKE_CURRENT_SOURCE_DIR}/pt2pt.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/TI_output.tesh + PARENT_SCOPE + ) +set(xml_files + ${xml_files} + PARENT_SCOPE + ) +set(examples_src + ${examples_src} + ${CMAKE_CURRENT_SOURCE_DIR}/dsend.c + ${CMAKE_CURRENT_SOURCE_DIR}/pingpong.c + PARENT_SCOPE + ) +set(bin_files + ${bin_files} + PARENT_SCOPE + ) +set(txt_files + ${txt_files} + + PARENT_SCOPE + ) diff --git a/teshsuite/smpi/TI_output.tesh b/teshsuite/smpi/pingpong/TI_output.tesh similarity index 72% rename from teshsuite/smpi/TI_output.tesh rename to teshsuite/smpi/pingpong/TI_output.tesh index 759f177171..147c8179b5 100644 --- a/teshsuite/smpi/TI_output.tesh +++ b/teshsuite/smpi/pingpong/TI_output.tesh @@ -2,10 +2,10 @@ $ rm -rf ./out_ti.txt_files $ rm -rf ./out_in_ti.txt_files p Test output of time independent tracing -p generate a trace with pingpong, and replay itself, then check that output trace of the second run is the same as in the first (once sorted) +p generate a trace with pingpong, and replay itself, then check that output trace of the second run is the same as in the first (once sorted) ! setenv LD_LIBRARY_PATH=../../lib ! output sort -$ ../../smpi_script/bin/smpirun -trace-ti --cfg=tracing/filename:out_in_ti.txt --cfg=smpi/cpu_threshold:-1 -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 4 ./pingpong -q --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -trace-ti --cfg=tracing/filename:out_in_ti.txt --cfg=smpi/cpu_threshold:-1 -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 4 ${bindir:=.}/pingpong -q --log=smpi_kernel.thres:warning > *** Ping-pong test (MPI_Send/MPI_Recv) *** > == pivot=0 : pingpong [0] <--> [1] > == pivot=1 : pingpong [1] <--> [2] @@ -22,27 +22,27 @@ $ ../../smpi_script/bin/smpirun -trace-ti --cfg=tracing/filename:out_in_ti.txt - > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'out_in_ti.txt' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu_threshold' to '-1' -> [0] About to send 1st message '99' to process [1] -> [0] Received reply message '100' from process [1] -> [1] About to send 1st message '100' to process [2] -> [1] About to send back message '100' to process [0] -> [1] Received 1st message '99' from process [0] -> [1] Received reply message '101' from process [2] +> [0] About to send 1st message '99' to process [1] +> [0] Received reply message '100' from process [1] +> [1] About to send 1st message '100' to process [2] +> [1] About to send back message '100' to process [0] +> [1] Received 1st message '99' from process [0] +> [1] Received reply message '101' from process [2] > [1] increment message's value to '100' -> [2] About to send 1st message '101' to process [3] -> [2] About to send back message '101' to process [1] -> [2] Received 1st message '100' from process [1] -> [2] Received reply message '102' from process [3] +> [2] About to send 1st message '101' to process [3] +> [2] About to send back message '101' to process [1] +> [2] Received 1st message '100' from process [1] +> [2] Received reply message '102' from process [3] > [2] increment message's value to '101' -> [3] About to send back message '102' to process [2] -> [3] Received 1st message '101' from process [2] +> [3] About to send back message '102' to process [2] +> [3] Received 1st message '101' from process [2] > [3] increment message's value to '102' > [rank 0] -> Tremblay > [rank 1] -> Jupiter > [rank 2] -> Fafard > [rank 3] -> Ginette -$ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.:critical -trace-ti --cfg=tracing/filename:out_ti.txt --cfg=smpi/cpu_threshold:-1 -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 4 ../../examples/smpi/smpi_replay ./out_in_ti.txt --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -ext smpi_replay --log=replay.:critical -trace-ti --cfg=tracing/filename:out_ti.txt --cfg=smpi/cpu_threshold:-1 -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 4 ${bindir:=.}/../../../examples/smpi/smpi_replay ./out_in_ti.txt --log=smpi_kernel.thres:warning > [rank 0] -> Tremblay > [rank 1] -> Jupiter > [rank 2] -> Fafard @@ -115,9 +115,9 @@ $ rm out_in_ti.txt p Same test, but only using one output file for all processes -p generate a trace with pingpong, and replay itself, then check that output trace of the second run is the same as in the first (once sorted) +p generate a trace with pingpong, and replay itself, then check that output trace of the second run is the same as in the first (once sorted) ! output sort -$ ../../smpi_script/bin/smpirun -trace-ti --cfg=tracing/filename:out_in_ti.txt --cfg=tracing/smpi/format/ti_one_file:yes -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 4 ./pingpong -q --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -trace-ti --cfg=tracing/filename:out_in_ti.txt --cfg=tracing/smpi/format/ti_one_file:yes -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 4 ${bindir:=.}/pingpong -q --log=smpi_kernel.thres:warning > *** Ping-pong test (MPI_Send/MPI_Recv) *** > == pivot=0 : pingpong [0] <--> [1] > == pivot=1 : pingpong [1] <--> [2] @@ -134,27 +134,27 @@ $ ../../smpi_script/bin/smpirun -trace-ti --cfg=tracing/filename:out_in_ti.txt - > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'out_in_ti.txt' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/format/ti_one_file' to 'yes' -> [0] About to send 1st message '99' to process [1] -> [0] Received reply message '100' from process [1] -> [1] About to send 1st message '100' to process [2] -> [1] About to send back message '100' to process [0] -> [1] Received 1st message '99' from process [0] -> [1] Received reply message '101' from process [2] +> [0] About to send 1st message '99' to process [1] +> [0] Received reply message '100' from process [1] +> [1] About to send 1st message '100' to process [2] +> [1] About to send back message '100' to process [0] +> [1] Received 1st message '99' from process [0] +> [1] Received reply message '101' from process [2] > [1] increment message's value to '100' -> [2] About to send 1st message '101' to process [3] -> [2] About to send back message '101' to process [1] -> [2] Received 1st message '100' from process [1] -> [2] Received reply message '102' from process [3] +> [2] About to send 1st message '101' to process [3] +> [2] About to send back message '101' to process [1] +> [2] Received 1st message '100' from process [1] +> [2] Received reply message '102' from process [3] > [2] increment message's value to '101' -> [3] About to send back message '102' to process [2] -> [3] Received 1st message '101' from process [2] +> [3] About to send back message '102' to process [2] +> [3] Received 1st message '101' from process [2] > [3] increment message's value to '102' > [rank 0] -> Tremblay > [rank 1] -> Jupiter > [rank 2] -> Fafard > [rank 3] -> Ginette -$ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.:critical -trace-ti --cfg=tracing/filename:out_ti.txt --cfg=tracing/smpi/format/ti_one_file:yes -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 4 ../../examples/smpi/smpi_replay ./out_in_ti.txt --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -ext smpi_replay --log=replay.:critical -trace-ti --cfg=tracing/filename:out_ti.txt --cfg=tracing/smpi/format/ti_one_file:yes -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 4 ${bindir:=.}/../../../examples/smpi/smpi_replay ./out_in_ti.txt --log=smpi_kernel.thres:warning > [rank 0] -> Tremblay > [rank 1] -> Jupiter > [rank 2] -> Fafard diff --git a/teshsuite/smpi/dsend.c b/teshsuite/smpi/pingpong/dsend.c similarity index 100% rename from teshsuite/smpi/dsend.c rename to teshsuite/smpi/pingpong/dsend.c diff --git a/teshsuite/smpi/pingpong.c b/teshsuite/smpi/pingpong/pingpong.c similarity index 95% rename from teshsuite/smpi/pingpong.c rename to teshsuite/smpi/pingpong/pingpong.c index 7d2677f008..ab3f440761 100644 --- a/teshsuite/smpi/pingpong.c +++ b/teshsuite/smpi/pingpong/pingpong.c @@ -43,23 +43,23 @@ int main(int argc, char *argv[]) pivot + 1); int dst = rank + 1; - printf("[%d] About to send 1st message '%d' to process [%d] \n", + printf("[%d] About to send 1st message '%d' to process [%d]\n", rank, msg, dst); err = MPI_Send(&msg, 1, MPI_INT, dst, tag1, MPI_COMM_WORLD); err = MPI_Recv(&msg, 1, MPI_INT, dst, tag2, MPI_COMM_WORLD, &status); /* Receive a message */ - printf("[%d] Received reply message '%d' from process [%d] \n", rank, + printf("[%d] Received reply message '%d' from process [%d]\n", rank, msg, dst); } if ((pivot + 1) == rank) { int src = rank - 1; err = MPI_Recv(&msg, 1, MPI_INT, src, tag1, MPI_COMM_WORLD, &status); /* Receive a message */ - printf("[%d] Received 1st message '%d' from process [%d] \n", rank, + printf("[%d] Received 1st message '%d' from process [%d]\n", rank, msg, src); msg++; printf("[%d] increment message's value to '%d'\n", rank, msg); - printf("[%d] About to send back message '%d' to process [%d] \n", + printf("[%d] About to send back message '%d' to process [%d]\n", rank, msg, src); err = MPI_Send(&msg, 1, MPI_INT, src, tag2, MPI_COMM_WORLD); } diff --git a/teshsuite/smpi/pt2pt.tesh b/teshsuite/smpi/pingpong/pt2pt.tesh similarity index 61% rename from teshsuite/smpi/pt2pt.tesh rename to teshsuite/smpi/pingpong/pt2pt.tesh index a67ee17558..d1c10991ee 100644 --- a/teshsuite/smpi/pt2pt.tesh +++ b/teshsuite/smpi/pingpong/pt2pt.tesh @@ -1,7 +1,7 @@ p Test dsend ! setenv LD_LIBRARY_PATH=../../lib ! output sort -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 2 ./dsend -q --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 2 ${bindir:=.}/dsend -q --log=smpi_kernel.thres:warning > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' @@ -16,7 +16,7 @@ $ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform $ p Test pingpong ! setenv LD_LIBRARY_PATH=../../lib ! output sort -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 4 ./pingpong -q --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 4 ${bindir:=.}/pingpong -q --log=smpi_kernel.thres:warning > *** Ping-pong test (MPI_Send/MPI_Recv) *** > == pivot=0 : pingpong [0] <--> [1] > == pivot=1 : pingpong [1] <--> [2] @@ -26,20 +26,20 @@ $ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform $ > [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] About to send 1st message '99' to process [1] -> [0] Received reply message '100' from process [1] -> [1] About to send 1st message '100' to process [2] -> [1] About to send back message '100' to process [0] -> [1] Received 1st message '99' from process [0] -> [1] Received reply message '101' from process [2] +> [0] About to send 1st message '99' to process [1] +> [0] Received reply message '100' from process [1] +> [1] About to send 1st message '100' to process [2] +> [1] About to send back message '100' to process [0] +> [1] Received 1st message '99' from process [0] +> [1] Received reply message '101' from process [2] > [1] increment message's value to '100' -> [2] About to send 1st message '101' to process [3] -> [2] About to send back message '101' to process [1] -> [2] Received 1st message '100' from process [1] -> [2] Received reply message '102' from process [3] +> [2] About to send 1st message '101' to process [3] +> [2] About to send back message '101' to process [1] +> [2] Received 1st message '100' from process [1] +> [2] Received reply message '102' from process [3] > [2] increment message's value to '101' -> [3] About to send back message '102' to process [2] -> [3] Received 1st message '101' from process [2] +> [3] About to send back message '102' to process [2] +> [3] Received 1st message '101' from process [2] > [3] increment message's value to '102' > [rank 0] -> Tremblay > [rank 1] -> Jupiter diff --git a/teshsuite/smpi/reduce/CMakeLists.txt b/teshsuite/smpi/reduce/CMakeLists.txt new file mode 100644 index 0000000000..8e36392306 --- /dev/null +++ b/teshsuite/smpi/reduce/CMakeLists.txt @@ -0,0 +1,48 @@ +cmake_minimum_required(VERSION 2.6) + +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() + + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") + + include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + add_executable(reduce reduce.c) + add_executable(reduce_coll reduce_coll.c) + add_executable(reduce_scatter_coll reduce_scatter_coll.c) + target_link_libraries(reduce simgrid) + target_link_libraries(reduce_coll simgrid) + target_link_libraries(reduce_scatter_coll simgrid) +endif() + + +set(tesh_files + ${tesh_files} + ${CMAKE_CURRENT_SOURCE_DIR}/reduce.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/reduce_coll.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/reduce_scatter_coll.tesh + PARENT_SCOPE + ) +set(xml_files + ${xml_files} + PARENT_SCOPE + ) +set(examples_src + ${examples_src} + ${CMAKE_CURRENT_SOURCE_DIR}/reduce.c + ${CMAKE_CURRENT_SOURCE_DIR}/reduce_coll.c + ${CMAKE_CURRENT_SOURCE_DIR}/reduce_scatter_coll.c + PARENT_SCOPE + ) +set(bin_files + ${bin_files} + PARENT_SCOPE + ) +set(txt_files + ${txt_files} + + PARENT_SCOPE + ) diff --git a/teshsuite/smpi/reduce.c b/teshsuite/smpi/reduce/reduce.c similarity index 98% rename from teshsuite/smpi/reduce.c rename to teshsuite/smpi/reduce/reduce.c index 92436c9021..09671e6781 100644 --- a/teshsuite/smpi/reduce.c +++ b/teshsuite/smpi/reduce/reduce.c @@ -11,7 +11,7 @@ * MESSAGE PASSING INTERFACE TEST CASE SUITE * * Copyright IBM Corp. 1995 - * + * * IBM Corp. hereby grants a non-exclusive license to use, copy, modify, and *distribute this software for any purpose and without fee provided that the *above copyright notice and the following paragraphs appear in all copies. @@ -117,7 +117,7 @@ int main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); if (0 == rank) - printf("** IBM Test Result: ... \n"); + printf("** IBM Test Result: ...\n"); if (!ibm_test(rank, size)) printf("\t[%d] failed.\n", rank); else if (!quiet) diff --git a/teshsuite/smpi/reduce.tesh b/teshsuite/smpi/reduce/reduce.tesh similarity index 81% rename from teshsuite/smpi/reduce.tesh rename to teshsuite/smpi/reduce/reduce.tesh index 1d3e74cf2c..4e3aac74e3 100644 --- a/teshsuite/smpi/reduce.tesh +++ b/teshsuite/smpi/reduce/reduce.tesh @@ -3,7 +3,7 @@ # Go for the first test p Test Reduce with 3 processes ! output sort -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 3 ./reduce -q --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 3 ${bindir:=.}/reduce -q --log=smpi_kernel.thres:warning > [rank 0] -> Tremblay > [rank 1] -> Jupiter > [rank 2] -> Fafard @@ -16,7 +16,7 @@ $ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform $ > [0] sum=6 ... validation ok. > [0] min=1 ... validation ok. > [0] max=3 ... validation ok. -> ** IBM Test Result: ... +> ** IBM Test Result: ... > ok. > ok. > ok. @@ -25,7 +25,7 @@ $ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform $ ! setenv LD_LIBRARY_PATH=../../lib ! output sort p Test Reduce with 5 processes -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 5 ./reduce -q --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 5 ${bindir:=.}/reduce -q --log=smpi_kernel.thres:warning > [rank 0] -> Tremblay > [rank 1] -> Jupiter > [rank 2] -> Fafard @@ -40,7 +40,7 @@ $ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform $ > [0] sum=15 ... validation ok. > [0] min=1 ... validation ok. > [0] max=5 ... validation ok. -> ** IBM Test Result: ... +> ** IBM Test Result: ... > ok. > ok. > ok. @@ -51,7 +51,7 @@ $ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform $ ! output sort ! setenv LD_LIBRARY_PATH=../../lib p Test Reduce with 12 processes -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 12 ./reduce -q --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 12 ${bindir:=.}/reduce -q --log=smpi_kernel.thres:warning > You requested to use 12 processes, but there is only 5 processes in your hostfile... > [rank 0] -> Tremblay > [rank 1] -> Jupiter @@ -74,7 +74,7 @@ $ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform $ > [0] sum=78 ... validation ok. > [0] min=1 ... validation ok. > [0] max=12 ... validation ok. -> ** IBM Test Result: ... +> ** IBM Test Result: ... > ok. > ok. > ok. diff --git a/teshsuite/smpi/reduce_coll.c b/teshsuite/smpi/reduce/reduce_coll.c similarity index 100% rename from teshsuite/smpi/reduce_coll.c rename to teshsuite/smpi/reduce/reduce_coll.c diff --git a/teshsuite/smpi/reduce_coll.tesh b/teshsuite/smpi/reduce/reduce_coll.tesh similarity index 91% rename from teshsuite/smpi/reduce_coll.tesh rename to teshsuite/smpi/reduce/reduce_coll.tesh index 0edfdc7a03..2612688325 100644 --- a/teshsuite/smpi/reduce_coll.tesh +++ b/teshsuite/smpi/reduce/reduce_coll.tesh @@ -3,7 +3,7 @@ ! output sort p Test allreduce -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ./reduce_coll --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/reduce_coll --log=smpi_kernel.thres:warning > You requested to use 16 processes, but there is only 5 processes in your hostfile... > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) > [0] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ] diff --git a/teshsuite/smpi/reduce_scatter_coll.c b/teshsuite/smpi/reduce/reduce_scatter_coll.c similarity index 100% rename from teshsuite/smpi/reduce_scatter_coll.c rename to teshsuite/smpi/reduce/reduce_scatter_coll.c diff --git a/teshsuite/smpi/reduce_scatter_coll.tesh b/teshsuite/smpi/reduce/reduce_scatter_coll.tesh similarity index 75% rename from teshsuite/smpi/reduce_scatter_coll.tesh rename to teshsuite/smpi/reduce/reduce_scatter_coll.tesh index 249f686ff9..5ef7ce1502 100644 --- a/teshsuite/smpi/reduce_scatter_coll.tesh +++ b/teshsuite/smpi/reduce/reduce_scatter_coll.tesh @@ -3,7 +3,7 @@ ! output sort p Test reduce_scatter -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ./reduce_scatter_coll --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/reduce_scatter_coll --log=smpi_kernel.thres:warning > No Errors > You requested to use 16 processes, but there is only 5 processes in your hostfile... > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) diff --git a/teshsuite/smpi/scatter/CMakeLists.txt b/teshsuite/smpi/scatter/CMakeLists.txt new file mode 100644 index 0000000000..ca5efd0c64 --- /dev/null +++ b/teshsuite/smpi/scatter/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 2.6) + +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() + + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") + + include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + add_executable(scatter scatter.c) + target_link_libraries(scatter simgrid) +endif() + + +set(tesh_files + ${tesh_files} + ${CMAKE_CURRENT_SOURCE_DIR}/scatter_coll.tesh + PARENT_SCOPE + ) +set(xml_files + ${xml_files} + PARENT_SCOPE + ) +set(examples_src + ${examples_src} + ${CMAKE_CURRENT_SOURCE_DIR}/scatter.c + PARENT_SCOPE + ) +set(bin_files + ${bin_files} + PARENT_SCOPE + ) +set(txt_files + ${txt_files} + + PARENT_SCOPE + ) diff --git a/teshsuite/smpi/scatter.c b/teshsuite/smpi/scatter/scatter.c similarity index 96% rename from teshsuite/smpi/scatter.c rename to teshsuite/smpi/scatter/scatter.c index fda82e1724..94d88d355a 100644 --- a/teshsuite/smpi/scatter.c +++ b/teshsuite/smpi/scatter/scatter.c @@ -8,7 +8,7 @@ * MESSAGE PASSING INTERFACE TEST CASE SUITE * * Copyright IBM Corp. 1995 - * + * * IBM Corp. hereby grants a non-exclusive license to use, copy, modify, and *distribute this software for any purpose and without fee provided that the *above copyright notice and the following paragraphs appear in all copies. @@ -80,7 +80,7 @@ static int small_test(int rank, int size) int i; double *sndbuf = NULL; double rcvd; - int root = 0; // arbitrary choice + int root = 0; // arbitrary choice // on root, initialize sendbuf if (root == rank) { @@ -122,7 +122,7 @@ int main(int argc, char **argv) /* test 1 */ if (0 == rank) - printf("** Small Test Result: ... \n"); + printf("** Small Test Result: ...\n"); if (!small_test(rank, size)) printf("\t[%d] failed.\n", rank); else @@ -133,7 +133,7 @@ int main(int argc, char **argv) /* test 2 */ if (0 == rank) - printf("** IBM Test Result: ... \n"); + printf("** IBM Test Result: ...\n"); if (!ibm_test(rank, size)) printf("\t[%d] failed.\n", rank); else diff --git a/teshsuite/smpi/scatter_coll.tesh b/teshsuite/smpi/scatter/scatter_coll.tesh similarity index 79% rename from teshsuite/smpi/scatter_coll.tesh rename to teshsuite/smpi/scatter/scatter_coll.tesh index 043ec55a09..84a41c5f56 100644 --- a/teshsuite/smpi/scatter_coll.tesh +++ b/teshsuite/smpi/scatter/scatter_coll.tesh @@ -3,7 +3,7 @@ ! output sort p Test scatter -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ./scatter --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/scatter --log=smpi_kernel.thres:warning > [0] ok. > [0] ok. > [10] ok. @@ -36,8 +36,8 @@ $ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform $ > [8] ok. > [9] ok. > [9] ok. -> ** IBM Test Result: ... -> ** Small Test Result: ... +> ** IBM Test Result: ... +> ** Small Test Result: ... > You requested to use 16 processes, but there is only 5 processes in your hostfile... > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) > [rank 0] -> Tremblay diff --git a/teshsuite/smpi/sendrecv.c b/teshsuite/smpi/sendrecv.c deleted file mode 100644 index 5a55887039..0000000000 --- a/teshsuite/smpi/sendrecv.c +++ /dev/null @@ -1,70 +0,0 @@ -/* Copyright (c) 2009-2010, 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 "mpi.h" - -static int test(int myid, int numprocs) -{ -// The tags should match on the sender and receiver side. -// The distinction between sendtag and recvtag is mainly -// useful to make some other Recv or Send calls match the sendrecv. -#define TAG_RCV 999 -#define TAG_SND 999 - - -#define BUFLEN 10 - int left, right; - int buffer[BUFLEN], buffer2[BUFLEN]; - int i; - MPI_Status status; - - for (i = 0; i < BUFLEN; i++) { - buffer[i] = myid; - } - - right = (myid + 1) % numprocs; - left = myid - 1; - if (left < 0) - left = numprocs - 1; - - /* performs a right-to-left shift of vectors */ - MPI_Sendrecv(buffer, 10, MPI_INT, left, TAG_SND, buffer2, 10, MPI_INT, - right, TAG_RCV, MPI_COMM_WORLD, &status); - - for (i = 0; i < BUFLEN; i++) { - if (buffer2[i] != right) { - fprintf(stderr, "[%d] error: should have values %d, has %d\n", myid, - right, buffer2[i]); - return (0); - } - } - return (1); -} - -int main(int argc, char *argv[]) -{ - - int myid, numprocs; - - MPI_Init(&argc, &argv); - MPI_Comm_size(MPI_COMM_WORLD, &numprocs); - MPI_Comm_rank(MPI_COMM_WORLD, &myid); - - - if (0 == myid) - printf("\n *** MPI_Sendrecv test ***\n\n"); - - if (test(myid, numprocs)) { - fprintf(stderr, "[%d] ok.\n", myid); - } else { - fprintf(stderr, "[%d] failed.\n", myid); - } - - - MPI_Finalize(); - return 0; -} diff --git a/teshsuite/smpi/sendtest.c b/teshsuite/smpi/sendtest.c deleted file mode 100644 index bb5c4803d8..0000000000 --- a/teshsuite/smpi/sendtest.c +++ /dev/null @@ -1,92 +0,0 @@ -/* A simple example pingpong pogram to test MPI_Send and MPI_Recv */ - -/* Copyright (c) 2009-2010, 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 -#include -#include - -int main(int argc, char *argv[]) -{ - int rank; - int size; - MPI_Status status; - - int n = 0, m = 0, bytes = 0, workusecs = 0; - int currusecs; - - char *buf = NULL; - int i, j; - struct timeval start_time, stop_time; - struct timeval start_pause, curr_pause; - unsigned long usecs; - - MPI_Init(&argc, &argv); /* Initialize MPI */ - MPI_Comm_size(MPI_COMM_WORLD, &size); /* Get nr of tasks */ - MPI_Comm_rank(MPI_COMM_WORLD, &rank); /* Get id of this process */ - - if (size != 2) { - printf("run this program with exactly 2 processes (-np 2)\n"); - MPI_Finalize(); - exit(0); - } - - if (0 == rank) { - if (argc > 1 && isdigit(argv[1][0])) { - n = atoi(argv[1]); - } - if (argc > 2 && isdigit(argv[2][0])) { - m = atoi(argv[2]); - } - if (argc > 3 && isdigit(argv[3][0])) { - bytes = atoi(argv[3]); - } - if (argc > 4 && isdigit(argv[4][0])) { - workusecs = atoi(argv[4]); - } - buf = malloc(sizeof(char) * bytes); - for (i = 0; i < bytes; i++) buf[i] = i % 256; - MPI_Send(&n, 1, MPI_INT, 1, 0, MPI_COMM_WORLD); - MPI_Send(&m, 1, MPI_INT, 1, 0, MPI_COMM_WORLD); - MPI_Send(&bytes, 1, MPI_INT, 1, 0, MPI_COMM_WORLD); - MPI_Send(&workusecs, 1, MPI_INT, 1, 0, MPI_COMM_WORLD); - MPI_Barrier(MPI_COMM_WORLD); - gettimeofday(&start_time, NULL); - for (i = 0; i < n; i++) { - for (j = 0; j < m; j++) { - MPI_Send(buf, bytes, MPI_CHAR, 1, 0, MPI_COMM_WORLD); - gettimeofday(&start_pause, NULL); - currusecs = 0; - while (currusecs < workusecs) { - gettimeofday(&curr_pause, NULL); - currusecs = (curr_pause.tv_sec - start_pause.tv_sec) * 1e6 + curr_pause.tv_usec - start_pause.tv_usec; - } - } - MPI_Recv(buf, bytes, MPI_CHAR, 1, 0, MPI_COMM_WORLD, &status); - } - gettimeofday(&stop_time, NULL); - usecs = (stop_time.tv_sec - start_time.tv_sec) * 1e6 + stop_time.tv_usec - start_time.tv_usec; - printf("n: %d m: %d bytes: %d sleep: %d usecs: %u\n", n, m, bytes, workusecs, usecs); - } else { - MPI_Recv(&n, 1, MPI_INT, 0, 0, MPI_COMM_WORLD, &status); - MPI_Recv(&m, 1, MPI_INT, 0, 0, MPI_COMM_WORLD, &status); - MPI_Recv(&bytes, 1, MPI_INT, 0, 0, MPI_COMM_WORLD, &status); - MPI_Recv(&workusecs, 1, MPI_INT, 0, 0, MPI_COMM_WORLD, &status); - buf = malloc(sizeof(char) * bytes); - MPI_Barrier(MPI_COMM_WORLD); - for (i = 0; i < n; i++) { - for (j = 0; j < m; j++) { - MPI_Recv(buf, bytes, MPI_CHAR, 0, 0, MPI_COMM_WORLD, &status); - } - MPI_Send(buf, bytes, MPI_CHAR, 0, 0, MPI_COMM_WORLD); - } - } - free(buf); - MPI_Finalize(); - return 0; -} diff --git a/teshsuite/smpi/shared/CMakeLists.txt b/teshsuite/smpi/shared/CMakeLists.txt new file mode 100644 index 0000000000..0e44008dbc --- /dev/null +++ b/teshsuite/smpi/shared/CMakeLists.txt @@ -0,0 +1,42 @@ +cmake_minimum_required(VERSION 2.6) + +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() + + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") + + include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + if(NOT WIN32) + add_executable(shared shared.c) + target_link_libraries(shared simgrid) + endif() +endif() + + +set(tesh_files + ${tesh_files} + ${CMAKE_CURRENT_SOURCE_DIR}/shared.tesh + PARENT_SCOPE + ) +set(xml_files + ${xml_files} + PARENT_SCOPE + ) +set(examples_src + ${examples_src} + ${CMAKE_CURRENT_SOURCE_DIR}/shared.c + PARENT_SCOPE + ) +set(bin_files + ${bin_files} + PARENT_SCOPE + ) +set(txt_files + ${txt_files} + + PARENT_SCOPE + ) diff --git a/teshsuite/smpi/shared.c b/teshsuite/smpi/shared/shared.c similarity index 100% rename from teshsuite/smpi/shared.c rename to teshsuite/smpi/shared/shared.c diff --git a/teshsuite/smpi/shared.tesh b/teshsuite/smpi/shared/shared.tesh similarity index 84% rename from teshsuite/smpi/shared.tesh rename to teshsuite/smpi/shared/shared.tesh index 64d932aace..d1616bb07b 100644 --- a/teshsuite/smpi/shared.tesh +++ b/teshsuite/smpi/shared/shared.tesh @@ -2,7 +2,7 @@ p Test compute ! setenv LD_LIBRARY_PATH=../../lib ! output sort ! timeout 5 -$ ../../smpi_script/bin/smpirun -platform ${srcdir:=.}/../../examples/msg/small_platform_with_routers.xml -hostfile ${srcdir:=.}/hostfile -np 4 ./shared --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 4 ${bindir:=.}/shared --log=smpi_kernel.thres:warning > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' diff --git a/teshsuite/smpi/split.c b/teshsuite/smpi/split.c deleted file mode 100644 index 64a4a862d6..0000000000 --- a/teshsuite/smpi/split.c +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright (c) 2009-2010, 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 worldrank; - int localrank; - MPI_Comm localcomm; - - MPI_Init(&argc, &argv); - MPI_Comm_rank(MPI_COMM_WORLD, &worldrank); - MPI_Comm_split(MPI_COMM_WORLD, worldrank % 2, worldrank, &localcomm); - MPI_Comm_rank(localcomm, &localrank); - printf("node with world rank %d has local rank %d\n", worldrank, localrank); - MPI_Finalize(); - return 0; -} diff --git a/teshsuite/smpi/struct/CMakeLists.txt b/teshsuite/smpi/struct/CMakeLists.txt new file mode 100644 index 0000000000..b8b2a830aa --- /dev/null +++ b/teshsuite/smpi/struct/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 2.6) + +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() + + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") + + include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + add_executable(struct_test struct_test.c) + target_link_libraries(struct_test simgrid) +endif() + + +set(tesh_files + ${tesh_files} + ${CMAKE_CURRENT_SOURCE_DIR}/struct.tesh + PARENT_SCOPE + ) +set(xml_files + ${xml_files} + PARENT_SCOPE + ) +set(examples_src + ${examples_src} + ${CMAKE_CURRENT_SOURCE_DIR}/struct_test.c + PARENT_SCOPE + ) +set(bin_files + ${bin_files} + PARENT_SCOPE + ) +set(txt_files + ${txt_files} + + PARENT_SCOPE + ) diff --git a/teshsuite/smpi/struct.tesh b/teshsuite/smpi/struct/struct.tesh similarity index 79% rename from teshsuite/smpi/struct.tesh rename to teshsuite/smpi/struct/struct.tesh index ebeb8c65af..bd0872e4f0 100644 --- a/teshsuite/smpi/struct.tesh +++ b/teshsuite/smpi/struct/struct.tesh @@ -1,7 +1,7 @@ p Test struct ! setenv LD_LIBRARY_PATH=../../lib ! output sort -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 2 ./struct_test -q --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 2 ${bindir:=.}/struct_test -q --log=smpi_kernel.thres:warning > Process 0 got -2 (-2?) and 8.000000 (8.0?), tab (should be all 0): 0 0 0 0 0 0 > Process 1 got -2 (-2?) and 8.000000 (8.0?), tab (should be all 0): 0 0 0 0 0 0 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) diff --git a/teshsuite/smpi/struct_test.c b/teshsuite/smpi/struct/struct_test.c similarity index 100% rename from teshsuite/smpi/struct_test.c rename to teshsuite/smpi/struct/struct_test.c diff --git a/teshsuite/smpi/ttest01.c b/teshsuite/smpi/ttest01.c deleted file mode 100644 index c01db5b7a6..0000000000 --- a/teshsuite/smpi/ttest01.c +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright (c) 2009-2010, 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 "mpi.h" -#include "instr/instr.h" - -#define DATATOSENT 100000000 - -int main(int argc, char *argv[]) -{ - MPI_Status status; - int rank, numprocs, tag = 0; - int *r = malloc(sizeof(int) * DATATOSENT); - - MPI_Init(&argc, &argv); - MPI_Comm_size(MPI_COMM_WORLD, &numprocs); - MPI_Comm_rank(MPI_COMM_WORLD, &rank); - - - int i; - for (i = 0; i < 10; i++) { - TRACE_smpi_set_category("A"); - if (rank == 0) { - MPI_Send(r, DATATOSENT, MPI_INT, 1, tag, MPI_COMM_WORLD); - } else if (rank == 1) { - MPI_Recv(r, DATATOSENT, MPI_INT, 0, tag, MPI_COMM_WORLD, &status); - } else { - //do nothing - } - - TRACE_smpi_set_category("B"); - if (rank == 0) { - MPI_Recv(r, DATATOSENT, MPI_INT, 1, tag, MPI_COMM_WORLD, &status); - } else if (rank == 1) { - MPI_Send(r, DATATOSENT, MPI_INT, 0, tag, MPI_COMM_WORLD); - } else { - //do nothing - } - } - TRACE_smpi_set_category("C"); - MPI_Barrier(MPI_COMM_WORLD); - MPI_Finalize(); - return 0; -} diff --git a/teshsuite/smpi/vector/CMakeLists.txt b/teshsuite/smpi/vector/CMakeLists.txt new file mode 100644 index 0000000000..0eb0ee2b25 --- /dev/null +++ b/teshsuite/smpi/vector/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 2.6) + +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() + + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") + + include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + add_executable(vector_test vector_test.c) + target_link_libraries(vector_test simgrid) +endif() + + +set(tesh_files + ${tesh_files} + ${CMAKE_CURRENT_SOURCE_DIR}/vector.tesh + PARENT_SCOPE + ) +set(xml_files + ${xml_files} + PARENT_SCOPE + ) +set(examples_src + ${examples_src} + ${CMAKE_CURRENT_SOURCE_DIR}/vector_test.c + PARENT_SCOPE + ) +set(bin_files + ${bin_files} + PARENT_SCOPE + ) +set(txt_files + ${txt_files} + + PARENT_SCOPE + ) diff --git a/teshsuite/smpi/vector.tesh b/teshsuite/smpi/vector/vector.tesh similarity index 88% rename from teshsuite/smpi/vector.tesh rename to teshsuite/smpi/vector/vector.tesh index e9a31a65db..3e6d81b331 100644 --- a/teshsuite/smpi/vector.tesh +++ b/teshsuite/smpi/vector/vector.tesh @@ -1,7 +1,7 @@ p Test vector ! setenv LD_LIBRARY_PATH=../../lib ! output sort -$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 2 ./vector_test -q --log=smpi_kernel.thres:warning +$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 2 ${bindir:=.}/vector_test -q --log=smpi_kernel.thres:warning > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' diff --git a/teshsuite/smpi/vector_test.c b/teshsuite/smpi/vector/vector_test.c similarity index 100% rename from teshsuite/smpi/vector_test.c rename to teshsuite/smpi/vector/vector_test.c