From b3b0436f0dd7d2216764a7c0d1f25ed9312d524e Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Sun, 14 Apr 2019 18:12:56 +0200 Subject: [PATCH] comment tests we don't support in MPI3, and fix a few we support --- teshsuite/smpi/mpich3-test/coll/testlist | 20 +++++++++---------- teshsuite/smpi/mpich3-test/comm/comm_info.c | 2 +- teshsuite/smpi/mpich3-test/comm/testlist | 18 ++++++++--------- teshsuite/smpi/mpich3-test/datatype/testlist | 3 ++- .../smpi/mpich3-test/f77/pt2pt/CMakeLists.txt | 4 ++-- teshsuite/smpi/mpich3-test/f77/pt2pt/testlist | 2 +- .../smpi/mpich3-test/f90/pt2pt/CMakeLists.txt | 4 ++-- teshsuite/smpi/mpich3-test/f90/pt2pt/testlist | 2 +- .../smpi/mpich3-test/info/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/pt2pt/testlist | 4 ++-- teshsuite/smpi/mpich3-test/rma/CMakeLists.txt | 6 +++--- .../smpi/mpich3-test/rma/racc_local_comp.c | 3 ++- teshsuite/smpi/mpich3-test/rma/testlist | 2 +- 13 files changed, 37 insertions(+), 35 deletions(-) diff --git a/teshsuite/smpi/mpich3-test/coll/testlist b/teshsuite/smpi/mpich3-test/coll/testlist index ee269cefa7..69fdc0e9c1 100644 --- a/teshsuite/smpi/mpich3-test/coll/testlist +++ b/teshsuite/smpi/mpich3-test/coll/testlist @@ -137,19 +137,19 @@ nonblocking2 1 nonblocking2 4 nonblocking2 5 nonblocking2 10 -nonblocking3 1 mpiversion=3.0 -nonblocking3 4 mpiversion=3.0 -nonblocking3 5 mpiversion=3.0 -nonblocking3 10 timeLimit=600 mpiversion=3.0 +#nonblocking3 1 mpiversion=3.0 +#nonblocking3 4 mpiversion=3.0 +#nonblocking3 5 mpiversion=3.0 +#nonblocking3 10 timeLimit=600 mpiversion=3.0 iallred 2 # ibarrier will hang forever if it fails, but will complete quickly if it # succeeds ibarrier 2 timeLimit=30 # run some of the tests, relinked with the nbc_pmpi_adaptor.o file -nballtoall1 8 mpiversion=3.0 -nbcoll2 5 mpiversion=3.0 -nbredscat 4 mpiversion=3.0 -nbredscat 8 mpiversion=3.0 -nbredscat3 8 mpiversion=3.0 -nbredscatinter 8 mpiversion=3.0 +#nballtoall1 8 mpiversion=3.0 +#nbcoll2 5 mpiversion=3.0 +#nbredscat 4 mpiversion=3.0 +#nbredscat 8 mpiversion=3.0 +#nbredscat3 8 mpiversion=3.0 +#nbredscatinter 8 mpiversion=3.0 diff --git a/teshsuite/smpi/mpich3-test/comm/comm_info.c b/teshsuite/smpi/mpich3-test/comm/comm_info.c index 29e3b1bf93..e047c25509 100644 --- a/teshsuite/smpi/mpich3-test/comm/comm_info.c +++ b/teshsuite/smpi/mpich3-test/comm/comm_info.c @@ -35,7 +35,7 @@ int main(int argc, char **argv) MPI_Comm_get_info(comm, &info_out); MPI_Info_get(info_out, invalid_key, MPI_MAX_INFO_VAL, buf, &flag); -#ifndef USE_STRICT_MPI +#ifdef USE_STRICT_MPI /* Check if our invalid key was ignored. Note, this check's MPICH's * behavior, but this behavior may not be required for a standard * conforming MPI implementation. */ diff --git a/teshsuite/smpi/mpich3-test/comm/testlist b/teshsuite/smpi/mpich3-test/comm/testlist index 694b941f0b..fbe29317c3 100644 --- a/teshsuite/smpi/mpich3-test/comm/testlist +++ b/teshsuite/smpi/mpich3-test/comm/testlist @@ -18,7 +18,7 @@ cmfree 4 cmsplit 4 cmsplit2 12 #probe-intercomm 2 -cmsplit_type 4 mpiversion=3.0 +#cmsplit_type 4 mpiversion=3.0 comm_create_group 4 mpiversion=3.0 comm_create_group 8 mpiversion=3.0 comm_group_half 2 mpiversion=3.0 @@ -27,12 +27,12 @@ comm_group_half 8 mpiversion=3.0 comm_group_rand 2 mpiversion=3.0 comm_group_rand 4 mpiversion=3.0 comm_group_rand 8 mpiversion=3.0 -comm_idup 2 mpiversion=3.0 -comm_idup 4 mpiversion=3.0 -comm_idup 9 mpiversion=3.0 -comm_idup_mul 2 mpiversion=3.0 -comm_idup_overlap 2 mpiversion=3.0 -dup_with_info 2 mpiversion=3.0 -dup_with_info 4 mpiversion=3.0 -dup_with_info 9 mpiversion=3.0 +#comm_idup 2 mpiversion=3.0 +#comm_idup 4 mpiversion=3.0 +#comm_idup 9 mpiversion=3.0 +#comm_idup_mul 2 mpiversion=3.0 +#comm_idup_overlap 2 mpiversion=3.0 +#dup_with_info 2 mpiversion=3.0 +#dup_with_info 4 mpiversion=3.0 +#dup_with_info 9 mpiversion=3.0 comm_info 6 mpiversion=3.0 diff --git a/teshsuite/smpi/mpich3-test/datatype/testlist b/teshsuite/smpi/mpich3-test/datatype/testlist index 98fb32cbd9..d85299f580 100644 --- a/teshsuite/smpi/mpich3-test/datatype/testlist +++ b/teshsuite/smpi/mpich3-test/datatype/testlist @@ -61,7 +61,8 @@ struct-derived-zeros 1 struct-verydeep 1 #get-elements 1 hindexed_block 1 mpiversion=3.0 -hindexed_block_contents 1 mpiversion=3.0 +#needs MPI_Type_get_envelope +#hindexed_block_contents 1 mpiversion=3.0 vecblklen 1 hvecblklen 1 longdouble 1 diff --git a/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt index 3e1bb3e8ab..07fc59922c 100644 --- a/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt @@ -10,13 +10,13 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(allpairf EXCLUDE_FROM_ALL allpairf.f) -# add_executable(greqf EXCLUDE_FROM_ALL greqf.f dummyf.f) + add_executable(greqf EXCLUDE_FROM_ALL greqf.f dummyf.f) # add_executable(mprobef EXCLUDE_FROM_ALL mprobef.f) add_executable(statusesf EXCLUDE_FROM_ALL statusesf.f) add_dependencies(tests allpairf statusesf) # greqf mprobef target_link_libraries(allpairf simgrid mtest_f77) -# target_link_libraries(greqf simgrid mtest_f77) + target_link_libraries(greqf simgrid mtest_f77) #target_link_libraries(mprobef simgrid mtest_f77) target_link_libraries(statusesf simgrid mtest_f77) endif() diff --git a/teshsuite/smpi/mpich3-test/f77/pt2pt/testlist b/teshsuite/smpi/mpich3-test/f77/pt2pt/testlist index b71a61fcff..4b263fd95f 100644 --- a/teshsuite/smpi/mpich3-test/f77/pt2pt/testlist +++ b/teshsuite/smpi/mpich3-test/f77/pt2pt/testlist @@ -1,4 +1,4 @@ statusesf 1 #greqf 1 allpairf 2 needs_privatization=1 -mprobef 2 mpiversion=3.0 +#mprobef 2 mpiversion=3.0 diff --git a/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt index 3b47871691..ca7d9f6bc9 100644 --- a/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt @@ -8,8 +8,8 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - foreach(test allpairf90 - # greqf90 mprobef90 + foreach(test allpairf90 greqf90 + # mprobef90 statusesf90) add_executable(${test} EXCLUDE_FROM_ALL ${test}.f90) add_dependencies(tests ${test}) diff --git a/teshsuite/smpi/mpich3-test/f90/pt2pt/testlist b/teshsuite/smpi/mpich3-test/f90/pt2pt/testlist index d7a4b64fde..3ee90a4b11 100644 --- a/teshsuite/smpi/mpich3-test/f90/pt2pt/testlist +++ b/teshsuite/smpi/mpich3-test/f90/pt2pt/testlist @@ -2,4 +2,4 @@ statusesf90 1 #greqf90 1 allpairf90 2 needs_privatization=1 -mprobef90 2 mpiversion=3.0 +#mprobef90 2 mpiversion=3.0 diff --git a/teshsuite/smpi/mpich3-test/info/CMakeLists.txt b/teshsuite/smpi/mpich3-test/info/CMakeLists.txt index 92f123a688..69188228aa 100644 --- a/teshsuite/smpi/mpich3-test/info/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/info/CMakeLists.txt @@ -9,7 +9,7 @@ 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 infodel infodup infomany2 infomany infoorder infotest infoget infovallen) #infoenv + foreach(file infodel infodup infomany2 infomany infoorder infotest infoget infovallen infoenv) add_executable(${file} EXCLUDE_FROM_ALL ${file}.c) add_dependencies(tests ${file}) target_link_libraries(${file} simgrid mtest_c) diff --git a/teshsuite/smpi/mpich3-test/pt2pt/testlist b/teshsuite/smpi/mpich3-test/pt2pt/testlist index 7f151b5278..6d274a6117 100644 --- a/teshsuite/smpi/mpich3-test/pt2pt/testlist +++ b/teshsuite/smpi/mpich3-test/pt2pt/testlist @@ -46,8 +46,8 @@ waitany-null 1 # this should be run only on machines with large amount of memory (>=8GB) # perhaps disable in the release tarball #large_message 3 -mprobe 2 mpiversion=3.0 -big_count_status 1 mpiversion=3.0 +#mprobe 2 mpiversion=3.0 +#big_count_status 1 mpiversion=3.0 many_isend 3 manylmt 2 huge_anysrc 2 diff --git a/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt index d1be6d3b19..2e82577705 100644 --- a/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt @@ -19,14 +19,14 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) strided_acc_onelock strided_get_indexed strided_putget_indexed contention_put contention_putget adlb_mimic1 lock_contention_dt acc-loc get_acc_local get_accumulate put_base put_bottom linked_list_bench_lock_all linked_list_bench_lock_excl manyrma2 pscw_ordering rma-contig get-struct - rput_local_comp racc_local_comp rget-testall win_shared) + rput_local_comp racc_local_comp rget-testall win_shared win_shared_put_flush_get) # fence_shm fetchandadd_am fetchandadd fetchandadd_tree_am fetchandadd_tree # linked_list_bench_lock_shr linked_list linked_list_fop linked_list_lockall # mcs-mutex mixedsync mutex_bench lockcontention3 reqops # strided_getacc_indexed_shared rget-unlock - # win_flavors win_shared_noncontig win_shared_noncontig_put + # win_flavors win_shared_zerobyte win_shared_noncontig win_shared_noncontig_put # win_large_shm win_zero wintest atomic_rmw_fop atomic_rmw_gacc atomic_get atomic_rmw_cas - # win_shared_zerobyte aint derived-acc-flush_local large-acc-flush_local + # aint derived-acc-flush_local large-acc-flush_local # win_shared_create win_shared_put_flush_get win_shared_rma_flush_load # wrma_flush_get add_executable(${file} EXCLUDE_FROM_ALL ${file}.c) diff --git a/teshsuite/smpi/mpich3-test/rma/racc_local_comp.c b/teshsuite/smpi/mpich3-test/rma/racc_local_comp.c index ea9e57c8ed..a86c766d1a 100644 --- a/teshsuite/smpi/mpich3-test/rma/racc_local_comp.c +++ b/teshsuite/smpi/mpich3-test/rma/racc_local_comp.c @@ -35,7 +35,8 @@ int main(int argc, char *argv[]) MPI_COMM_WORLD, &window); MPI_Win_lock_all(0, window); - + buf[0] = 0; + winbuf[0]=0; /* Test Raccumulate local completion with small data. * Small data is always copied to header packet as immediate data. */ if (rank == 1) { diff --git a/teshsuite/smpi/mpich3-test/rma/testlist b/teshsuite/smpi/mpich3-test/rma/testlist index e2562a80a7..d87cc3026a 100644 --- a/teshsuite/smpi/mpich3-test/rma/testlist +++ b/teshsuite/smpi/mpich3-test/rma/testlist @@ -132,7 +132,7 @@ acc-loc 4 #fence_shm 2 mpiversion=3.0 #mutex_bench 4 mpiversion=3.0 #mutex_bench_shared 4 mpiversion=3.0 -win_shared_zerobyte 4 mpiversion=3.0 +#win_shared_zerobyte 4 mpiversion=3.0 win_shared_put_flush_get 4 mpiversion=3.0 get-struct 2 at_complete 2 -- 2.20.1