From 5ffbdb20797e6741e7b0b4b68a3f733bd32d45c5 Mon Sep 17 00:00:00 2001 From: degomme Date: Wed, 15 Mar 2017 23:26:59 +0100 Subject: [PATCH] activate new mpich tests as we support new functions/features for attr/win --- teshsuite/smpi/mpich3-test/attr/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/attr/fkeyvaltype.c | 4 ++-- teshsuite/smpi/mpich3-test/attr/testlist | 9 ++++----- teshsuite/smpi/mpich3-test/include/mpitestconf.h | 2 +- teshsuite/smpi/mpich3-test/rma/CMakeLists.txt | 6 +++--- teshsuite/smpi/mpich3-test/rma/testlist | 12 ++++-------- 6 files changed, 15 insertions(+), 20 deletions(-) diff --git a/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt b/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt index 55db578c9d..c92d6e2481 100644 --- a/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt @@ -10,7 +10,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") foreach(file attr2type attrdeleteget attrend2 attrend attrerr attrerrcomm attrerrtype attrorder attrordercomm attrordertype attrt - baseattr2 baseattrcomm fkeyval) #attric fkeyvalcomm fkeyvaltype keyval_double_free + baseattr2 baseattrcomm fkeyval fkeyvalcomm fkeyvaltype keyval_double_free) #attric add_executable(${file} ${file}.c) target_link_libraries(${file} simgrid mtest_c) endforeach() diff --git a/teshsuite/smpi/mpich3-test/attr/fkeyvaltype.c b/teshsuite/smpi/mpich3-test/attr/fkeyvaltype.c index 59cfe0b447..55f172512d 100644 --- a/teshsuite/smpi/mpich3-test/attr/fkeyvaltype.c +++ b/teshsuite/smpi/mpich3-test/attr/fkeyvaltype.c @@ -63,7 +63,7 @@ int main(int argc, char *argv[]) /* We create some dummy keyvals here in case the same keyval * is reused */ - for (i = 0; i < 32; i++) { + for (i = 0; i < 1; i++) { MPI_Type_create_keyval(MPI_NULL_COPY_FN, MPI_NULL_DELETE_FN, &key[i], (void *) 0); } @@ -105,7 +105,7 @@ int main(int argc, char *argv[]) } } /* Free those other keyvals */ - for (i = 0; i < 32; i++) { + for (i = 0; i < 1; i++) { MPI_Type_free_keyval(&key[i]); } MTestFreeDatatype(&mrtype); diff --git a/teshsuite/smpi/mpich3-test/attr/testlist b/teshsuite/smpi/mpich3-test/attr/testlist index c798a8c772..8d54a3e8c2 100644 --- a/teshsuite/smpi/mpich3-test/attr/testlist +++ b/teshsuite/smpi/mpich3-test/attr/testlist @@ -20,8 +20,7 @@ attrordercomm 1 attrordertype 1 baseattr2 1 baseattrcomm 1 -#would need a refcount in keyval and attr -#fkeyval 1 -#fkeyvalcomm 1 -#fkeyvaltype 1 -#keyval_double_free 1 +fkeyval 1 +fkeyvalcomm 1 +fkeyvaltype 1 +keyval_double_free 1 diff --git a/teshsuite/smpi/mpich3-test/include/mpitestconf.h b/teshsuite/smpi/mpich3-test/include/mpitestconf.h index 2e073ada68..03c66766d3 100644 --- a/teshsuite/smpi/mpich3-test/include/mpitestconf.h +++ b/teshsuite/smpi/mpich3-test/include/mpitestconf.h @@ -103,7 +103,7 @@ #define HAVE_MPI_SPAWN 1 /* Define if MPI_Win_create is available */ -//#define HAVE_MPI_WIN_CREATE 1 +#define HAVE_MPI_WIN_CREATE 1 /* define if the compiler implements namespaces */ #define HAVE_NAMESPACES /**/ diff --git a/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt index 13dee7164b..58db67f64c 100644 --- a/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt @@ -14,8 +14,8 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) putfence1 putfidx putpscw1 test1_am test1 test1_dt test2_am test2 test3 test5_am test5 transpose1 transpose2 transpose3 transpose6 transpose7 window_creation at_complete acc-pairtype manyget large-small-acc - lock_nested) - # not compiled files: acc-loc adlb_mimic1 attrorderwin badrma baseattrwin compare_and_swap contention_put + lock_nested winname attrorderwin baseattrwin fkeyvalwin) + # not compiled files: acc-loc adlb_mimic1 badrma compare_and_swap contention_put # contention_putget contig_displ fence_shm fetchandadd_am fetchandadd fetchandadd_tree_am fetchandadd_tree # fetch_and_op fkeyvalwin flush get_acc_local get_accumulate linked_list_bench_lock_all # linked_list_bench_lock_excl linked_list_bench_lock_shr linked_list linked_list_fop linked_list_lockall @@ -23,7 +23,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) # pscw_ordering put_base put_bottom req_example reqops rmanull rmazero rma-contig selfrma strided_acc_indexed # strided_acc_onelock strided_acc_subarray strided_getacc_indexed strided_getacc_indexed_shared strided_get_indexed # strided_putget_indexed strided_putget_indexed_shared test3_am test4_am test4 transpose4 transpose5 wincall - # win_dynamic_acc win_flavors win_info winname win_shared win_shared_noncontig win_shared_noncontig_put + # win_dynamic_acc win_flavors win_info win_shared win_shared_noncontig win_shared_noncontig_put # win_large_shm win_zero wintest get-struct atomic_rmw_fop atomic_rmw_gacc rget-unlock atomic_get atomic_rmw_cas # win_shared_zerobyte aint derived-acc-flush_local large-acc-flush_local lockall_dt lockall_dt_flushall # lockall_dt_flushlocalall lockall_dt_flushlocal lock_contention_dt lock_dt lock_dt_flush lock_dt_flushlocal diff --git a/teshsuite/smpi/mpich3-test/rma/testlist b/teshsuite/smpi/mpich3-test/rma/testlist index f52c263819..1a6b5a41a0 100644 --- a/teshsuite/smpi/mpich3-test/rma/testlist +++ b/teshsuite/smpi/mpich3-test/rma/testlist @@ -1,5 +1,4 @@ -#Needs win_create_keyval win_set_attr, win_get_attr -#winname 2 +winname 2 allocmem 2 putfence1 4 putfidx 4 @@ -63,14 +62,11 @@ accfence2_am 4 test1_dt 2 timeLimit=30 #Needs post/start nullpscw 7 -#Needs win_attr -#attrorderwin 1 +attrorderwin 1 #Needs MPI_Win_call_errhandler #wincall 2 -#Needs win_attr -#baseattrwin 1 -#Needs MPI_Win_create_keyval -#fkeyvalwin 1 +baseattrwin 1 +fkeyvalwin 1 #Needs lock, unlock #selfrma 1 #mixedsync 4 -- 2.20.1