From 90f50bba185f1c86225aa498dcc3a01c9080b52b Mon Sep 17 00:00:00 2001 From: degomme Date: Sat, 11 Feb 2017 21:07:54 +0100 Subject: [PATCH 1/1] Fix dist --- teshsuite/smpi/mpich3-test/coll/CMakeLists.txt | 9 +++++---- teshsuite/smpi/mpich3-test/comm/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt | 8 ++++---- teshsuite/smpi/mpich3-test/datatype/hvecblklen.c | 2 +- teshsuite/smpi/mpich3-test/datatype/vecblklen.c | 2 +- teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt | 9 +++++---- teshsuite/smpi/mpich3-test/pt2pt/cancelanysrc.c | 1 + teshsuite/smpi/mpich3-test/pt2pt/scancel_unmatch.c | 2 -- teshsuite/smpi/mpich3-test/pt2pt/testlist | 5 +++++ 9 files changed, 23 insertions(+), 17 deletions(-) diff --git a/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt index 88a6ddfb86..19fe08f8dd 100644 --- a/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt @@ -52,6 +52,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) add_executable(exscan2 exscan2.c) add_executable(exscan exscan.c) add_executable(gather2 gather2.c) + add_executable(gather_big gather_big.c) add_executable(gather gather.c) # add_executable(iallred iallred.c) # add_executable(ibarrier ibarrier.c) @@ -71,7 +72,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) add_executable(longuser longuser.c) # add_executable(nonblocking2 nonblocking2.c) # add_executable(nonblocking3 nonblocking3.c) -# add_executable(nonblocking4 nonblocking4.c) # add_executable(nonblocking nonblocking.c) # add_executable(opband opband.c) # add_executable(opbor opbor.c) @@ -107,10 +107,10 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) target_link_libraries(allgather2 simgrid mtest_c) target_link_libraries(allgather3 simgrid mtest_c) + target_link_libraries(allgather_struct simgrid mtest_c) target_link_libraries(allgatherv2 simgrid mtest_c) target_link_libraries(allgatherv3 simgrid mtest_c) target_link_libraries(allgatherv4 simgrid mtest_c) - target_link_libraries(allgather_struct simgrid mtest_c) target_link_libraries(allred2 simgrid mtest_c) target_link_libraries(allred3 simgrid mtest_c) target_link_libraries(allred4 simgrid mtest_c) @@ -144,6 +144,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) target_link_libraries(exscan2 simgrid mtest_c) target_link_libraries(exscan simgrid mtest_c) target_link_libraries(gather2 simgrid mtest_c) + target_link_libraries(gather_big simgrid mtest_c) target_link_libraries(gather simgrid mtest_c) # target_link_libraries(iallred simgrid mtest_c) # target_link_libraries(ibarrier simgrid mtest_c) @@ -163,7 +164,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) target_link_libraries(longuser simgrid mtest_c) # target_link_libraries(nonblocking2 simgrid mtest_c) # target_link_libraries(nonblocking3 simgrid mtest_c) -# target_link_libraries(nonblocking4 simgrid mtest_c) # target_link_libraries(nonblocking simgrid mtest_c) # target_link_libraries(opband simgrid mtest_c) # target_link_libraries(opbor simgrid mtest_c) @@ -229,6 +229,7 @@ endif() set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/allgather2.c + ${CMAKE_CURRENT_SOURCE_DIR}/allgather_struct.c ${CMAKE_CURRENT_SOURCE_DIR}/allgather3.c ${CMAKE_CURRENT_SOURCE_DIR}/allgatherv2.c ${CMAKE_CURRENT_SOURCE_DIR}/allgatherv3.c @@ -265,6 +266,7 @@ set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/exscan2.c ${CMAKE_CURRENT_SOURCE_DIR}/exscan.c ${CMAKE_CURRENT_SOURCE_DIR}/gather2.c + ${CMAKE_CURRENT_SOURCE_DIR}/gather_big.c ${CMAKE_CURRENT_SOURCE_DIR}/gather.c ${CMAKE_CURRENT_SOURCE_DIR}/iallred.c ${CMAKE_CURRENT_SOURCE_DIR}/ibarrier.c @@ -285,7 +287,6 @@ set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/nonblocking2.c ${CMAKE_CURRENT_SOURCE_DIR}/nonblocking3.c ${CMAKE_CURRENT_SOURCE_DIR}/nonblocking.c - ${CMAKE_CURRENT_SOURCE_DIR}/nonblocking4.c ${CMAKE_CURRENT_SOURCE_DIR}/opband.c ${CMAKE_CURRENT_SOURCE_DIR}/opbor.c ${CMAKE_CURRENT_SOURCE_DIR}/opbxor.c diff --git a/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt b/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt index 8d7f6043dc..6bb91e627c 100644 --- a/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt @@ -25,7 +25,7 @@ endif() foreach(file cmfree cmsplit2 cmsplit cmsplit_type commcreate1 comm_create_group comm_group_half comm_group_rand comm_idup comm_idup_overlap comm_idup_mul comm_info commname ctxalloc ctxsplit dup dupic dup_with_info ic1 ic2 - iccreate icgroup icm icsplit probe-intercomm comm_create_group_idup.c comm_idup_comm.c comm_idup_mul.c comm_idup.c comm_idup_iallreduce.c comm_idup_nb.c comm_idup_comm2.c comm_idup_isend.c comm_idup_overlap.c + iccreate icgroup icm icsplit probe-intercomm comm_create_group_idup comm_idup_comm comm_idup_mul comm_idup comm_idup_iallreduce comm_idup_nb comm_idup_comm2 comm_idup_isend comm_idup_overlap ) set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${file}.c) endforeach() diff --git a/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt index 4f8814c2e2..04bc7eed3c 100644 --- a/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt @@ -10,14 +10,14 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") foreach(file blockindexed-zero-count contigstruct contig-zero-count cxx-types dataalign gaddress hindexed_block - hindexed_block_contents large_vec localpack longdouble simple-commit simple-pack simple-resized simple-size-extent + hindexed_block_contents hvecblklen large_vec localpack longdouble simple-commit simple-pack simple-resized simple-size-extent struct-derived-zeros struct-ezhov struct-pack struct-verydeep struct-zero-count tfree transpose-pack tresized2 - tresized typecommit typefree typelb typename unpack zeroblks zeroparms) + tresized typecommit typefree typelb typename unpack vecblklen zeroblks zeroparms) # not compiled files # blockindexed-misc contents darray-cyclic darray-pack get-elements get-elements-pairtype getpartelm get-struct - # hindexed-zeros hvecblklen indexed-misc large-count large_type large_type_sendrec lbub lots-of-type pairtype-pack + # hindexed-zeros indexed-misc large-count large_type large_type_sendrec lbub lots-of-type pairtype-pack # pairtype-size-extent segtest simple-pack-external simple-pack-external2 sizedtypes slice-pack slice-pack-external struct-empty-el - # struct-no-real-type structpack2 subarray subarray-pack tmatchsize triangular-pack unusual-noncontigs vecblklen + # struct-no-real-type structpack2 subarray subarray-pack tmatchsize triangular-pack unusual-noncontigs # zero-blklen-vector add_executable(${file} ${file}.c) target_link_libraries(${file} simgrid mtest_c) diff --git a/teshsuite/smpi/mpich3-test/datatype/hvecblklen.c b/teshsuite/smpi/mpich3-test/datatype/hvecblklen.c index 273488533f..cc692e9be6 100644 --- a/teshsuite/smpi/mpich3-test/datatype/hvecblklen.c +++ b/teshsuite/smpi/mpich3-test/datatype/hvecblklen.c @@ -16,7 +16,7 @@ int main(int argc, char *argv[]) { MPI_Datatype ot, ot2, newtype; int position, psize, insize, outsize; - signed char *inbuf = 0, *outbuf = 0, *pbuf = 0, *p; + char *inbuf = 0, *outbuf = 0, *pbuf = 0, *p; int i, j, k; int errs = 0; int veccount = 16, stride = 16; diff --git a/teshsuite/smpi/mpich3-test/datatype/vecblklen.c b/teshsuite/smpi/mpich3-test/datatype/vecblklen.c index 50bac854fa..61637ad432 100644 --- a/teshsuite/smpi/mpich3-test/datatype/vecblklen.c +++ b/teshsuite/smpi/mpich3-test/datatype/vecblklen.c @@ -16,7 +16,7 @@ int main(int argc, char *argv[]) { MPI_Datatype ot, ot2, newtype; int position, psize, insize, outsize; - signed char *inbuf = 0, *outbuf = 0, *pbuf = 0, *p; + char *inbuf = 0, *outbuf = 0, *pbuf = 0, *p; int i, j, k; int errs = 0; int veccount = 16, stride = 16; diff --git a/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt index ebf185798d..9496160941 100644 --- a/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt @@ -9,10 +9,10 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") - foreach(file anyall bottom eagerdt inactivereq isendself isendirecv isendselfprobe issendselfcancel pingping probenull - probe-unexp sendall sendflood sendrecv1 sendrecv2 sendrecv3 waitany-null waittestnull ) + foreach(file anyall bottom eagerdt inactivereq isendself isendirecv isendselfprobe issendselfcancel cancelanysrc pingping probenull + dtype_send probe-unexp sendall sendflood sendrecv1 sendrecv2 sendrecv3 waitany-null waittestnull many_isend manylmt recv_any) # not compiled files: big_count_status bsend1 bsend2 bsend3 bsend4 bsend5 bsendalign bsendfrag bsendpending mprobe - # cancelrecv greq1 icsend large_message pscancel rcancel rqfreeb rqstatus scancel2 scancel sendself + # cancelrecv greq1 icsend large_message pscancel rcancel rqfreeb rqstatus scancel2 scancel sendself scancel_unmatch add_executable(${file} ${file}.c) target_link_libraries(${file} simgrid mtest_c) endforeach() @@ -26,7 +26,8 @@ endif() foreach(file anyall bottom eagerdt inactivereq isendself isendirecv isendselfprobe issendselfcancel pingping probenull probe-unexp sendall sendflood sendrecv1 sendrecv2 sendrecv3 waitany-null waittestnull big_count_status bsend1 bsend2 bsend3 bsend4 bsend5 bsendalign bsendfrag bsendpending - cancelrecv greq1 icsend large_message pscancel rcancel rqfreeb rqstatus scancel2 scancel sendself) + cancelrecv cancelanysrc dtype_send greq1 icsend large_message pscancel rcancel rqfreeb rqstatus scancel2 scancel sendself many_isend manylmt mprobe recv_any scancel_unmatch +) set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${file}.c) endforeach() diff --git a/teshsuite/smpi/mpich3-test/pt2pt/cancelanysrc.c b/teshsuite/smpi/mpich3-test/pt2pt/cancelanysrc.c index e0ba2c5c49..96cb6803f8 100644 --- a/teshsuite/smpi/mpich3-test/pt2pt/cancelanysrc.c +++ b/teshsuite/smpi/mpich3-test/pt2pt/cancelanysrc.c @@ -47,4 +47,5 @@ int main(int argc, char **argv) printf(" No Errors\n"); MPI_Finalize(); + return 0; } diff --git a/teshsuite/smpi/mpich3-test/pt2pt/scancel_unmatch.c b/teshsuite/smpi/mpich3-test/pt2pt/scancel_unmatch.c index 350e3874c3..c8ff7547fa 100644 --- a/teshsuite/smpi/mpich3-test/pt2pt/scancel_unmatch.c +++ b/teshsuite/smpi/mpich3-test/pt2pt/scancel_unmatch.c @@ -27,8 +27,6 @@ int main(int argc, char *argv[]) MPI_Comm_rank(MPI_COMM_WORLD, &rank); MPI_Comm_size(MPI_COMM_WORLD, &size); - int source = 0; - int dest = size - 1; if (rank == 0) { a = 10; diff --git a/teshsuite/smpi/mpich3-test/pt2pt/testlist b/teshsuite/smpi/mpich3-test/pt2pt/testlist index 846b1e1ff4..5cac6c438a 100644 --- a/teshsuite/smpi/mpich3-test/pt2pt/testlist +++ b/teshsuite/smpi/mpich3-test/pt2pt/testlist @@ -51,3 +51,8 @@ waitany-null 1 #large_message 3 mprobe 2 mpiversion=3.0 big_count_status 1 mpiversion=3.0 +many_isend 3 +manylmt 2 +#Needs MPI_Irsend +#dtype_send 2 +recv_any 2 -- 2.20.1