March 2015 - commits - mailman3.cels.anl.gov

[mpich] MPICH primary repository branch, master, updated. v3.2a2-259-g4b7a4c3
by noreply＠mpich.org 09 Mar '15

09 Mar '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 4b7a4c35a97c32ccf9bd97c6af9f129374160c34 (commit) from 957ceec598103d8d643c9345512ae8ad4e88e993 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/4b7a4c35a97c32ccf9bd97c6af9f12937… commit 4b7a4c35a97c32ccf9bd97c6af9f129374160c34 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Mon Mar 9 15:08:38 2015 -0700 Change file name ch3u_rma_oplist.c to ch3u_rma_progress.c File ch3u_rma_oplist.c contains functions that make progress on RMA on the origin side. Here we change the name of file to a more suitable one. No reviewer. diff --git a/src/mpid/ch3/include/mpid_rma_issue.h b/src/mpid/ch3/include/mpid_rma_issue.h index 9700ef6..bd40aac 100644 --- a/src/mpid/ch3/include/mpid_rma_issue.h +++ b/src/mpid/ch3/include/mpid_rma_issue.h @@ -1321,7 +1321,7 @@ static int issue_fop_op(MPIDI_RMA_Op_t * rma_op, } -/* issue_rma_op() is called by ch3u_rma_oplist.c, it triggers +/* issue_rma_op() is called by ch3u_rma_progress.c, it triggers proper issuing functions according to packet type. */ #undef FUNCNAME #define FUNCNAME issue_rma_op diff --git a/src/mpid/ch3/src/Makefile.mk b/src/mpid/ch3/src/Makefile.mk index 970535b..fd576c9 100644 --- a/src/mpid/ch3/src/Makefile.mk +++ b/src/mpid/ch3/src/Makefile.mk @@ -18,7 +18,7 @@ mpi_core_sources += \ src/mpid/ch3/src/ch3u_port.c \ src/mpid/ch3/src/ch3u_recvq.c \ src/mpid/ch3/src/ch3u_request.c \ - src/mpid/ch3/src/ch3u_rma_oplist.c \ + src/mpid/ch3/src/ch3u_rma_progress.c \ src/mpid/ch3/src/ch3u_rma_ops.c \ src/mpid/ch3/src/ch3u_rma_reqops.c \ src/mpid/ch3/src/ch3u_rma_sync.c \ diff --git a/src/mpid/ch3/src/ch3u_rma_oplist.c b/src/mpid/ch3/src/ch3u_rma_progress.c similarity index 100% rename from src/mpid/ch3/src/ch3u_rma_oplist.c rename to src/mpid/ch3/src/ch3u_rma_progress.c ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/include/mpid_rma_issue.h | 2 +- src/mpid/ch3/src/Makefile.mk | 2 +- .../src/{ch3u_rma_oplist.c => ch3u_rma_progress.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename src/mpid/ch3/src/{ch3u_rma_oplist.c => ch3u_rma_progress.c} (100%) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-258-g957ceec
by noreply＠mpich.org 09 Mar '15

09 Mar '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 957ceec598103d8d643c9345512ae8ad4e88e993 (commit) from a0ebb44134b93f241bdf554fb2e2e38517922b7e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/957ceec598103d8d643c9345512ae8ad4… commit 957ceec598103d8d643c9345512ae8ad4e88e993 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Mon Mar 9 15:37:57 2015 -0500 testsuite: remove leading spaces in testlist files Removes additional whitespace in testlist files to make them easier to manipulate with tools like sed. No reviewer. diff --git a/test/mpi/f08/io/testlist.in b/test/mpi/f08/io/testlist.in index d2dd57d..b534ba0 100644 --- a/test/mpi/f08/io/testlist.in +++ b/test/mpi/f08/io/testlist.in @@ -18,5 +18,5 @@ miscfilef90 4 setviewcurf90 4 c2f2ciof90 1 c2f90multio 1 -@mpix@ i_fcoll_test 4 -@mpix@ iwriteatallf90 4 +@mpix@i_fcoll_test 4 +@mpix@iwriteatallf90 4 diff --git a/test/mpi/f08/rma/testlist.in b/test/mpi/f08/rma/testlist.in index 3ae2013..d72ad4c 100644 --- a/test/mpi/f08/rma/testlist.in +++ b/test/mpi/f08/rma/testlist.in @@ -10,4 +10,4 @@ c2f2cwinf08 1 baseattrwinf08 1 winattrf08 1 winattr2f08 1 -@mpix@ aintf08 2 strict=false +@mpix@aintf08 2 strict=false diff --git a/test/mpi/f77/io/testlist.in b/test/mpi/f77/io/testlist.in index 6b5d1ac..d33df78 100644 --- a/test/mpi/f77/io/testlist.in +++ b/test/mpi/f77/io/testlist.in @@ -18,5 +18,5 @@ miscfilef 4 setviewcurf 4 c2f2ciof 1 c2fmultio 1 -@mpix@ i_setviewcurf 4 -@mpix@ iwriteatallf 4 xfail=2201 +@mpix@i_setviewcurf 4 +@mpix@iwriteatallf 4 xfail=2201 diff --git a/test/mpi/f77/rma/testlist.in b/test/mpi/f77/rma/testlist.in index 4884257..185bce9 100644 --- a/test/mpi/f77/rma/testlist.in +++ b/test/mpi/f77/rma/testlist.in @@ -10,4 +10,4 @@ c2f2cwinf 1 baseattrwinf 1 winattrf 1 winattr2f 1 -@mpix@ aintf 2 strict=false xfail=ticket1877 +@mpix@aintf 2 strict=false xfail=ticket1877 diff --git a/test/mpi/io/testlist.in b/test/mpi/io/testlist.in index 89ccf48..fa728d2 100644 --- a/test/mpi/io/testlist.in +++ b/test/mpi/io/testlist.in @@ -11,15 +11,15 @@ resized 1 resized2 1 xfail=ticket2088 bigtype 1 hindexed_io 1 -@mpix@ i_bigtype 1 -@mpix@ i_hindexed_io 1 -@mpix@ i_rdwrord 4 -@mpix@ i_setviewcur 4 -@mpix@ i_aggregation1 4 -@mpix@ i_aggregation2 4 -@mpix@ i_coll_test 4 -@mpix@ i_darray_read 4 -@mpix@ i_hindexed 4 -@mpix@ i_noncontig_coll 2 -@mpix@ i_noncontig_coll2 4 -@mpix@ i_types_with_zeros 2 +@mpix@i_bigtype 1 +@mpix@i_hindexed_io 1 +@mpix@i_rdwrord 4 +@mpix@i_setviewcur 4 +@mpix@i_aggregation1 4 +@mpix@i_aggregation2 4 +@mpix@i_coll_test 4 +@mpix@i_darray_read 4 +@mpix@i_hindexed 4 +@mpix@i_noncontig_coll 2 +@mpix@i_noncontig_coll2 4 +@mpix@i_types_with_zeros 2 diff --git a/test/mpi/rma/testlist.in b/test/mpi/rma/testlist.in index f9c3f9b..29fb487 100644 --- a/test/mpi/rma/testlist.in +++ b/test/mpi/rma/testlist.in @@ -131,7 +131,7 @@ at_complete 2 atomic_rmw_fop 3 atomic_rmw_cas 3 atomic_rmw_gacc 3 -@mpix@ aint 2 strict=false +@mpix@aint 2 strict=false acc-pairtype 2 ## This test is not strictly correct. This was meant to test out the ----------------------------------------------------------------------- Summary of changes: test/mpi/f08/io/testlist.in | 4 ++-- test/mpi/f08/rma/testlist.in | 2 +- test/mpi/f77/io/testlist.in | 4 ++-- test/mpi/f77/rma/testlist.in | 2 +- test/mpi/io/testlist.in | 24 ++++++++++++------------ test/mpi/rma/testlist.in | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-257-ga0ebb44
by noreply＠mpich.org 09 Mar '15

09 Mar '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via a0ebb44134b93f241bdf554fb2e2e38517922b7e (commit) from 17d18f6143e3d2bbe1339156f95262a0eb7e2f36 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/a0ebb44134b93f241bdf554fb2e2e3851… commit a0ebb44134b93f241bdf554fb2e2e38517922b7e Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Mon Mar 9 11:26:15 2015 -0500 testsuite: move coll alias checks to errors dir Put tests that check if MPI correctly detects aliased buffers in collective operations into the errors section of the testsuite. Fixes #2211 Signed-off-by: Wesley Bland <wbland(a)anl.gov> diff --git a/test/mpi/.gitignore b/test/mpi/.gitignore index 913d84a..8020972 100644 --- a/test/mpi/.gitignore +++ b/test/mpi/.gitignore @@ -212,6 +212,8 @@ /errhan/errring /errors/testlist /errors/coll/noalias +/errors/coll/noalias2 +/errors/coll/noalias3 /errors/coll/rerr /errors/coll/bcastlength /errors/cxx/testlist diff --git a/test/mpi/coll/allgather2.c b/test/mpi/coll/allgather2.c index 66a21ec..9ac5731 100644 --- a/test/mpi/coll/allgather2.c +++ b/test/mpi/coll/allgather2.c @@ -51,17 +51,6 @@ int main( int argc, char **argv ) MTestFreeComm( &comm ); } -#if MTEST_HAVE_MIN_MPI_VERSION(2,2) - MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN); - MPI_Comm_rank(MPI_COMM_WORLD, &rank); - MPI_Comm_size(MPI_COMM_WORLD, &size); - vecout = (double *) malloc(size * sizeof(double)); - if (MPI_SUCCESS == MPI_Allgather(&vecout[rank], 1, MPI_DOUBLE, - vecout, 1, MPI_DOUBLE, MPI_COMM_WORLD)) - errs++; - free(vecout); -#endif - MTest_Finalize( errs ); MPI_Finalize(); return 0; diff --git a/test/mpi/coll/allgatherv2.c b/test/mpi/coll/allgatherv2.c index 678193c..ed78723 100644 --- a/test/mpi/coll/allgatherv2.c +++ b/test/mpi/coll/allgatherv2.c @@ -58,15 +58,6 @@ int main( int argc, char **argv ) free( vecout ); } -#if MTEST_HAVE_MIN_MPI_VERSION(2,2) - MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN); - vecout = (double *) malloc(size * sizeof(double)); - if (MPI_SUCCESS == MPI_Allgatherv(&vecout[rank * recvcounts[rank]], recvcounts[rank], MPI_DOUBLE, - vecout, recvcounts, displs, MPI_DOUBLE, comm)) - errs++; - free(vecout); -#endif - free( displs ); free( recvcounts ); MTestFreeComm( &comm ); diff --git a/test/mpi/coll/allred6.c b/test/mpi/coll/allred6.c index 65629de..ba829e1 100644 --- a/test/mpi/coll/allred6.c +++ b/test/mpi/coll/allred6.c @@ -67,14 +67,6 @@ int main( int argc, char *argv[] ) } MPI_Op_free( &op ); -#if MTEST_HAVE_MIN_MPI_VERSION(2,2) - /* Check to make sure that aliasing is disallowed correctly */ - MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN); - MPI_Comm_rank(MPI_COMM_WORLD, &rank); - if (MPI_SUCCESS == MPI_Allreduce(&rank, &rank, 1, MPI_INT, MPI_OP_NULL, MPI_COMM_WORLD)) - errs++; -#endif - MTest_Finalize( errs ); MPI_Finalize(); return 0; diff --git a/test/mpi/coll/alltoall1.c b/test/mpi/coll/alltoall1.c index 4d400cf..cd6d3d8 100644 --- a/test/mpi/coll/alltoall1.c +++ b/test/mpi/coll/alltoall1.c @@ -115,14 +115,6 @@ int main( int argc, char *argv[] ) MTestFreeComm( &comm ); } -#if MTEST_HAVE_MIN_MPI_VERSION(2,2) - /* Check to make sure that aliasing is disallowed correctly */ - MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN); - MPI_Comm_rank(MPI_COMM_WORLD, &rank); - if (MPI_SUCCESS == MPI_Alltoall(&rank, 1, MPI_INT, &rank, 1, MPI_INT, MPI_COMM_WORLD)) - errs++; -#endif - MTest_Finalize( errs ); MPI_Finalize(); return 0; diff --git a/test/mpi/coll/alltoallv.c b/test/mpi/coll/alltoallv.c index 435b3c3..bcae133 100644 --- a/test/mpi/coll/alltoallv.c +++ b/test/mpi/coll/alltoallv.c @@ -122,12 +122,6 @@ int main( int argc, char **argv ) } } } - - /* Check to make sure that aliasing is disallowed correctly */ - MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN); - if (MPI_SUCCESS == MPI_Alltoallv(rbuf, recvcounts, rdispls, MPI_INT, - rbuf, recvcounts, rdispls, MPI_INT, comm)) - err++; #endif free( rdispls ); diff --git a/test/mpi/coll/alltoallw2.c b/test/mpi/coll/alltoallw2.c index e2c7d5f..7d40236 100644 --- a/test/mpi/coll/alltoallw2.c +++ b/test/mpi/coll/alltoallw2.c @@ -133,11 +133,6 @@ int main( int argc, char **argv ) } } } - - MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN); - if (MPI_SUCCESS == MPI_Alltoallw(rbuf, recvcounts, rdispls, recvtypes, - rbuf, recvcounts, rdispls, recvtypes, comm)) - err++; #endif free(recvtypes); diff --git a/test/mpi/coll/exscan.c b/test/mpi/coll/exscan.c index 64ab9d5..70f4c53 100644 --- a/test/mpi/coll/exscan.c +++ b/test/mpi/coll/exscan.c @@ -84,11 +84,6 @@ int main( int argc, char *argv[] ) } } } - - MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN); - /* Make sure that we check for buffer aliasing properly */ - if (MPI_SUCCESS == MPI_Exscan( recvbuf, recvbuf, count, MPI_INT, MPI_SUM, comm )) - errs++; #endif free( sendbuf ); diff --git a/test/mpi/coll/gather.c b/test/mpi/coll/gather.c index e14503f..7433caa 100644 --- a/test/mpi/coll/gather.c +++ b/test/mpi/coll/gather.c @@ -66,16 +66,6 @@ int main( int argc, char **argv ) /* do a zero length gather */ MPI_Gather( NULL, 0, MPI_BYTE, NULL, 0, MPI_BYTE, 0, MPI_COMM_WORLD ); -#if MTEST_HAVE_MIN_MPI_VERSION(2,2) - /* Check to make sure that aliasing is disallowed correctly */ - MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN); - MPI_Comm_rank(MPI_COMM_WORLD, &rank); - if (0 == rank) - if (MPI_SUCCESS == MPI_Gather(&rank, 1, MPI_INT, - &rank, 1, MPI_INT, 0, MPI_COMM_WORLD)) - errs++; -#endif - MTest_Finalize( errs ); MPI_Finalize(); return 0; diff --git a/test/mpi/coll/iallred.c b/test/mpi/coll/iallred.c index 684fd50..d83841c 100644 --- a/test/mpi/coll/iallred.c +++ b/test/mpi/coll/iallred.c @@ -15,7 +15,6 @@ int main(int argc, char *argv[]) MPI_Request request; int size, rank; int one = 1, two = 2, isum, sum; - int errs = 0; MPI_Init(&argc,&argv); MPI_Comm_size(MPI_COMM_WORLD, &size); @@ -27,12 +26,7 @@ int main(int argc, char *argv[]) assert(isum == 2); assert(sum == 4); - - MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN); - if (MPI_SUCCESS == MPI_Iallreduce(&one, &one, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD, &request)) - errs++; - - if (rank == 0 && errs == 0) + if (rank == 0) printf(" No errors\n"); MPI_Finalize(); diff --git a/test/mpi/coll/red3.c b/test/mpi/coll/red3.c index 7835b64..32358d9 100644 --- a/test/mpi/coll/red3.c +++ b/test/mpi/coll/red3.c @@ -182,16 +182,6 @@ int main( int argc, char *argv[] ) if (rank == root) { errs += isShiftLeft( comm, bufout ); } - -#if MTEST_HAVE_MIN_MPI_VERSION(2,2) - /* Try one more time without IN_PLACE to make sure we check - * aliasing correctly */ - if (rank == root) { - MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN); - if (MPI_SUCCESS == MPI_Reduce( bufout, bufout, count, mattype, op, root, comm )) - errs++; - } -#endif } free( buf ); diff --git a/test/mpi/coll/red_scat_block.c b/test/mpi/coll/red_scat_block.c index a2f20a0..3092c8d 100644 --- a/test/mpi/coll/red_scat_block.c +++ b/test/mpi/coll/red_scat_block.c @@ -66,11 +66,6 @@ int main(int argc, char **argv) fprintf(stdout, "Did not get expected value for reduce scatter block\n"); fprintf(stdout, "[%d] Got %d expected %d\n", rank, recvbuf[0], sumval); } - - MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN); - if (MPI_SUCCESS == MPI_Reduce_scatter_block(recvbuf, recvbuf, 1, MPI_INT, MPI_SUM, comm)) - err++; - free(recvbuf); #endif diff --git a/test/mpi/coll/redscat3.c b/test/mpi/coll/redscat3.c index 3b8e526..e6057cd 100644 --- a/test/mpi/coll/redscat3.c +++ b/test/mpi/coll/redscat3.c @@ -96,10 +96,6 @@ int main( int argc, char **argv ) } } } - - MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN); - if (MPI_SUCCESS == MPI_Reduce_scatter(sendbuf, sendbuf, recvcounts, MPI_INT, MPI_SUM, comm)) - err++; #endif free(sendbuf); diff --git a/test/mpi/coll/reduce.c b/test/mpi/coll/reduce.c index ad09c9b..6106782 100644 --- a/test/mpi/coll/reduce.c +++ b/test/mpi/coll/reduce.c @@ -48,15 +48,6 @@ int main( int argc, char *argv[] ) free( sendbuf ); free( recvbuf ); } - -#if MTEST_HAVE_MIN_MPI_VERSION(2,2) - if (0 == rank) { - MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN); - if (MPI_SUCCESS == MPI_Reduce(&rank, &rank, 1, MPI_INT, MPI_SUM, 0, comm)) - errs++; - } -#endif - MTestFreeComm( &comm ); } diff --git a/test/mpi/coll/scantst.c b/test/mpi/coll/scantst.c index 1359acc..97802ad 100644 --- a/test/mpi/coll/scantst.c +++ b/test/mpi/coll/scantst.c @@ -103,12 +103,6 @@ int main( int argc, char **argv ) errors++; } -#if MTEST_HAVE_MIN_MPI_VERSION(2,2) - MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN); - if (MPI_SUCCESS == MPI_Scan( &data, &data, 1, MPI_INT, op_assoc, comm)) - errors++; -#endif - MPI_Op_free( &op_assoc ); MPI_Op_free( &op_addem ); diff --git a/test/mpi/coll/scatter2.c b/test/mpi/coll/scatter2.c index feac832..f11e204 100644 --- a/test/mpi/coll/scatter2.c +++ b/test/mpi/coll/scatter2.c @@ -64,11 +64,6 @@ int main( int argc, char **argv ) } } } - - MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN); - if (rank == 0 && MPI_SUCCESS == - MPI_Scatter(vecin, 1, MPI_DOUBLE, vecin, 1, MPI_DOUBLE, 0, MPI_COMM_WORLD)) - err++; free(vecin); free(vecout); diff --git a/test/mpi/coll/testlist b/test/mpi/coll/testlist index cf05600..2e77908 100644 --- a/test/mpi/coll/testlist +++ b/test/mpi/coll/testlist @@ -139,7 +139,6 @@ nonblocking3 1 mpiversion=3.0 nonblocking3 4 mpiversion=3.0 nonblocking3 5 mpiversion=3.0 nonblocking3 10 timeLimit=600 mpiversion=3.0 -nonblocking4 4 mpiversion=3.0 iallred 2 mpiversion=3.0 # ibarrier will hang forever if it fails, but will complete quickly if it # succeeds diff --git a/test/mpi/errors/coll/Makefile.am b/test/mpi/errors/coll/Makefile.am index c3c7404..6f81619 100644 --- a/test/mpi/errors/coll/Makefile.am +++ b/test/mpi/errors/coll/Makefile.am @@ -12,5 +12,5 @@ EXTRA_DIST = testlist ## for all programs that are just built from the single corresponding source ## file, we don't need per-target _SOURCES rules, automake will infer them ## correctly -noinst_PROGRAMS = noalias rerr bcastlength reduce_local +noinst_PROGRAMS = noalias noalias2 noalias3 rerr bcastlength reduce_local diff --git a/test/mpi/coll/nonblocking4.c b/test/mpi/errors/coll/noalias2.c similarity index 70% copy from test/mpi/coll/nonblocking4.c copy to test/mpi/errors/coll/noalias2.c index 8cf7c25..b651e65 100644 --- a/test/mpi/coll/nonblocking4.c +++ b/test/mpi/errors/coll/noalias2.c @@ -1,6 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ /* - * (C) 2010 by Argonne National Laboratory. + * (C) 2015 by Argonne National Laboratory. * See COPYRIGHT in top-level directory. */ @@ -37,7 +37,6 @@ int main(int argc, char **argv) int *rdispls = NULL; int *types = NULL; MPI_Comm comm; - MPI_Request req; /* intentionally not using MTest_Init/MTest_Finalize in order to make it * easy to take this test and use it as an NBC sanity test outside of the @@ -81,63 +80,63 @@ int main(int argc, char **argv) } if (rank == 0 && MPI_SUCCESS == - MPI_Igather(sbuf, NUM_INTS, MPI_INT, sbuf, NUM_INTS, MPI_INT, 0, comm, &req)) + MPI_Gather(sbuf, NUM_INTS, MPI_INT, sbuf, NUM_INTS, MPI_INT, 0, comm)) errs++; if (rank == 0 && MPI_SUCCESS == - MPI_Igatherv(sbuf, NUM_INTS, MPI_INT, sbuf, rcounts, rdispls, MPI_INT, 0, comm, &req)) + MPI_Gatherv(sbuf, NUM_INTS, MPI_INT, sbuf, rcounts, rdispls, MPI_INT, 0, comm)) errs++; if (rank == 0 && MPI_SUCCESS == - MPI_Iscatter(sbuf, NUM_INTS, MPI_INT, sbuf, NUM_INTS, MPI_INT, 0, comm, &req)) + MPI_Scatter(sbuf, NUM_INTS, MPI_INT, sbuf, NUM_INTS, MPI_INT, 0, comm)) errs++; if (rank == 0 && MPI_SUCCESS == - MPI_Iscatterv(sbuf, scounts, sdispls, MPI_INT, sbuf, NUM_INTS, MPI_INT, 0, comm, &req)) + MPI_Scatterv(sbuf, scounts, sdispls, MPI_INT, sbuf, NUM_INTS, MPI_INT, 0, comm)) errs++; if (MPI_SUCCESS == - MPI_Iallgather(&sbuf[rank], 1, MPI_INT, sbuf, 1, MPI_INT, comm, &req)) + MPI_Allgather(&sbuf[rank], 1, MPI_INT, sbuf, 1, MPI_INT, comm)) errs++; if (MPI_SUCCESS == - MPI_Iallgatherv(&sbuf[rank * rcounts[rank]], rcounts[rank], MPI_INT, sbuf, rcounts, rdispls, MPI_INT, comm, &req)) + MPI_Allgatherv(&sbuf[rank * rcounts[rank]], rcounts[rank], MPI_INT, sbuf, rcounts, rdispls, MPI_INT, comm)) errs++; if (MPI_SUCCESS == - MPI_Ialltoall(sbuf, NUM_INTS, MPI_INT, sbuf, NUM_INTS, MPI_INT, comm, &req)) + MPI_Alltoall(sbuf, NUM_INTS, MPI_INT, sbuf, NUM_INTS, MPI_INT, comm)) errs++; if (MPI_SUCCESS == - MPI_Ialltoallv(sbuf, scounts, sdispls, MPI_INT, sbuf, scounts, sdispls, MPI_INT, comm, &req)) + MPI_Alltoallv(sbuf, scounts, sdispls, MPI_INT, sbuf, scounts, sdispls, MPI_INT, comm)) errs++; if (MPI_SUCCESS == - MPI_Ialltoallw(sbuf, scounts, sdispls, types, sbuf, scounts, sdispls, types, comm, &req)) + MPI_Alltoallw(sbuf, scounts, sdispls, types, sbuf, scounts, sdispls, types, comm)) errs++; if (rank == 0 && MPI_SUCCESS == - MPI_Ireduce(sbuf, sbuf, NUM_INTS, MPI_INT, MPI_SUM, 0, comm, &req)) + MPI_Reduce(sbuf, sbuf, NUM_INTS, MPI_INT, MPI_SUM, 0, comm)) errs++; if (MPI_SUCCESS == - MPI_Iallreduce(sbuf, sbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req)) + MPI_Allreduce(sbuf, sbuf, NUM_INTS, MPI_INT, MPI_SUM, comm)) errs++; if (MPI_SUCCESS == - MPI_Ireduce_scatter(sbuf, sbuf, rcounts, MPI_INT, MPI_SUM, comm, &req)) + MPI_Reduce_scatter(sbuf, sbuf, rcounts, MPI_INT, MPI_SUM, comm)) errs++; if (MPI_SUCCESS == - MPI_Ireduce_scatter_block(sbuf, sbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req)) + MPI_Reduce_scatter_block(sbuf, sbuf, NUM_INTS, MPI_INT, MPI_SUM, comm)) errs++; if (MPI_SUCCESS == - MPI_Iscan(sbuf, sbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req)) + MPI_Scan(sbuf, sbuf, NUM_INTS, MPI_INT, MPI_SUM, comm)) errs++; if (MPI_SUCCESS == - MPI_Iexscan(sbuf, sbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req)) + MPI_Exscan(sbuf, sbuf, NUM_INTS, MPI_INT, MPI_SUM, comm)) errs++; if (sbuf) free(sbuf); diff --git a/test/mpi/coll/nonblocking4.c b/test/mpi/errors/coll/noalias3.c similarity index 100% rename from test/mpi/coll/nonblocking4.c rename to test/mpi/errors/coll/noalias3.c diff --git a/test/mpi/errors/coll/testlist b/test/mpi/errors/coll/testlist index 7e6048e..75fda41 100644 --- a/test/mpi/errors/coll/testlist +++ b/test/mpi/errors/coll/testlist @@ -1,4 +1,6 @@ noalias 2 +noalias2 4 mpiversion=2.2 +noalias3 4 mpiversion=3.0 rerr 2 reduce_local 1 # MPICH currently fails the bcastlength test because it needs to do more ----------------------------------------------------------------------- Summary of changes: test/mpi/.gitignore | 2 + test/mpi/coll/allgather2.c | 11 ------ test/mpi/coll/allgatherv2.c | 9 ----- test/mpi/coll/allred6.c | 8 ----- test/mpi/coll/alltoall1.c | 8 ----- test/mpi/coll/alltoallv.c | 6 --- test/mpi/coll/alltoallw2.c | 5 --- test/mpi/coll/exscan.c | 5 --- test/mpi/coll/gather.c | 10 ------ test/mpi/coll/iallred.c | 8 +---- test/mpi/coll/red3.c | 10 ------ test/mpi/coll/red_scat_block.c | 5 --- test/mpi/coll/redscat3.c | 4 -- test/mpi/coll/reduce.c | 9 ----- test/mpi/coll/scantst.c | 6 --- test/mpi/coll/scatter2.c | 5 --- test/mpi/coll/testlist | 1 - test/mpi/errors/coll/Makefile.am | 2 +- .../nonblocking4.c => errors/coll/noalias2.c} | 33 +++++++++---------- .../nonblocking4.c => errors/coll/noalias3.c} | 0 test/mpi/errors/coll/testlist | 2 + 21 files changed, 22 insertions(+), 127 deletions(-) copy test/mpi/{coll/nonblocking4.c => errors/coll/noalias2.c} (70%) rename test/mpi/{coll/nonblocking4.c => errors/coll/noalias3.c} (100%) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-256-g17d18f6
by noreply＠mpich.org 06 Mar '15

06 Mar '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 17d18f6143e3d2bbe1339156f95262a0eb7e2f36 (commit) via 13a7338641bccb52e30f6cc8c5f504344dde56c7 (commit) from e67dacae82e85c9613228a08bf49a666f316a7f8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/17d18f6143e3d2bbe1339156f95262a0e… commit 17d18f6143e3d2bbe1339156f95262a0eb7e2f36 Author: Norio yamaguchi <norio.yamaguchi(a)riken.jp> Date: Wed Mar 4 16:59:39 2015 +0900 Bug-fix : leak mutex unlock in netmod-IB diff --git a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_malloc.c b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_malloc.c index 569b4a7..d2b679e 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_malloc.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_malloc.c @@ -314,8 +314,10 @@ void *ib_malloc_hook(size_t size, const void *caller) pow = powoftwo(size); - if (pow < 0 || pow >= ARRAY_SIZE) + if (pow < 0 || pow >= ARRAY_SIZE) { + pthread_mutex_unlock(&mutex); return NULL; + } if (is_list_empty(&arena_flist[pow])) { char *tmp; http://git.mpich.org/mpich.git/commitdiff/13a7338641bccb52e30f6cc8c5f504344… commit 13a7338641bccb52e30f6cc8c5f504344dde56c7 Author: Norio yamaguchi <norio.yamaguchi(a)riken.jp> Date: Wed Mar 4 15:00:36 2015 +0900 Fix implementation of RMA in netmod-IB diff --git a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_impl.h b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_impl.h index 576c61f..bfa0a3f 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_impl.h @@ -721,6 +721,7 @@ typedef enum MPID_nem_ib_pkt_subtype { #if 0 /* modification of mpid_nem_lmt.c is required */ MPIDI_NEM_IB_PKT_LMT_RTS, #endif + MPIDI_NEM_IB_PKT_RMA_LMT_RTS, MPIDI_NEM_IB_PKT_PUT, MPIDI_NEM_IB_PKT_ACCUMULATE, MPIDI_NEM_IB_PKT_GET, @@ -795,6 +796,10 @@ int MPID_nem_ib_pkt_RTS_handler(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPIDI_msg_sz_t * buflen /* out */ , MPID_Request ** rreqp /* out */); #endif +int MPID_nem_ib_PktHandler_rma_lmt_rts(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, + MPIDI_msg_sz_t * buflen /* out */ , + MPID_Request ** rreqp /* out */); +#if 0 int MPID_nem_ib_PktHandler_Put(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPIDI_msg_sz_t * buflen /* out */ , MPID_Request ** rreqp /* out */); @@ -807,6 +812,7 @@ int MPID_nem_ib_PktHandler_Get(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, int MPID_nem_ib_PktHandler_GetResp(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPIDI_msg_sz_t * buflen /* out */ , MPID_Request ** rreqp /* out */); +#endif int MPID_nem_ib_PktHandler_lmt_done(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPIDI_msg_sz_t * buflen, MPID_Request ** rreqp); int MPID_nem_ib_pkt_GET_DONE_handler(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, diff --git a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_init.c b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_init.c index a8382fa..b7adeab 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_init.c @@ -954,10 +954,13 @@ int MPID_nem_ib_vc_init(MPIDI_VC_t * vc) #if 0 /* modification of mpid_nem_lmt.c is required */ MPID_nem_ib_pkt_handler[MPIDI_NEM_IB_PKT_LMT_RTS] = MPID_nem_ib_pkt_RTS_handler; #endif + MPID_nem_ib_pkt_handler[MPIDI_NEM_IB_PKT_RMA_LMT_RTS] = MPID_nem_ib_PktHandler_rma_lmt_rts; +#if 0 MPID_nem_ib_pkt_handler[MPIDI_NEM_IB_PKT_PUT] = MPID_nem_ib_PktHandler_Put; MPID_nem_ib_pkt_handler[MPIDI_NEM_IB_PKT_GET] = MPID_nem_ib_PktHandler_Get; MPID_nem_ib_pkt_handler[MPIDI_NEM_IB_PKT_GET_RESP] = MPID_nem_ib_PktHandler_GetResp; MPID_nem_ib_pkt_handler[MPIDI_NEM_IB_PKT_ACCUMULATE] = MPID_nem_ib_PktHandler_Accumulate; +#endif MPID_nem_ib_pkt_handler[MPIDI_NEM_IB_PKT_LMT_GET_DONE] = MPID_nem_ib_pkt_GET_DONE_handler; MPID_nem_ib_pkt_handler[MPIDI_NEM_IB_PKT_LMT_RTS] = MPID_nem_ib_pkt_RTS_handler; MPID_nem_ib_pkt_handler[MPIDI_NEM_IB_PKT_REQ_SEQ_NUM] = MPID_nem_ib_PktHandler_req_seq_num; diff --git a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c index 0a11fcc..fa2f3c9 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c @@ -154,7 +154,8 @@ int MPID_nem_ib_drain_scq(int dont_call_progress) if ( //req_type == MPIDI_REQUEST_TYPE_SEND (req_type == MPIDI_REQUEST_TYPE_SEND || req_type == MPIDI_REQUEST_TYPE_RSEND || - req_type == MPIDI_REQUEST_TYPE_RECV || req_type == MPIDI_REQUEST_TYPE_SSEND) + req_type == MPIDI_REQUEST_TYPE_RECV || req_type == MPIDI_REQUEST_TYPE_SSEND || + req_type == MPIDI_REQUEST_TYPE_GET_ACCUM_RESP) && msg_type == MPIDI_REQUEST_EAGER_MSG) { dprintf("drain_scq,send/recv,eager,req_type=%d,,comm=%p,opcode=%d\n", req_type, req->comm, cqe[i].opcode); @@ -214,9 +215,12 @@ int MPID_nem_ib_drain_scq(int dont_call_progress) (VC_FIELD(req->ch.vc, pending_sends)) -= 1; - /* as in the template */ reqFn = req->dev.OnDataAvail; - if (!reqFn) { + if (*req->cc_ptr == 2 && reqFn == MPIDI_CH3_ReqHandler_ReqOpsComplete) { + MPIDI_CH3U_Request_complete(req); + } + /* as in the template */ + else if (!reqFn) { MPIDI_CH3U_Request_complete(req); dprintf("drain_scq,complete,req=%p\n", req); MPIU_DBG_MSG(CH3_CHANNEL, VERBOSE, ".... complete"); @@ -304,9 +308,12 @@ int MPID_nem_ib_drain_scq(int dont_call_progress) (VC_FIELD(req->ch.vc, pending_sends)) -= 1; - /* as in the template */ reqFn = req->dev.OnDataAvail; - if (!reqFn) { + if (*req->cc_ptr == 2 && reqFn == MPIDI_CH3_ReqHandler_GetSendComplete) { + MPIDI_CH3U_Request_complete(req); + } + /* as in the template */ + else if (!reqFn) { MPIDI_CH3U_Request_complete(req); dprintf("drain_scq,complete,req=%p\n", req); MPIU_DBG_MSG(CH3_CHANNEL, VERBOSE, ".... complete"); @@ -450,6 +457,7 @@ int MPID_nem_ib_drain_scq(int dont_call_progress) //MPID_NEM_IB_SEND_PROGRESS_POLLINGSET //} } +#if 0 else if (req_type == 13 && cqe[i].opcode == IBV_WC_RDMA_READ) { MPID_nem_ib_vc_area *vc_ib = VC_IB(req->ch.vc); @@ -633,6 +641,28 @@ int MPID_nem_ib_drain_scq(int dont_call_progress) MPIU_Free(req_wrap); } +#endif + else if (req_type == MPIDI_REQUEST_TYPE_SEND && msg_type == MPIDI_REQUEST_RNDV_MSG && + cqe[i].opcode == IBV_WC_RDMA_READ) { + MPID_nem_ib_vc_area *vc_ib = VC_IB(req->ch.vc); + + if (req_wrap->mf == MPID_NEM_IB_LMT_LAST_PKT) { + MPID_nem_handle_pkt(req->ch.vc, (char *) REQ_FIELD(req, lmt_pack_buf), + (MPIDI_msg_sz_t) (sizeof(MPIDI_CH3_Pkt_t) + + req->ch.lmt_data_sz)); + + MPID_nem_ib_lmt_send_PKT_LMT_DONE(req->ch.vc, req); + + MPIU_Free(REQ_FIELD(req, lmt_pack_buf)); + MPIDI_CH3U_Request_complete(req); + } + + /* decrement the number of entries in IB command queue */ + vc_ib->ibcom->ncom -= 1; + MPID_nem_ib_ncqe -= 1; + + MPIU_Free(req_wrap); + } else { printf("drain_scq,unknown kind=%d,req_type=%d,msg_type=%d\n", kind, req_type, msg_type); assert(0); @@ -1795,7 +1825,97 @@ int MPID_nem_ib_pkt_RTS_handler(MPIDI_VC_t * vc, } #endif -#if 1 +#undef FUNCNAME +#define FUNCNAME MPID_nem_ib_PktHandler_rma_lmt_rts +#undef FCNAME +#define FCNAME MPIDI_QUOTE(FUNCNAME) +int MPID_nem_ib_PktHandler_rma_lmt_rts(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, + MPIDI_msg_sz_t * buflen /* out */ , + MPID_Request ** rreqp /* out */) +{ + MPID_nem_ib_vc_area *vc_ib = VC_IB(vc); + int mpi_errno = MPI_SUCCESS; + MPID_Request *req = NULL; + MPIDI_CH3_Pkt_t *pkt_hdr = (MPIDI_CH3_Pkt_t *) ((uint8_t *) pkt + sizeof(MPIDI_CH3_Pkt_t)); + MPID_nem_ib_rma_lmt_cookie_t *s_cookie_buf = + (MPID_nem_ib_rma_lmt_cookie_t *) ((uint8_t *) pkt + sizeof(MPIDI_CH3_Pkt_t) + + sizeof(MPIDI_CH3_Pkt_t)); + + void *write_to_buf; + + MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_IB_PKTHANDLER_RMA_LMT_RTS); + MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_IB_PKTHANDLER_RMA_LMT_RTS); + + req = MPID_Request_create(); + MPIU_Object_set_ref(req, 1); /* decrement only in drain_scq ? */ + + req->ch.lmt_data_sz = s_cookie_buf->len; + req->ch.lmt_req_id = s_cookie_buf->sender_req_id; + + REQ_FIELD(req, lmt_pack_buf) = + MPIU_Malloc(sizeof(MPIDI_CH3_Pkt_t) + (size_t) req->ch.lmt_data_sz); + MPIU_ERR_CHKANDJUMP(!REQ_FIELD(req, lmt_pack_buf), mpi_errno, MPI_ERR_OTHER, "**outofmemory"); + + memcpy(REQ_FIELD(req, lmt_pack_buf), pkt_hdr, sizeof(MPIDI_CH3_Pkt_t)); + + /* RDMA READ buffer address */ + write_to_buf = (void *) ((char *) REQ_FIELD(req, lmt_pack_buf) + sizeof(MPIDI_CH3_Pkt_t)); + + /* stash vc for ib_poll */ + req->ch.vc = vc; + + REQ_FIELD(req, lmt_tail) = s_cookie_buf->tail; + MPIDI_Request_set_type(req, MPIDI_REQUEST_TYPE_SEND); // Set dummy type for ib_drain_scq + + /* try to issue RDMA-read command */ + int slack = 1; /* slack for control packet bringing sequence number */ + if (MPID_nem_ib_sendq_empty(vc_ib->sendq) && + vc_ib->ibcom->ncom < MPID_NEM_IB_COM_MAX_SQ_CAPACITY - slack && + MPID_nem_ib_ncqe < MPID_NEM_IB_COM_MAX_CQ_CAPACITY - slack) { + MPIDI_Request_set_msg_type(req, MPIDI_REQUEST_RNDV_MSG); + mpi_errno = + MPID_nem_ib_lmt_start_recv_core(req, s_cookie_buf->addr, s_cookie_buf->rkey, + s_cookie_buf->len, write_to_buf, + s_cookie_buf->max_msg_sz, 1); + if (mpi_errno) { + MPIU_ERR_POP(mpi_errno); + } + } + else { + /* enqueue command into send_queue */ + dprintf("lmt_start_recv, enqueuing,sendq_empty=%d,ncom=%d,ncqe=%d\n", + MPID_nem_ib_sendq_empty(vc_ib->sendq), + vc_ib->ibcom->ncom < MPID_NEM_IB_COM_MAX_SQ_CAPACITY, + MPID_nem_ib_ncqe < MPID_NEM_IB_COM_MAX_CQ_CAPACITY); + + /* make raddr, (sz is in rreq->ch.lmt_data_sz), rkey, (user_buf is in req->dev.user_buf) survive enqueue, free cookie, dequeue */ + REQ_FIELD(req, lmt_raddr) = s_cookie_buf->addr; + REQ_FIELD(req, lmt_rkey) = s_cookie_buf->rkey; + REQ_FIELD(req, lmt_write_to_buf) = write_to_buf; + REQ_FIELD(req, lmt_szsend) = s_cookie_buf->len; + REQ_FIELD(req, max_msg_sz) = s_cookie_buf->max_msg_sz; + REQ_FIELD(req, last) = 1; /* not support segmentation */ + + /* set for send_progress */ + MPIDI_Request_set_msg_type(req, MPIDI_REQUEST_RNDV_MSG); + req->kind = MPID_REQUEST_RECV; + + MPID_nem_ib_sendq_enqueue(&vc_ib->sendq, req); + } + + /* prefix + header + data */ + *buflen = + sizeof(MPIDI_CH3_Pkt_t) + sizeof(MPIDI_CH3_Pkt_t) + sizeof(MPID_nem_ib_rma_lmt_cookie_t); + *rreqp = NULL; + + fn_exit: + MPIDI_FUNC_EXIT(MPID_STATE_MPID_NEM_IB_PKTHANDLER_RMA_LMT_RTS); + return mpi_errno; + fn_fail: + goto fn_exit; +} + +#if 0 /* packet handler for wrapper packet of MPIDI_CH3_PKT_PUT */ /* see MPIDI_CH3_PktHandler_EagerSend (in src/mpid/ch3/src/ch3u_rma_sync.c) */ #undef FUNCNAME @@ -1928,6 +2048,7 @@ int MPID_nem_ib_PktHandler_Put(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, } #endif +#if 0 /* packet handler for wrapper packet of MPIDI_CH3_PKT_ACCUMULATE */ /* see MPIDI_CH3_PktHandler_Accumulate (in src/mpid/ch3/src/ch3u_rma_sync.c) */ #undef FUNCNAME @@ -2072,7 +2193,9 @@ int MPID_nem_ib_PktHandler_Accumulate(MPIDI_VC_t * vc, fn_fail: goto fn_exit; } +#endif +#if 0 /* packet handler for wrapper packet of MPIDI_CH3_PKT_GET */ /* see MPIDI_CH3_PktHandler_Get (in src/mpid/ch3/src/ch3u_rma_sync.c) */ #undef FUNCNAME @@ -2227,6 +2350,7 @@ int MPID_nem_ib_PktHandler_GetResp(MPIDI_VC_t * vc, fn_fail: goto fn_exit; } +#endif /* MPI_Isend set req-type to MPIDI_REQUEST_TYPE_RECV */ #undef FUNCNAME @@ -2565,7 +2689,20 @@ int MPID_nem_ib_pkt_rma_lmt_getdone(MPIDI_VC_t * vc, MPIU_Free(REQ_FIELD(req, lmt_pack_buf)); } } - MPIDI_CH3U_Request_complete(req); + + int (*reqFn) (MPIDI_VC_t *, MPID_Request *, int *); + reqFn = req->dev.OnDataAvail; + + if (*req->cc_ptr == 1 && + (reqFn == MPIDI_CH3_ReqHandler_ReqOpsComplete + || reqFn == MPIDI_CH3_ReqHandler_GetSendComplete)) { + MPIDI_VC_t *vc = req->ch.vc; + int complete = 0; + mpi_errno = reqFn(vc, req, &complete); + } + else { + MPIDI_CH3U_Request_complete(req); + } *rreqp = NULL; fn_exit: diff --git a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_send.c b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_send.c index 0813a47..fe43e85 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_send.c @@ -222,22 +222,28 @@ static int MPID_nem_ib_iSendContig_core(MPIDI_VC_t * vc, MPID_Request * sreq, vo s_data = data; s_data_sz = data_sz; +#if 0 if (hdr && ((((MPIDI_CH3_Pkt_t *) hdr)->type == MPIDI_CH3_PKT_PUT) || (((MPIDI_CH3_Pkt_t *) hdr)->type == MPIDI_CH3_PKT_GET_RESP) || (((MPIDI_CH3_Pkt_t *) hdr)->type == MPIDI_CH3_PKT_ACCUMULATE))) { +#endif /* If request length is too long, create LMT packet */ if (MPID_NEM_IB_NETMOD_HDR_SIZEOF(vc_ib->ibcom->local_ringbuf_type) + sizeof(MPIDI_CH3_Pkt_t) + data_sz > MPID_NEM_IB_COM_RDMABUF_SZSEG - sizeof(MPID_nem_ib_netmod_trailer_t)) { pkt_netmod.type = MPIDI_NEM_PKT_NETMOD; +#if 0 if (((MPIDI_CH3_Pkt_t *) hdr)->type == MPIDI_CH3_PKT_PUT) pkt_netmod.subtype = MPIDI_NEM_IB_PKT_PUT; else if (((MPIDI_CH3_Pkt_t *) hdr)->type == MPIDI_CH3_PKT_GET_RESP) pkt_netmod.subtype = MPIDI_NEM_IB_PKT_GET_RESP; else if (((MPIDI_CH3_Pkt_t *) hdr)->type == MPIDI_CH3_PKT_ACCUMULATE) pkt_netmod.subtype = MPIDI_NEM_IB_PKT_ACCUMULATE; +#else + pkt_netmod.subtype = MPIDI_NEM_IB_PKT_RMA_LMT_RTS; +#endif void *write_from_buf = data; @@ -245,8 +251,10 @@ static int MPID_nem_ib_iSendContig_core(MPIDI_VC_t * vc, MPID_Request * sreq, vo MPID_nem_ib_com_get_info_conn(vc_ib->sc->fd, MPID_NEM_IB_COM_INFOKEY_PATTR_MAX_MSG_SZ, &max_msg_sz, sizeof(uint32_t)); +#if 0 /* RMA : Netmod IB supports only smaller size than max_msg_sz. */ MPIU_Assert(data_sz <= max_msg_sz); +#endif MPID_nem_ib_rma_lmt_cookie_t *s_cookie_buf = (MPID_nem_ib_rma_lmt_cookie_t *) MPIU_Malloc(sizeof(MPID_nem_ib_rma_lmt_cookie_t)); @@ -281,7 +289,9 @@ static int MPID_nem_ib_iSendContig_core(MPIDI_VC_t * vc, MPID_Request * sreq, vo int incomplete; MPIDI_CH3U_Request_increment_cc(sreq, &incomplete); // decrement in drain_scq and pkt_rma_lmt_getdone } +#if 0 } +#endif /* packet handlers including MPIDI_CH3_PktHandler_EagerSend and MPID_nem_handle_pkt assume this */ hdr_sz = sizeof(MPIDI_CH3_Pkt_t); @@ -785,22 +795,28 @@ static int MPID_nem_ib_SendNoncontig_core(MPIDI_VC_t * vc, MPID_Request * sreq, data = (void *)REQ_FIELD(sreq, lmt_pack_buf); data_sz = last; +#if 0 if (hdr && ((((MPIDI_CH3_Pkt_t *) hdr)->type == MPIDI_CH3_PKT_PUT) || (((MPIDI_CH3_Pkt_t *) hdr)->type == MPIDI_CH3_PKT_GET_RESP) || (((MPIDI_CH3_Pkt_t *) hdr)->type == MPIDI_CH3_PKT_ACCUMULATE))) { +#endif /* If request length is too long, create LMT packet */ if ( MPID_NEM_IB_NETMOD_HDR_SIZEOF(vc_ib->ibcom->local_ringbuf_type) + sizeof(MPIDI_CH3_Pkt_t) + sreq->dev.segment_size - sreq->dev.segment_first > MPID_NEM_IB_COM_RDMABUF_SZSEG - sizeof(MPID_nem_ib_netmod_trailer_t)) { pkt_netmod.type = MPIDI_NEM_PKT_NETMOD; +#if 0 if (((MPIDI_CH3_Pkt_t *) hdr)->type == MPIDI_CH3_PKT_PUT) pkt_netmod.subtype = MPIDI_NEM_IB_PKT_PUT; else if (((MPIDI_CH3_Pkt_t *) hdr)->type == MPIDI_CH3_PKT_GET_RESP) pkt_netmod.subtype = MPIDI_NEM_IB_PKT_GET_RESP; else if (((MPIDI_CH3_Pkt_t *) hdr)->type == MPIDI_CH3_PKT_ACCUMULATE) pkt_netmod.subtype = MPIDI_NEM_IB_PKT_ACCUMULATE; +#else + pkt_netmod.subtype = MPIDI_NEM_IB_PKT_RMA_LMT_RTS; +#endif void *write_from_buf = REQ_FIELD(sreq, lmt_pack_buf); @@ -808,8 +824,10 @@ static int MPID_nem_ib_SendNoncontig_core(MPIDI_VC_t * vc, MPID_Request * sreq, MPID_nem_ib_com_get_info_conn(vc_ib->sc->fd, MPID_NEM_IB_COM_INFOKEY_PATTR_MAX_MSG_SZ, &max_msg_sz, sizeof(uint32_t)); +#if 0 /* RMA : Netmod IB supports only smaller size than max_msg_sz. */ MPIU_Assert(data_sz <= max_msg_sz); +#endif MPID_nem_ib_rma_lmt_cookie_t *s_cookie_buf = (MPID_nem_ib_rma_lmt_cookie_t *) MPIU_Malloc(sizeof(MPID_nem_ib_rma_lmt_cookie_t)); @@ -844,7 +862,9 @@ static int MPID_nem_ib_SendNoncontig_core(MPIDI_VC_t * vc, MPID_Request * sreq, int incomplete; MPIDI_CH3U_Request_increment_cc(sreq, &incomplete); // decrement in drain_scq and pkt_rma_lmt_getdone } +#if 0 } +#endif /* packet handlers assume this */ hdr_sz = sizeof(MPIDI_CH3_Pkt_t); ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/channels/nemesis/netmod/ib/ib_impl.h | 6 + src/mpid/ch3/channels/nemesis/netmod/ib/ib_init.c | 3 + .../ch3/channels/nemesis/netmod/ib/ib_malloc.c | 4 +- src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c | 151 +++++++++++++++++++- src/mpid/ch3/channels/nemesis/netmod/ib/ib_send.c | 20 +++ 5 files changed, 176 insertions(+), 8 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-254-ge67daca
by noreply＠mpich.org 06 Mar '15

06 Mar '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via e67dacae82e85c9613228a08bf49a666f316a7f8 (commit) from c75f7cda9b017cadcfcbc5f14637ab08aa2ae748 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/e67dacae82e85c9613228a08bf49a666f… commit e67dacae82e85c9613228a08bf49a666f316a7f8 Author: Wesley Bland <wbland(a)anl.gov> Date: Fri Mar 6 10:34:27 2015 -0600 Mark more ft as xfail No reviewer diff --git a/test/mpi/ft/testlist b/test/mpi/ft/testlist index f3f1b83..06c7ab1 100644 --- a/test/mpi/ft/testlist +++ b/test/mpi/ft/testlist @@ -10,7 +10,7 @@ irecvdead 2 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTes barrier 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=2237 gather 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=2237 reduce 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=2237 -bcast 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 +bcast 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=2237 scatter 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=2237 anysource 3 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=2237 revoke_nofail 2 env=MPIR_CVAR_ENABLE_FT=1 strict=false timeLimit=10 xfail=2237 ----------------------------------------------------------------------- Summary of changes: test/mpi/ft/testlist | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-253-gc75f7cd
by noreply＠mpich.org 05 Mar '15

05 Mar '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via c75f7cda9b017cadcfcbc5f14637ab08aa2ae748 (commit) from 758e1b2b63bd8af1b2ebec29abec07e143f8a274 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/c75f7cda9b017cadcfcbc5f14637ab08a… commit c75f7cda9b017cadcfcbc5f14637ab08aa2ae748 Author: Sangmin Seo <sseo(a)anl.gov> Date: Thu Mar 5 13:35:09 2015 -0600 Do not reference a CH3 variable in ROMIO glue. Although MPIDI_CH3I_progress_blocked is a variable only used in CH3, it was referenced in the ROMIO glue code. This caused a build problem when pamid is used as a device. This patch removed the reference to MPIDI_CH3I_progress_blocked, but it degrades the efficiency of MPIR_Ext_cs_yield_allfunc_if_progress_blocked() since we do not have a way to check if the progress engine is blocked for now (related to ticket #2202). For a better solution for ticket #2202, we need to fix a wait function of the extended generalized request. Fixes #2242 Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/glue/romio/glue_romio.c b/src/glue/romio/glue_romio.c index 0f376c5..9b64992 100644 --- a/src/glue/romio/glue_romio.c +++ b/src/glue/romio/glue_romio.c @@ -52,20 +52,10 @@ void MPIR_Ext_cs_exit_allfunc(void) /* This routine is for a thread to yield control when the thread is waiting for * the completion of communication inside a ROMIO routine but the progress * engine is blocked by another thread. */ -#ifdef MPICH_IS_THREADED -extern volatile int MPIDI_CH3I_progress_blocked; -#endif void MPIR_Ext_cs_yield_allfunc_if_progress_blocked(void) { -#ifdef MPICH_IS_THREADED - MPIU_THREAD_CHECK_BEGIN; - { - if (MPIDI_CH3I_progress_blocked == TRUE) { - MPIU_THREAD_CS_YIELD(ALLFUNC,); - } - } - MPIU_THREAD_CHECK_END; -#endif + /* TODO: check whether the progress engine is blocked */ + MPIU_THREAD_CS_YIELD(ALLFUNC,); } /* will consider MPI_DATATYPE_NULL to be an error */ ----------------------------------------------------------------------- Summary of changes: src/glue/romio/glue_romio.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-252-g758e1b2
by noreply＠mpich.org 05 Mar '15

05 Mar '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 758e1b2b63bd8af1b2ebec29abec07e143f8a274 (commit) from 675f028aa7855208445588b7c731e20e0db2f0f8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/758e1b2b63bd8af1b2ebec29abec07e14… commit 758e1b2b63bd8af1b2ebec29abec07e143f8a274 Author: Huiwei Lu <huiweilu(a)mcs.anl.gov> Date: Thu Mar 5 10:31:11 2015 -0600 Mark comm_idup and comm_idup_mul as xfail comm_idup was caught failing on mpich-portals4 with configuration "intel,strict,ib”. It was not fully tested on portals4 because portals was added after comm_dup patch. On other platforms comm_idup seems to be OK. Ticket #2243 No reviewer diff --git a/test/mpi/comm/testlist b/test/mpi/comm/testlist index 3601b91..4ffbe9b 100644 --- a/test/mpi/comm/testlist +++ b/test/mpi/comm/testlist @@ -24,10 +24,10 @@ 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 2 mpiversion=3.0 xfail=ticket2243 +comm_idup 4 mpiversion=3.0 xfail=ticket2243 +comm_idup 9 mpiversion=3.0 xfail=ticket2243 +comm_idup_mul 2 mpiversion=3.0 xfail=ticket2243 comm_idup_overlap 2 mpiversion=3.0 xfail=ticket2238 dup_with_info 2 mpiversion=3.0 dup_with_info 4 mpiversion=3.0 ----------------------------------------------------------------------- Summary of changes: test/mpi/comm/testlist | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-251-g675f028
by noreply＠mpich.org 05 Mar '15

05 Mar '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 675f028aa7855208445588b7c731e20e0db2f0f8 (commit) from 6efd9ddefcf523d4cfd02655cab91bcc7f5c1baa (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/675f028aa7855208445588b7c731e20e0… commit 675f028aa7855208445588b7c731e20e0db2f0f8 Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Wed Mar 4 15:09:15 2015 -0600 Change MPI-3.1 MPI_T stuff to MPIX_T Since MPI-3.1 has not been voted this time. Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/src/include/mpi.h.in b/src/include/mpi.h.in index c78ae17..14366c3 100644 --- a/src/include/mpi.h.in +++ b/src/include/mpi.h.in @@ -865,14 +865,12 @@ typedef int (MPIX_Grequest_wait_function)(int, void **, double, MPI_Status *); #define MPI_T_ERR_PVAR_NO_STARTSTOP 70 /* Pvar can't be started or stopped */ #define MPI_T_ERR_PVAR_NO_WRITE 71 /* Pvar can't be written or reset */ #define MPI_T_ERR_PVAR_NO_ATOMIC 72 /* Pvar can't be R/W atomically */ -#define MPI_T_ERR_INVALID_NAME 73 /* Name doesn't match */ -#define MPI_T_ERR_INVALID 74 /* Generic error code for MPI_T added in MPI-3.1 */ #define MPI_ERR_LASTCODE 0x3fffffff /* Last valid error code for a predefined error class */ /* WARNING: this is also defined in mpishared.h. Update both locations */ -#define MPICH_ERR_LAST_CLASS 74 /* It is also helpful to know the +#define MPICH_ERR_LAST_CLASS 72 /* It is also helpful to know the last valid class */ #define MPICH_ERR_FIRST_MPIX 100 /* Define a gap here because sock is @@ -884,8 +882,10 @@ typedef int (MPIX_Grequest_wait_function)(int, void **, double, MPI_Status *); #define MPIX_ERR_PROC_FAILED_PENDING MPICH_ERR_FIRST_MPIX+2 /* A failure has caused this request * to be pending */ #define MPIX_ERR_REVOKED MPICH_ERR_FIRST_MPIX+3 /* The communciation object has been revoked */ +#define MPIX_T_ERR_INVALID_NAME MPICH_ERR_FIRST_MPIX+4 /* Name doesn't match */ +#define MPIX_T_ERR_INVALID MPICH_ERR_FIRST_MPIX+5 /* Generic error code for MPI_T added in MPI-3.1 */ -#define MPICH_ERR_LAST_MPIX MPICH_ERR_FIRST_MPIX+3 +#define MPICH_ERR_LAST_MPIX MPICH_ERR_FIRST_MPIX+5 /* End of MPI's error classes */ @@ -1532,9 +1532,9 @@ int MPI_T_category_get_cvars(int cat_index, int len, int indices[]); int MPI_T_category_get_pvars(int cat_index, int len, int indices[]); int MPI_T_category_get_categories(int cat_index, int len, int indices[]); int MPI_T_category_changed(int *stamp); -int MPI_T_cvar_get_index(const char *name, int *cvar_index); -int MPI_T_pvar_get_index(const char *name, int var_class, int *pvar_index); -int MPI_T_category_get_index(const char *name, int *cat_index); +int MPIX_T_cvar_get_index(const char *name, int *cvar_index); +int MPIX_T_pvar_get_index(const char *name, int var_class, int *pvar_index); +int MPIX_T_category_get_index(const char *name, int *cat_index); /* End Skip Prototypes */ @@ -2178,9 +2178,9 @@ int PMPI_T_category_get_cvars(int cat_index, int len, int indices[]); int PMPI_T_category_get_pvars(int cat_index, int len, int indices[]); int PMPI_T_category_get_categories(int cat_index, int len, int indices[]); int PMPI_T_category_changed(int *stamp); -int PMPI_T_cvar_get_index(const char *name, int *cvar_index); -int PMPI_T_pvar_get_index(const char *name, int var_class, int *pvar_index); -int PMPI_T_category_get_index(const char *name, int *cat_index); +int PMPIX_T_cvar_get_index(const char *name, int *cvar_index); +int PMPIX_T_pvar_get_index(const char *name, int var_class, int *pvar_index); +int PMPIX_T_category_get_index(const char *name, int *cat_index); /* End Skip Prototypes */ diff --git a/src/include/mpishared.h b/src/include/mpishared.h index 16cf8ed..46a6bf1 100644 --- a/src/include/mpishared.h +++ b/src/include/mpishared.h @@ -62,7 +62,7 @@ #include "mpierrs.h" /* FIXME: This is extracted from mpi.h.in, where it may not be appropriate */ -#define MPICH_ERR_LAST_CLASS 74 /* It is also helpful to know the +#define MPICH_ERR_LAST_CLASS 72 /* It is also helpful to know the last valid class */ #include "mpifunc.h" diff --git a/src/mpi_t/cat_get_index.c b/src/mpi_t/cat_get_index.c index 331ef2b..44d6ee1 100644 --- a/src/mpi_t/cat_get_index.c +++ b/src/mpi_t/cat_get_index.c @@ -6,31 +6,31 @@ #include "mpiimpl.h" -/* -- Begin Profiling Symbol Block for routine MPI_T_category_get_index */ +/* -- Begin Profiling Symbol Block for routine MPIX_T_category_get_index */ #if defined(HAVE_PRAGMA_WEAK) -#pragma weak MPI_T_category_get_index = PMPI_T_category_get_index +#pragma weak MPIX_T_category_get_index = PMPIX_T_category_get_index #elif defined(HAVE_PRAGMA_HP_SEC_DEF) -#pragma _HP_SECONDARY_DEF PMPI_T_category_get_index MPI_T_category_get_index +#pragma _HP_SECONDARY_DEF PMPIX_T_category_get_index MPIX_T_category_get_index #elif defined(HAVE_PRAGMA_CRI_DUP) -#pragma _CRI duplicate MPI_T_category_get_index as PMPI_T_category_get_index +#pragma _CRI duplicate MPIX_T_category_get_index as PMPIX_T_category_get_index #elif defined(HAVE_WEAK_ATTRIBUTE) -int MPI_T_category_get_index(const char *name, int *cat_index) __attribute__((weak,alias("PMPI_T_category_get_index"))); +int MPIX_T_category_get_index(const char *name, int *cat_index) __attribute__((weak,alias("PMPIX_T_category_get_index"))); #endif /* -- End Profiling Symbol Block */ /* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build the MPI routines */ #ifndef MPICH_MPI_FROM_PMPI -#undef MPI_T_category_get_index -#define MPI_T_category_get_index PMPI_T_category_get_index +#undef MPIX_T_category_get_index +#define MPIX_T_category_get_index PMPIX_T_category_get_index #endif /* MPICH_MPI_FROM_PMPI */ #undef FUNCNAME -#define FUNCNAME MPI_T_category_get_index +#define FUNCNAME MPIX_T_category_get_index #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_category_get_index - Get the index of a category +MPIX_T_category_get_index - Get the index of a category Output Parameters: . name - the name of the category (string) @@ -42,17 +42,17 @@ Output Parameters: .N Errors .N MPI_SUCCESS -.N MPI_T_ERR_INVALID_NAME +.N MPIX_T_ERR_INVALID_NAME .N MPI_T_ERR_NOT_INITIALIZED @*/ -int MPI_T_category_get_index(const char *name, int *cat_index) +int MPIX_T_category_get_index(const char *name, int *cat_index) { int mpi_errno = MPI_SUCCESS; - MPID_MPI_STATE_DECL(MPID_STATE_MPI_T_CATEGORY_GET_INDEX); + MPID_MPI_STATE_DECL(MPID_STATE_MPIX_T_CATEGORY_GET_INDEX); MPIR_ERRTEST_MPIT_INITIALIZED(mpi_errno); MPIR_T_THREAD_CS_ENTER(); - MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_T_CATEGORY_GET_INDEX); + MPID_MPI_FUNC_ENTER(MPID_STATE_MPIX_T_CATEGORY_GET_INDEX); /* Validate parameters */ # ifdef HAVE_ERROR_CHECKING @@ -75,14 +75,14 @@ int MPI_T_category_get_index(const char *name, int *cat_index) if (hash_entry != NULL) { *cat_index = hash_entry->idx; } else { - mpi_errno = MPI_T_ERR_INVALID_NAME; + mpi_errno = MPIX_T_ERR_INVALID_NAME; goto fn_fail; } /* ... end of body of routine ... */ fn_exit: - MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_T_CATEGORY_GET_INDEX); + MPID_MPI_FUNC_EXIT(MPID_STATE_MPIX_T_CATEGORY_GET_INDEX); MPIR_T_THREAD_CS_EXIT(); return mpi_errno; diff --git a/src/mpi_t/cvar_get_index.c b/src/mpi_t/cvar_get_index.c index e40abbb..a18e181 100644 --- a/src/mpi_t/cvar_get_index.c +++ b/src/mpi_t/cvar_get_index.c @@ -6,31 +6,31 @@ #include "mpiimpl.h" -/* -- Begin Profiling Symbol Block for routine MPI_T_cvar_get_index */ +/* -- Begin Profiling Symbol Block for routine MPIX_T_cvar_get_index */ #if defined(HAVE_PRAGMA_WEAK) -#pragma weak MPI_T_cvar_get_index = PMPI_T_cvar_get_index +#pragma weak MPIX_T_cvar_get_index = PMPIX_T_cvar_get_index #elif defined(HAVE_PRAGMA_HP_SEC_DEF) -#pragma _HP_SECONDARY_DEF PMPI_T_cvar_get_index MPI_T_cvar_get_index +#pragma _HP_SECONDARY_DEF PMPIX_T_cvar_get_index MPIX_T_cvar_get_index #elif defined(HAVE_PRAGMA_CRI_DUP) -#pragma _CRI duplicate MPI_T_cvar_get_index as PMPI_T_cvar_get_index +#pragma _CRI duplicate MPIX_T_cvar_get_index as PMPIX_T_cvar_get_index #elif defined(HAVE_WEAK_ATTRIBUTE) -int MPI_T_cvar_get_index(const char *name, int *cvar_index) __attribute__((weak,alias("PMPI_T_cvar_get_index"))); +int MPIX_T_cvar_get_index(const char *name, int *cvar_index) __attribute__((weak,alias("PMPIX_T_cvar_get_index"))); #endif /* -- End Profiling Symbol Block */ /* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build the MPI routines */ #ifndef MPICH_MPI_FROM_PMPI -#undef MPI_T_cvar_get_index -#define MPI_T_cvar_get_index PMPI_T_cvar_get_index +#undef MPIX_T_cvar_get_index +#define MPIX_T_cvar_get_index PMPIX_T_cvar_get_index #endif /* MPICH_MPI_FROM_PMPI */ #undef FUNCNAME -#define FUNCNAME MPI_T_cvar_get_index +#define FUNCNAME MPIX_T_cvar_get_index #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_cvar_get_index - Get the index of a control variable +MPIX_T_cvar_get_index - Get the index of a control variable Output Parameters: . name - name of the control variable (string) @@ -42,17 +42,17 @@ Output Parameters: .N Errors .N MPI_SUCCESS -.N MPI_T_ERR_INVALID_NAME +.N MPIX_T_ERR_INVALID_NAME .N MPI_T_ERR_NOT_INITIALIZED @*/ -int MPI_T_cvar_get_index(const char *name, int *cvar_index) +int MPIX_T_cvar_get_index(const char *name, int *cvar_index) { int mpi_errno = MPI_SUCCESS; - MPID_MPI_STATE_DECL(MPID_STATE_MPI_T_CVAR_GET_INDEX); + MPID_MPI_STATE_DECL(MPID_STATE_MPIX_T_CVAR_GET_INDEX); MPIR_ERRTEST_MPIT_INITIALIZED(mpi_errno); MPIR_T_THREAD_CS_ENTER(); - MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_T_CVAR_GET_INDEX); + MPID_MPI_FUNC_ENTER(MPID_STATE_MPIX_T_CVAR_GET_INDEX); /* Validate parameters */ # ifdef HAVE_ERROR_CHECKING @@ -75,14 +75,14 @@ int MPI_T_cvar_get_index(const char *name, int *cvar_index) if (hash_entry != NULL) { *cvar_index = hash_entry->idx; } else { - mpi_errno = MPI_T_ERR_INVALID_NAME; + mpi_errno = MPIX_T_ERR_INVALID_NAME; goto fn_fail; } /* ... end of body of routine ... */ fn_exit: - MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_T_CVAR_GET_INDEX); + MPID_MPI_FUNC_EXIT(MPID_STATE_MPIX_T_CVAR_GET_INDEX); MPIR_T_THREAD_CS_EXIT(); return mpi_errno; diff --git a/src/mpi_t/errnames.txt b/src/mpi_t/errnames.txt index 37c7f3c..cbb3f7d 100644 --- a/src/mpi_t/errnames.txt +++ b/src/mpi_t/errnames.txt @@ -66,9 +66,9 @@ **mpi_t_category_get_categories %d %d %p: MPI_T_category_get_categories(cat_index=%d, len=%d, indices=%p) **mpi_t_category_changed: MPI_T_category_changed failed **mpi_t_category_changed %p: MPI_T_category_changed(stamp=%p) -**mpi_t_cvar_get_index: mpi_t_cvar_get_index failed -**mpi_t_cvar_get_index %p %p: mpi_t_cvar_get_index(name=%p, cvar_index=%p) -**mpi_t_pvar_get_index: mpi_t_pvar_get_index failed -**mpi_t_pvar_get_index %p %d %p: mpi_t_pvar_get_index(name=%p, var_class=%d, pvar_index=%p) -**mpi_t_category_get_index: mpi_t_category_get_index failed -**mpi_t_category_get_index %p %p: mpi_t_category_get_index(name=%p, cat_index=%p) +**mpix_t_cvar_get_index: mpix_t_cvar_get_index failed +**mpix_t_cvar_get_index %p %p: mpix_t_cvar_get_index(name=%p, cvar_index=%p) +**mpix_t_pvar_get_index: mpix_t_pvar_get_index failed +**mpix_t_pvar_get_index %p %d %p: mpix_t_pvar_get_index(name=%p, var_class=%d, pvar_index=%p) +**mpix_t_category_get_index: mpix_t_category_get_index failed +**mpix_t_category_get_index %p %p: mpix_t_category_get_index(name=%p, cat_index=%p) diff --git a/src/mpi_t/pvar_get_index.c b/src/mpi_t/pvar_get_index.c index bb1639c..b65408c 100644 --- a/src/mpi_t/pvar_get_index.c +++ b/src/mpi_t/pvar_get_index.c @@ -6,31 +6,31 @@ #include "mpiimpl.h" -/* -- Begin Profiling Symbol Block for routine MPI_T_pvar_get_index */ +/* -- Begin Profiling Symbol Block for routine MPIX_T_pvar_get_index */ #if defined(HAVE_PRAGMA_WEAK) -#pragma weak MPI_T_pvar_get_index = PMPI_T_pvar_get_index +#pragma weak MPIX_T_pvar_get_index = PMPIX_T_pvar_get_index #elif defined(HAVE_PRAGMA_HP_SEC_DEF) -#pragma _HP_SECONDARY_DEF PMPI_T_pvar_get_index MPI_T_pvar_get_index +#pragma _HP_SECONDARY_DEF PMPIX_T_pvar_get_index MPIX_T_pvar_get_index #elif defined(HAVE_PRAGMA_CRI_DUP) -#pragma _CRI duplicate MPI_T_pvar_get_index as PMPI_T_pvar_get_index +#pragma _CRI duplicate MPIX_T_pvar_get_index as PMPIX_T_pvar_get_index #elif defined(HAVE_WEAK_ATTRIBUTE) -int MPI_T_pvar_get_index(const char *name, int var_class, int *pvar_index) __attribute__((weak,alias("PMPI_T_pvar_get_index"))); +int MPIX_T_pvar_get_index(const char *name, int var_class, int *pvar_index) __attribute__((weak,alias("PMPIX_T_pvar_get_index"))); #endif /* -- End Profiling Symbol Block */ /* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build the MPI routines */ #ifndef MPICH_MPI_FROM_PMPI -#undef MPI_T_pvar_get_index -#define MPI_T_pvar_get_index PMPI_T_pvar_get_index +#undef MPIX_T_pvar_get_index +#define MPIX_T_pvar_get_index PMPIX_T_pvar_get_index #endif /* MPICH_MPI_FROM_PMPI */ #undef FUNCNAME -#define FUNCNAME MPI_T_pvar_get_index +#define FUNCNAME MPIX_T_pvar_get_index #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_pvar_get_index - Get the index of a performance variable +MPIX_T_pvar_get_index - Get the index of a performance variable Input Parameters: . name - the name of the performance variable (string) @@ -43,17 +43,17 @@ Output Parameters: .N Errors .N MPI_SUCCESS -.N MPI_T_ERR_INVALID_NAME +.N MPIX_T_ERR_INVALID_NAME .N MPI_T_ERR_NOT_INITIALIZED @*/ -int MPI_T_pvar_get_index(const char *name, int var_class, int *pvar_index) +int MPIX_T_pvar_get_index(const char *name, int var_class, int *pvar_index) { int mpi_errno = MPI_SUCCESS; - MPID_MPI_STATE_DECL(MPID_STATE_MPI_T_PVAR_GET_INDEX); + MPID_MPI_STATE_DECL(MPID_STATE_MPIX_T_PVAR_GET_INDEX); MPIR_ERRTEST_MPIT_INITIALIZED(mpi_errno); MPIR_T_THREAD_CS_ENTER(); - MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_T_PVAR_GET_INDEX); + MPID_MPI_FUNC_ENTER(MPID_STATE_MPIX_T_PVAR_GET_INDEX); /* Validate parameters */ # ifdef HAVE_ERROR_CHECKING @@ -65,7 +65,7 @@ int MPI_T_pvar_get_index(const char *name, int var_class, int *pvar_index) if (var_class < MPIR_T_PVAR_CLASS_FIRST || var_class >= MPIR_T_PVAR_CLASS_LAST) { - mpi_errno = MPI_T_ERR_INVALID_NAME; + mpi_errno = MPIX_T_ERR_INVALID_NAME; goto fn_fail; } } @@ -83,14 +83,14 @@ int MPI_T_pvar_get_index(const char *name, int var_class, int *pvar_index) if (hash_entry != NULL) { *pvar_index = hash_entry->idx; } else { - mpi_errno = MPI_T_ERR_INVALID_NAME; + mpi_errno = MPIX_T_ERR_INVALID_NAME; goto fn_fail; } /* ... end of body of routine ... */ fn_exit: - MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_T_PVAR_GET_INDEX); + MPID_MPI_FUNC_EXIT(MPID_STATE_MPIX_T_PVAR_GET_INDEX); MPIR_T_THREAD_CS_EXIT(); return mpi_errno; diff --git a/src/mpi_t/pvar_read.c b/src/mpi_t/pvar_read.c index de4c718..ab40212 100644 --- a/src/mpi_t/pvar_read.c +++ b/src/mpi_t/pvar_read.c @@ -35,11 +35,12 @@ int MPIR_T_pvar_read_impl(MPI_T_pvar_session session, MPI_T_pvar_handle handle, int i, mpi_errno = MPI_SUCCESS; /* Reading a never started pvar, or a stopped and then reset wartermark, - * will run into this nasty situation. Return a generic MPI_T error code, - * which is defined in MPI-3.1. + * will run into this nasty situation. MPI-3.0 does not define what error + * code should be returned. We return a generic MPI error code. Once MPI-3.1 + * is approved, it should be changed to MPI_T_ERR_INVALID. */ if (!MPIR_T_pvar_is_oncestarted(handle)) { - mpi_errno = MPI_T_ERR_INVALID; + mpi_errno = MPI_ERR_OTHER; goto fn_fail; } diff --git a/test/mpi/mpi_t/getindex.c b/test/mpi/mpi_t/getindex.c index ede43a6..6e13bcf 100644 --- a/test/mpi/mpi_t/getindex.c +++ b/test/mpi/mpi_t/getindex.c @@ -4,7 +4,7 @@ * See COPYRIGHT in top-level directory. */ -/* Test MPI_T_xxx_get_index() for cvars, pvars and categories. +/* Test MPIX_T_xxx_get_index() for cvars, pvars and categories. */ #include <stdio.h> #include "mpi.h" @@ -25,23 +25,23 @@ int main(int argc, char *argv[]) MPI_T_init_thread(required, &provided); MPI_Init(&argc, &argv); - /* Test MPI_T_cvar_get_index with both valid and bogus names */ + /* Test MPIX_T_cvar_get_index with both valid and bogus names */ MPI_T_cvar_get_num(&num_cvar); if (verbose) fprintf(stdout, "%d MPI Control Variables\n", num_cvar); for (i = 0; i < num_cvar; i++) { namelen = sizeof(name); MPI_T_cvar_get_info(i, name, &namelen, NULL, NULL, NULL, NULL, NULL, NULL, NULL); if (namelen <= 128) { - errno = MPI_T_cvar_get_index(name, &cvar_index); + errno = MPIX_T_cvar_get_index(name, &cvar_index); if (errno != MPI_SUCCESS || cvar_index != i) errs++; } } - errno = MPI_T_cvar_get_index("AN INVALID CVAR NAME FOR TEST", &cvar_index); - if (errno != MPI_T_ERR_INVALID_NAME) errs++; + errno = MPIX_T_cvar_get_index("AN INVALID CVAR NAME FOR TEST", &cvar_index); + if (errno != MPIX_T_ERR_INVALID_NAME) errs++; - if (errs) fprintf(stdout, "Errors found in MPI_T_cvar_get_index\n"); + if (errs) fprintf(stdout, "Errors found in MPIX_T_cvar_get_index\n"); - /* Test MPI_T_pvar_get_index with both valid and bogus names */ + /* Test MPIX_T_pvar_get_index with both valid and bogus names */ MPI_T_pvar_get_num(&num_pvar); if (verbose) fprintf(stdout, "%d MPI Performance Variables\n", num_pvar); @@ -50,28 +50,28 @@ int main(int argc, char *argv[]) MPI_T_pvar_get_info(i, name, &namelen, NULL, &pvar_class, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); if (namelen <= 128) { - errno = MPI_T_pvar_get_index(name, pvar_class, &pvar_index); + errno = MPIX_T_pvar_get_index(name, pvar_class, &pvar_index); if (errno != MPI_SUCCESS || pvar_index != i) errs++; } } - errno = MPI_T_pvar_get_index("AN INVALID PVAR NAME FOR TEST", MPI_T_PVAR_CLASS_COUNTER, &cvar_index); - if (errno != MPI_T_ERR_INVALID_NAME) errs++; - if (errs) fprintf(stdout, "Errors found in MPI_T_cvar_get_index\n"); + errno = MPIX_T_pvar_get_index("AN INVALID PVAR NAME FOR TEST", MPI_T_PVAR_CLASS_COUNTER, &cvar_index); + if (errno != MPIX_T_ERR_INVALID_NAME) errs++; + if (errs) fprintf(stdout, "Errors found in MPIX_T_cvar_get_index\n"); - /* Test MPI_T_category_get_index with both valid and bogus names */ + /* Test MPIX_T_category_get_index with both valid and bogus names */ MPI_T_category_get_num(&num_cat); if (verbose) fprintf(stdout, "%d MPI_T categories\n", num_cat); for (i = 0; i < num_cat; i++) { namelen = sizeof(name); MPI_T_category_get_info(i, name, &namelen, NULL, NULL, NULL, NULL, NULL); if (namelen <= 128) { - errno = MPI_T_category_get_index(name, &cat_index); + errno = MPIX_T_category_get_index(name, &cat_index); if (errno != MPI_SUCCESS || cat_index != i) errs++; } } - errno = MPI_T_category_get_index("AN INVALID CATEGORY NAME FOR TEST", &cat_index); - if (errno != MPI_T_ERR_INVALID_NAME) errs++; - if (errs) fprintf(stdout, "Errors found in MPI_T_cvar_get_index\n"); + errno = MPIX_T_category_get_index("AN INVALID CATEGORY NAME FOR TEST", &cat_index); + if (errno != MPIX_T_ERR_INVALID_NAME) errs++; + if (errs) fprintf(stdout, "Errors found in MPIX_T_cvar_get_index\n"); MPI_T_finalize(); MPI_Finalize(); diff --git a/test/mpi/mpi_t/testlist b/test/mpi/mpi_t/testlist index 752709a..bded0d2 100644 --- a/test/mpi/mpi_t/testlist +++ b/test/mpi/mpi_t/testlist @@ -1,4 +1,4 @@ mpi_t_str 1 mpiversion=3.0 mpit_vars 1 mpiversion=3.0 cvarwrite 1 mpiversion=3.0 -getindex 1 mpiversion=3.1 +getindex 1 strict=false ----------------------------------------------------------------------- Summary of changes: src/include/mpi.h.in | 20 ++++++++++---------- src/include/mpishared.h | 2 +- src/mpi_t/cat_get_index.c | 30 +++++++++++++++--------------- src/mpi_t/cvar_get_index.c | 30 +++++++++++++++--------------- src/mpi_t/errnames.txt | 12 ++++++------ src/mpi_t/pvar_get_index.c | 32 ++++++++++++++++---------------- src/mpi_t/pvar_read.c | 7 ++++--- test/mpi/mpi_t/getindex.c | 32 ++++++++++++++++---------------- test/mpi/mpi_t/testlist | 2 +- 9 files changed, 84 insertions(+), 83 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-250-g6efd9dd
by noreply＠mpich.org 05 Mar '15

05 Mar '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 6efd9ddefcf523d4cfd02655cab91bcc7f5c1baa (commit) from 4dbe06b9233c0d3f321f8fa2d5609456e97c25b3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/6efd9ddefcf523d4cfd02655cab91bcc7… commit 6efd9ddefcf523d4cfd02655cab91bcc7f5c1baa Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Thu Mar 5 09:27:18 2015 -0600 Marked ft/nvccoll test as expected to fail diff --git a/test/mpi/ft/testlist b/test/mpi/ft/testlist index 5ac3a2e..f3f1b83 100644 --- a/test/mpi/ft/testlist +++ b/test/mpi/ft/testlist @@ -18,4 +18,4 @@ shrink 8 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=T agree 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 agree_shrink 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 revoke_shrink 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=2198 -nbccoll 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 +nbccoll 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=2237 ----------------------------------------------------------------------- Summary of changes: test/mpi/ft/testlist | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-249-g4dbe06b
by noreply＠mpich.org 04 Mar '15

04 Mar '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 4dbe06b9233c0d3f321f8fa2d5609456e97c25b3 (commit) via ddfeda3d7a3c0effcb85da4a0fd080ac1778e800 (commit) via 87dfd9768c545efdee25abf2d19740563d4e61c6 (commit) via 0e4b9427a6d204ee958ccd1889c5f774099e95c1 (commit) from ad067b8a61e689e9b3e178de8da0bdc957aab3fc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/4dbe06b9233c0d3f321f8fa2d5609456e… commit 4dbe06b9233c0d3f321f8fa2d5609456e97c25b3 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Wed Mar 4 13:43:26 2015 -0600 CHANGES file for 3.2b1 release Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/CHANGES b/CHANGES index a609301..ab83b42 100644 --- a/CHANGES +++ b/CHANGES @@ -4,9 +4,10 @@ # Added support for proposed MPI-3.1 features including nonblocking collective I/O, address manipulation routines, thread-safety for - MPI initialization and pre-init functionality. Proposed MPI-3.1 - features are implemented as MPIX_ functions and the MPI version - number is still set to 3.0. + MPI initialization, pre-init functionality, and new MPI_T routines + to look up variables by name. Proposed MPI-3.1 features are + implemented as MPIX_ functions and the MPI version number is still + set to 3.0. # Fortran 2008 bindings are enabled by default and fully supported. @@ -22,11 +23,14 @@ # Significant stability improvements to the MPICH/portals4 implementation. + # Completely revamped RMA infrastructure including several + scalability improvements, performance improvements, and bug fixes. + # Several other minor bug fixes, memory leak fixes, and code cleanup. A full list of changes is available at the following link: - http://git.mpich.org/mpich.git/shortlog/v3.1.2..v3.2a2 + http://git.mpich.org/mpich.git/shortlog/v3.1.3..v3.2b1 A full list of bugs that have been fixed is available at the following link: http://git.mpich.org/mpich.git/commitdiff/ddfeda3d7a3c0effcb85da4a0fd080ac1… commit ddfeda3d7a3c0effcb85da4a0fd080ac1778e800 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Wed Mar 4 10:35:38 2015 -0600 Revert "Add Immediate versions of nonblocking coll. I/O" This reverts commit 077346f64f44dbd48eb7b7127b91dfa6a449b3b1. Signed-off-by: Wesley Bland <wbland(a)anl.gov> diff --git a/src/binding/fortran/use_mpi_f08/mpi_f08.F90 b/src/binding/fortran/use_mpi_f08/mpi_f08.F90 index ccde0e9..de11fb2 100644 --- a/src/binding/fortran/use_mpi_f08/mpi_f08.F90 +++ b/src/binding/fortran/use_mpi_f08/mpi_f08.F90 @@ -4121,8 +4121,8 @@ interface MPIX_Aint_diff end function MPIX_Aint_diff_f08 end interface MPIX_Aint_diff -interface MPI_File_iread_all - subroutine MPI_File_iread_all_f08ts(fh, buf, count, datatype, request, ierror) +interface MPIX_File_iread_all + subroutine MPIX_File_iread_all_f08ts(fh, buf, count, datatype, request, ierror) use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request implicit none type(MPI_File), intent(in) :: fh @@ -4131,11 +4131,11 @@ interface MPI_File_iread_all type(MPI_Datatype), intent(in) :: datatype type(MPI_Request), intent(out) :: request integer, optional, intent(out) :: ierror - end subroutine MPI_File_iread_all_f08ts -end interface MPI_File_iread_all + end subroutine MPIX_File_iread_all_f08ts +end interface MPIX_File_iread_all -interface MPI_File_iwrite_all - subroutine MPI_File_iwrite_all_f08ts(fh, buf, count, datatype, request, ierror) +interface MPIX_File_iwrite_all + subroutine MPIX_File_iwrite_all_f08ts(fh, buf, count, datatype, request, ierror) use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request implicit none type(MPI_File), intent(in) :: fh @@ -4144,11 +4144,11 @@ interface MPI_File_iwrite_all type(MPI_Datatype), intent(in) :: datatype type(MPI_Request), intent(out) :: request integer, optional, intent(out) :: ierror - end subroutine MPI_File_iwrite_all_f08ts -end interface MPI_File_iwrite_all + end subroutine MPIX_File_iwrite_all_f08ts +end interface MPIX_File_iwrite_all -interface MPI_File_iread_at_all - subroutine MPI_File_iread_at_all_f08ts(fh, offset, buf, count, datatype, request, ierror) +interface MPIX_File_iread_at_all + subroutine MPIX_File_iread_at_all_f08ts(fh, offset, buf, count, datatype, request, ierror) use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request use :: mpi_f08_compile_constants, only : MPI_OFFSET_KIND implicit none @@ -4159,11 +4159,11 @@ interface MPI_File_iread_at_all type(MPI_Datatype), intent(in) :: datatype type(MPI_Request), intent(out) :: request integer, optional, intent(out) :: ierror - end subroutine MPI_File_iread_at_all_f08ts -end interface MPI_File_iread_at_all + end subroutine MPIX_File_iread_at_all_f08ts +end interface MPIX_File_iread_at_all -interface MPI_File_iwrite_at_all - subroutine MPI_File_iwrite_at_all_f08ts(fh, offset, buf, count, datatype, request, ierror) +interface MPIX_File_iwrite_at_all + subroutine MPIX_File_iwrite_at_all_f08ts(fh, offset, buf, count, datatype, request, ierror) use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request use :: mpi_f08_compile_constants, only : MPI_OFFSET_KIND implicit none @@ -4174,7 +4174,7 @@ interface MPI_File_iwrite_at_all type(MPI_Datatype), intent(in) :: datatype type(MPI_Request), intent(out) :: request integer, optional, intent(out) :: ierror - end subroutine MPI_File_iwrite_at_all_f08ts -end interface MPI_File_iwrite_at_all + end subroutine MPIX_File_iwrite_at_all_f08ts +end interface MPIX_File_iwrite_at_all end module mpi_f08 diff --git a/src/binding/fortran/use_mpi_f08/wrappers_c/buildiface b/src/binding/fortran/use_mpi_f08/wrappers_c/buildiface index 64425d6..f70e101 100755 --- a/src/binding/fortran/use_mpi_f08/wrappers_c/buildiface +++ b/src/binding/fortran/use_mpi_f08/wrappers_c/buildiface @@ -146,10 +146,10 @@ my %bufpos = ( "MPI_Win_attach" => [1, -1, -1], "MPI_Win_create" => [0, -1, -1], "MPI_Win_detach" => [1, -1, -1], - "MPI_File_iread_all" => [1, 2, 3], - "MPI_File_iread_at_all" => [2, 3, 4], - "MPI_File_iwrite_all" => [1, 2, 3], - "MPI_File_iwrite_at_all" => [2, 3, 4] + "MPIX_File_iread_all" => [1, 2, 3], + "MPIX_File_iread_at_all" => [2, 3, 4], + "MPIX_File_iwrite_all" => [1, 2, 3], + "MPIX_File_iwrite_at_all" => [2, 3, 4] ); # Choice buffers in some functions can be passed in MPI_IN_PLACE. We store such diff --git a/src/binding/fortran/use_mpi_f08/wrappers_f/file_iread_all_f08ts.F90 b/src/binding/fortran/use_mpi_f08/wrappers_f/file_iread_all_f08ts.F90 index cbaa860..72c86b6 100644 --- a/src/binding/fortran/use_mpi_f08/wrappers_f/file_iread_all_f08ts.F90 +++ b/src/binding/fortran/use_mpi_f08/wrappers_f/file_iread_all_f08ts.F90 @@ -3,7 +3,7 @@ ! (C) 2014 by Argonne National Laboratory. ! See COPYRIGHT in top-level directory. ! -subroutine MPI_File_iread_all_f08ts(fh, buf, count, datatype, request, ierror) +subroutine MPIX_File_iread_all_f08ts(fh, buf, count, datatype, request, ierror) use, intrinsic :: iso_c_binding, only : c_loc, c_associated use, intrinsic :: iso_c_binding, only : c_int, c_ptr use :: mpi_f08, only : MPI_File, MPI_Datatype, MPI_Request @@ -39,4 +39,4 @@ subroutine MPI_File_iread_all_f08ts(fh, buf, count, datatype, request, ierror) if (present(ierror)) ierror = ierror_c -end subroutine MPI_File_iread_all_f08ts +end subroutine MPIX_File_iread_all_f08ts diff --git a/src/binding/fortran/use_mpi_f08/wrappers_f/file_iread_at_all_f08ts.F90 b/src/binding/fortran/use_mpi_f08/wrappers_f/file_iread_at_all_f08ts.F90 index 7e42c1a..fe68cfc 100644 --- a/src/binding/fortran/use_mpi_f08/wrappers_f/file_iread_at_all_f08ts.F90 +++ b/src/binding/fortran/use_mpi_f08/wrappers_f/file_iread_at_all_f08ts.F90 @@ -3,7 +3,7 @@ ! (C) 2014 by Argonne National Laboratory. ! See COPYRIGHT in top-level directory. ! -subroutine MPI_File_iread_at_all_f08ts(fh, offset, buf, count, datatype, request, ierror) +subroutine MPIX_File_iread_at_all_f08ts(fh, offset, buf, count, datatype, request, ierror) use, intrinsic :: iso_c_binding, only : c_loc, c_associated use, intrinsic :: iso_c_binding, only : c_int, c_ptr use :: mpi_f08, only : MPI_File, MPI_Datatype, MPI_Request @@ -43,4 +43,4 @@ subroutine MPI_File_iread_at_all_f08ts(fh, offset, buf, count, datatype, request if (present(ierror)) ierror = ierror_c -end subroutine MPI_File_iread_at_all_f08ts +end subroutine MPIX_File_iread_at_all_f08ts diff --git a/src/binding/fortran/use_mpi_f08/wrappers_f/file_iwrite_all_f08ts.F90 b/src/binding/fortran/use_mpi_f08/wrappers_f/file_iwrite_all_f08ts.F90 index b4b1893..469555a 100644 --- a/src/binding/fortran/use_mpi_f08/wrappers_f/file_iwrite_all_f08ts.F90 +++ b/src/binding/fortran/use_mpi_f08/wrappers_f/file_iwrite_all_f08ts.F90 @@ -3,7 +3,7 @@ ! (C) 2014 by Argonne National Laboratory. ! See COPYRIGHT in top-level directory. ! -subroutine MPI_File_iwrite_all_f08ts(fh, buf, count, datatype, request, ierror) +subroutine MPIX_File_iwrite_all_f08ts(fh, buf, count, datatype, request, ierror) use, intrinsic :: iso_c_binding, only : c_loc, c_associated use, intrinsic :: iso_c_binding, only : c_int, c_ptr use :: mpi_f08, only : MPI_File, MPI_Datatype, MPI_Request @@ -39,4 +39,4 @@ subroutine MPI_File_iwrite_all_f08ts(fh, buf, count, datatype, request, ierror) if (present(ierror)) ierror = ierror_c -end subroutine MPI_File_iwrite_all_f08ts +end subroutine MPIX_File_iwrite_all_f08ts diff --git a/src/binding/fortran/use_mpi_f08/wrappers_f/file_iwrite_at_all_f08ts.F90 b/src/binding/fortran/use_mpi_f08/wrappers_f/file_iwrite_at_all_f08ts.F90 index 0be29ac..b5ed93f 100644 --- a/src/binding/fortran/use_mpi_f08/wrappers_f/file_iwrite_at_all_f08ts.F90 +++ b/src/binding/fortran/use_mpi_f08/wrappers_f/file_iwrite_at_all_f08ts.F90 @@ -3,7 +3,7 @@ ! (C) 2014 by Argonne National Laboratory. ! See COPYRIGHT in top-level directory. ! -subroutine MPI_File_iwrite_at_all_f08ts(fh, offset, buf, count, datatype, request, ierror) +subroutine MPIX_File_iwrite_at_all_f08ts(fh, offset, buf, count, datatype, request, ierror) use, intrinsic :: iso_c_binding, only : c_loc, c_associated use, intrinsic :: iso_c_binding, only : c_int, c_ptr use :: mpi_f08, only : MPI_File, MPI_Datatype, MPI_Request @@ -43,4 +43,4 @@ subroutine MPI_File_iwrite_at_all_f08ts(fh, offset, buf, count, datatype, reques if (present(ierror)) ierror = ierror_c -end subroutine MPI_File_iwrite_at_all_f08ts +end subroutine MPIX_File_iwrite_at_all_f08ts diff --git a/src/mpi/romio/include/mpio.h.in b/src/mpi/romio/include/mpio.h.in index 1f3f382..2238f4b 100644 --- a/src/mpi/romio/include/mpio.h.in +++ b/src/mpi/romio/include/mpio.h.in @@ -239,16 +239,16 @@ int MPI_File_get_errhandler(MPI_File file, MPI_Errhandler *errhandler); #endif /* For MPI 3.1 */ -int MPI_File_iread_at_all(MPI_File fh, MPI_Offset offset, void *buf, int count, +int MPIX_File_iread_at_all(MPI_File fh, MPI_Offset offset, void *buf, int count, MPI_Datatype datatype, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5); -int MPI_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int count, +int MPIX_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int count, MPI_Datatype datatype, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5); -int MPI_File_iread_all(MPI_File fh, void *buf, int count, MPI_Datatype datatype, +int MPIX_File_iread_all(MPI_File fh, void *buf, int count, MPI_Datatype datatype, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); -int MPI_File_iwrite_all(MPI_File fh, const void *buf, int count, MPI_Datatype datatype, +int MPIX_File_iwrite_all(MPI_File fh, const void *buf, int count, MPI_Datatype datatype, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); /* End Prototypes */ @@ -468,16 +468,16 @@ int PMPI_File_get_errhandler( MPI_File, MPI_Errhandler * ); #endif /* For MPI 3.1 */ -int PMPI_File_iread_at_all(MPI_File fh, MPI_Offset offset, void *buf, int count, +int PMPIX_File_iread_at_all(MPI_File fh, MPI_Offset offset, void *buf, int count, MPI_Datatype datatype, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5); -int PMPI_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int count, +int PMPIX_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int count, MPI_Datatype datatype, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5); -int PMPI_File_iread_all(MPI_File fh, void *buf, int count, MPI_Datatype datatype, +int PMPIX_File_iread_all(MPI_File fh, void *buf, int count, MPI_Datatype datatype, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); -int PMPI_File_iwrite_all(MPI_File fh, const void *buf, int count, MPI_Datatype datatype, +int PMPIX_File_iwrite_all(MPI_File fh, const void *buf, int count, MPI_Datatype datatype, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); diff --git a/src/mpi/romio/mpi-io/iread_all.c b/src/mpi/romio/mpi-io/iread_all.c index 4aa980b..ba36161 100644 --- a/src/mpi/romio/mpi-io/iread_all.c +++ b/src/mpi/romio/mpi-io/iread_all.c @@ -9,16 +9,16 @@ #ifdef HAVE_WEAK_SYMBOLS #if defined(HAVE_PRAGMA_WEAK) -#pragma weak MPI_File_iread_all = PMPI_File_iread_all +#pragma weak MPIX_File_iread_all = PMPIX_File_iread_all #elif defined(HAVE_PRAGMA_HP_SEC_DEF) -#pragma _HP_SECONDARY_DEF PMPI_File_iread_all MPI_File_iread_all +#pragma _HP_SECONDARY_DEF PMPIX_File_iread_all MPIX_File_iread_all #elif defined(HAVE_PRAGMA_CRI_DUP) -#pragma _CRI duplicate MPI_File_iread_all as PMPI_File_iread_all +#pragma _CRI duplicate MPIX_File_iread_all as PMPIX_File_iread_all /* end of weak pragmas */ #elif defined(HAVE_WEAK_ATTRIBUTE) -int MPI_File_iread_all(MPI_File fh, void *buf, int count, MPI_Datatype datatype, +int MPIX_File_iread_all(MPI_File fh, void *buf, int count, MPI_Datatype datatype, MPI_Request *request) - __attribute__((weak,alias("PMPI_File_iread_all"))); + __attribute__((weak,alias("PMPIX_File_iread_all"))); #endif /* Include mapping from MPI->PMPI */ @@ -31,7 +31,7 @@ int MPI_File_iread_all(MPI_File fh, void *buf, int count, MPI_Datatype datatype, #endif /*@ - MPI_File_iread_all - Nonblocking collective read using individual file pointer + MPIX_File_iread_all - Nonblocking collective read using individual file pointer Input Parameters: . fh - file handle (handle) @@ -44,11 +44,11 @@ Output Parameters: .N fortran @*/ -int MPI_File_iread_all(MPI_File fh, void *buf, int count, +int MPIX_File_iread_all(MPI_File fh, void *buf, int count, MPI_Datatype datatype, MPI_Request *request) { int error_code; - static char myname[] = "MPI_FILE_IREAD_ALL"; + static char myname[] = "MPIX_FILE_IREAD_ALL"; #ifdef MPI_hpux int fl_xmpi; @@ -72,7 +72,7 @@ int MPI_File_iread_all(MPI_File fh, void *buf, int count, return error_code; } -/* Note: MPIOI_File_iread_all also used by MPI_File_iread_at_all */ +/* Note: MPIOI_File_iread_all also used by MPIX_File_iread_at_all */ /* prevent multiple definitions of this routine */ #ifdef MPIO_BUILD_PROFILING int MPIOI_File_iread_all(MPI_File fh, diff --git a/src/mpi/romio/mpi-io/iread_atall.c b/src/mpi/romio/mpi-io/iread_atall.c index da9326a..1a9d718 100644 --- a/src/mpi/romio/mpi-io/iread_atall.c +++ b/src/mpi/romio/mpi-io/iread_atall.c @@ -9,16 +9,16 @@ #ifdef HAVE_WEAK_SYMBOLS #if defined(HAVE_PRAGMA_WEAK) -#pragma weak MPI_File_iread_at_all = PMPI_File_iread_at_all +#pragma weak MPIX_File_iread_at_all = PMPIX_File_iread_at_all #elif defined(HAVE_PRAGMA_HP_SEC_DEF) -#pragma _HP_SECONDARY_DEF PMPI_File_iread_at_all MPI_File_iread_at_all +#pragma _HP_SECONDARY_DEF PMPIX_File_iread_at_all MPIX_File_iread_at_all #elif defined(HAVE_PRAGMA_CRI_DUP) -#pragma _CRI duplicate MPI_File_iread_at_all as PMPI_File_iread_at_all +#pragma _CRI duplicate MPIX_File_iread_at_all as PMPIX_File_iread_at_all /* end of weak pragmas */ #elif defined(HAVE_WEAK_ATTRIBUTE) -int MPI_File_iread_at_all(MPI_File fh, MPI_Offset offset, void * buf, int count, +int MPIX_File_iread_at_all(MPI_File fh, MPI_Offset offset, void * buf, int count, MPI_Datatype datatype, MPI_Request *request) - __attribute__((weak,alias("PMPI_File_iread_at_all"))); + __attribute__((weak,alias("PMPIX_File_iread_at_all"))); #endif /* Include mapping from MPI->PMPI */ @@ -31,7 +31,7 @@ int MPI_File_iread_at_all(MPI_File fh, MPI_Offset offset, void * buf, int count, #endif /*@ - MPI_File_iread_at_all - Nonblocking collective read using explicit offset + MPIX_File_iread_at_all - Nonblocking collective read using explicit offset Input Parameters: . fh - file handle (handle) @@ -45,12 +45,12 @@ Output Parameters: .N fortran @*/ -int MPI_File_iread_at_all(MPI_File fh, MPI_Offset offset, void *buf, +int MPIX_File_iread_at_all(MPI_File fh, MPI_Offset offset, void *buf, int count, MPI_Datatype datatype, MPI_Request *request) { int error_code; - static char myname[] = "MPI_FILE_IREAD_AT_ALL"; + static char myname[] = "MPIX_FILE_IREAD_AT_ALL"; #ifdef MPI_hpux int fl_xmpi; diff --git a/src/mpi/romio/mpi-io/iwrite_all.c b/src/mpi/romio/mpi-io/iwrite_all.c index 81de3b5..aeed90d 100644 --- a/src/mpi/romio/mpi-io/iwrite_all.c +++ b/src/mpi/romio/mpi-io/iwrite_all.c @@ -9,16 +9,16 @@ #ifdef HAVE_WEAK_SYMBOLS #if defined(HAVE_PRAGMA_WEAK) -#pragma weak MPI_File_iwrite_all = PMPI_File_iwrite_all +#pragma weak MPIX_File_iwrite_all = PMPIX_File_iwrite_all #elif defined(HAVE_PRAGMA_HP_SEC_DEF) -#pragma _HP_SECONDARY_DEF PMPI_File_iwrite_all MPI_File_iwrite_all +#pragma _HP_SECONDARY_DEF PMPIX_File_iwrite_all MPIX_File_iwrite_all #elif defined(HAVE_PRAGMA_CRI_DUP) -#pragma _CRI duplicate MPI_File_iwrite_all as PMPI_File_iwrite_all +#pragma _CRI duplicate MPIX_File_iwrite_all as PMPIX_File_iwrite_all /* end of weak pragmas */ #elif defined(HAVE_WEAK_ATTRIBUTE) -int MPI_File_iwrite_all(MPI_File fh, const void *buf, int count, MPI_Datatype datatype, +int MPIX_File_iwrite_all(MPI_File fh, const void *buf, int count, MPI_Datatype datatype, MPI_Request *request) - __attribute__((weak,alias("PMPI_File_iwrite_all"))); + __attribute__((weak,alias("PMPIX_File_iwrite_all"))); #endif /* Include mapping from MPI->PMPI */ @@ -31,7 +31,7 @@ int MPI_File_iwrite_all(MPI_File fh, const void *buf, int count, MPI_Datatype da #endif /*@ - MPI_File_iwrite_all - Nonblocking collective write using individual file pointer + MPIX_File_iwrite_all - Nonblocking collective write using individual file pointer Input Parameters: . fh - file handle (handle) @@ -44,11 +44,11 @@ Output Parameters: .N fortran @*/ -int MPI_File_iwrite_all(MPI_File fh, ROMIO_CONST void *buf, int count, +int MPIX_File_iwrite_all(MPI_File fh, ROMIO_CONST void *buf, int count, MPI_Datatype datatype, MPI_Request *request) { int error_code; - static char myname[] = "MPI_FILE_IWRITE_ALL"; + static char myname[] = "MPIX_FILE_IWRITE_ALL"; #ifdef MPI_hpux int fl_xmpi; @@ -66,7 +66,7 @@ int MPI_File_iwrite_all(MPI_File fh, ROMIO_CONST void *buf, int count, return error_code; } -/* Note: MPIOI_File_iwrite_all also used by MPI_File_iwrite_at_all */ +/* Note: MPIOI_File_iwrite_all also used by MPIX_File_iwrite_at_all */ /* prevent multiple definitions of this routine */ #ifdef MPIO_BUILD_PROFILING int MPIOI_File_iwrite_all(MPI_File fh, diff --git a/src/mpi/romio/mpi-io/iwrite_atall.c b/src/mpi/romio/mpi-io/iwrite_atall.c index 9c0564e..c5eba79 100644 --- a/src/mpi/romio/mpi-io/iwrite_atall.c +++ b/src/mpi/romio/mpi-io/iwrite_atall.c @@ -9,16 +9,16 @@ #ifdef HAVE_WEAK_SYMBOLS #if defined(HAVE_PRAGMA_WEAK) -#pragma weak MPI_File_iwrite_at_all = PMPI_File_iwrite_at_all +#pragma weak MPIX_File_iwrite_at_all = PMPIX_File_iwrite_at_all #elif defined(HAVE_PRAGMA_HP_SEC_DEF) -#pragma _HP_SECONDARY_DEF PMPI_File_iwrite_at_all MPI_File_iwrite_at_all +#pragma _HP_SECONDARY_DEF PMPIX_File_iwrite_at_all MPIX_File_iwrite_at_all #elif defined(HAVE_PRAGMA_CRI_DUP) -#pragma _CRI duplicate MPI_File_iwrite_at_all as PMPI_File_iwrite_at_all +#pragma _CRI duplicate MPIX_File_iwrite_at_all as PMPIX_File_iwrite_at_all /* end of weak pragmas */ #elif defined(HAVE_WEAK_ATTRIBUTE) -int MPI_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int count, +int MPIX_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int count, MPI_Datatype datatype, MPI_Request *request) - __attribute__((weak,alias("PMPI_File_iwrite_at_all"))); + __attribute__((weak,alias("PMPIX_File_iwrite_at_all"))); #endif /* Include mapping from MPI->PMPI */ @@ -31,7 +31,7 @@ int MPI_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int #endif /*@ - MPI_File_iwrite_at_all - Nonblocking collective write using explicit offset + MPIX_File_iwrite_at_all - Nonblocking collective write using explicit offset Input Parameters: . fh - file handle (handle) @@ -45,12 +45,12 @@ Output Parameters: .N fortran @*/ -int MPI_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, ROMIO_CONST void *buf, +int MPIX_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, ROMIO_CONST void *buf, int count, MPI_Datatype datatype, MPI_Request *request) { int error_code; - static char myname[] = "MPI_FILE_IWRITE_AT_ALL"; + static char myname[] = "MPIX_FILE_IWRITE_AT_ALL"; #ifdef MPI_hpux int fl_xmpi; diff --git a/src/mpi/romio/mpi-io/mpioprof.h b/src/mpi/romio/mpi-io/mpioprof.h index f3ee3b4..15654ac 100644 --- a/src/mpi/romio/mpi-io/mpioprof.h +++ b/src/mpi/romio/mpi-io/mpioprof.h @@ -70,14 +70,14 @@ #undef MPI_File_get_byte_offset #define MPI_File_get_byte_offset PMPI_File_get_byte_offset -#undef MPI_File_iread_at_all -#define MPI_File_iread_at_all PMPI_File_iread_at_all -#undef MPI_File_iwrite_at_all -#define MPI_File_iwrite_at_all PMPI_File_iwrite_at_all -#undef MPI_File_iread_all -#define MPI_File_iread_all PMPI_File_iread_all -#undef MPI_File_iwrite_all -#define MPI_File_iwrite_all PMPI_File_iwrite_all +#undef MPIX_File_iread_at_all +#define MPIX_File_iread_at_all PMPIX_File_iread_at_all +#undef MPIX_File_iwrite_at_all +#define MPIX_File_iwrite_at_all PMPIX_File_iwrite_at_all +#undef MPIX_File_iread_all +#define MPIX_File_iread_all PMPIX_File_iread_all +#undef MPIX_File_iwrite_all +#define MPIX_File_iwrite_all PMPIX_File_iwrite_all #undef MPI_File_read_shared #define MPI_File_read_shared PMPI_File_read_shared diff --git a/test/mpi/f08/io/i_fcoll_test.f90 b/test/mpi/f08/io/i_fcoll_test.f90 index cdf53d2..29bc82a 100644 --- a/test/mpi/f08/io/i_fcoll_test.f90 +++ b/test/mpi/f08/io/i_fcoll_test.f90 @@ -108,7 +108,7 @@ call MPI_FILE_OPEN(MPI_COMM_WORLD, str, MPI_MODE_CREATE+MPI_MODE_RDWR, MPI_INFO_ disp = 0 call MPI_FILE_SET_VIEW(fh, disp, MPI_INTEGER, newtype, "native", MPI_INFO_NULL, ierr) -call MPI_FILE_IWRITE_ALL(fh, writebuf, bufcount, MPI_INTEGER, request, ierr) +call MPIX_FILE_IWRITE_ALL(fh, writebuf, bufcount, MPI_INTEGER, request, ierr) call MPI_WAIT(request, status, ierr) call MPI_FILE_CLOSE(fh, ierr) @@ -117,7 +117,7 @@ call MPI_FILE_CLOSE(fh, ierr) call MPI_FILE_OPEN(MPI_COMM_WORLD, str, MPI_MODE_CREATE+MPI_MODE_RDWR, MPI_INFO_NULL, fh, ierr) call MPI_FILE_SET_VIEW(fh, disp, MPI_INTEGER, newtype, "native", MPI_INFO_NULL, ierr) -call MPI_FILE_IREAD_ALL(fh, readbuf, bufcount, MPI_INTEGER, request, ierr) +call MPIX_FILE_IREAD_ALL(fh, readbuf, bufcount, MPI_INTEGER, request, ierr) call MPI_WAIT(request, status, ierr) call MPI_FILE_CLOSE(fh, ierr) diff --git a/test/mpi/f08/io/ioharness.defn b/test/mpi/f08/io/ioharness.defn index 1a38ef8..5a7d756 100644 --- a/test/mpi/f08/io/ioharness.defn +++ b/test/mpi/f08/io/ioharness.defn @@ -258,7 +258,7 @@ integer (kind=MPI_OFFSET_KIND)offset do k=1, b <setContigBuffer/> <findOffset/> - call MPI_File_iwrite_at_all( fh, offset, buf, n, MPI_INTEGER, request, ierr ) + call MPIX_File_iwrite_at_all( fh, offset, buf, n, MPI_INTEGER, request, ierr ) call MPI_Wait(request, status, ierr) <checkErr/> enddo @@ -270,7 +270,7 @@ enddo do k=1, b <clearContigBuffer/> <findOffset/> - call MPI_File_iread_at_all( fh, offset, buf, n, MPI_INTEGER, request, ierr ) + call MPIX_File_iread_at_all( fh, offset, buf, n, MPI_INTEGER, request, ierr ) call MPI_Wait(request, status, ierr) <checkErr/> <checkContigBuffer/> diff --git a/test/mpi/f08/io/testlist.in b/test/mpi/f08/io/testlist.in index 7395025..d2dd57d 100644 --- a/test/mpi/f08/io/testlist.in +++ b/test/mpi/f08/io/testlist.in @@ -18,5 +18,5 @@ miscfilef90 4 setviewcurf90 4 c2f2ciof90 1 c2f90multio 1 -i_fcoll_test 4 -iwriteatallf90 4 +@mpix@ i_fcoll_test 4 +@mpix@ iwriteatallf90 4 diff --git a/test/mpi/f77/io/i_setviewcurf.f b/test/mpi/f77/io/i_setviewcurf.f index 1f672d3..15b222e 100644 --- a/test/mpi/f77/io/i_setviewcurf.f +++ b/test/mpi/f77/io/i_setviewcurf.f @@ -37,7 +37,7 @@ C using a combination of collective and ordered writes endif buf(1) = size - call MPI_File_iwrite_all( fh, buf, 1, MPI_INTEGER, request, ierr) + call MPIX_File_iwrite_all( fh, buf, 1, MPI_INTEGER, request, ierr) if (ierr .ne. MPI_SUCCESS) then errs = errs + 1 call MTestPrintErrorMsg( "iwrite_all", ierr ) diff --git a/test/mpi/f77/io/ioharness.defn b/test/mpi/f77/io/ioharness.defn index 2fd0863..22d143c 100644 --- a/test/mpi/f77/io/ioharness.defn +++ b/test/mpi/f77/io/ioharness.defn @@ -258,7 +258,7 @@ include 'iooffset.h' do k=1, b <setContigBuffer/> <findOffset/> - call mpi_file_iwrite_at_all( fh, offset, buf, n, MPI_INTEGER, request, ierr ) + call mpix_file_iwrite_at_all( fh, offset, buf, n, MPI_INTEGER, request, ierr ) call mpi_wait(request, status, ierr) <checkErr/> enddo @@ -270,7 +270,7 @@ enddo do k=1, b <clearContigBuffer/> <findOffset/> - call mpi_file_iread_at_all( fh, offset, buf, n, MPI_INTEGER, request, ierr ) + call mpix_file_iread_at_all( fh, offset, buf, n, MPI_INTEGER, request, ierr ) call mpi_wait(request, status, ierr) <checkErr/> <checkContigBuffer/> diff --git a/test/mpi/f77/io/testlist.in b/test/mpi/f77/io/testlist.in index 7c9f47c..6b5d1ac 100644 --- a/test/mpi/f77/io/testlist.in +++ b/test/mpi/f77/io/testlist.in @@ -18,5 +18,5 @@ miscfilef 4 setviewcurf 4 c2f2ciof 1 c2fmultio 1 -i_setviewcurf 4 -iwriteatallf 4 xfail=2201 +@mpix@ i_setviewcurf 4 +@mpix@ iwriteatallf 4 xfail=2201 diff --git a/test/mpi/io/i_aggregation1.c b/test/mpi/io/i_aggregation1.c index 67d39f0..d36d821 100644 --- a/test/mpi/io/i_aggregation1.c +++ b/test/mpi/io/i_aggregation1.c @@ -112,7 +112,7 @@ static void write_file(char *target, int rank, MPI_Info *info) buffer[i] = (char *)malloc(OBJ_SIZE); fill_buffer(buffer[i], OBJ_SIZE, rank, offset); if (debug) printf("%s", buffer[i]); - if ((mpi_ret = MPI_File_iwrite_at_all(wfh, offset, buffer[i], OBJ_SIZE, + if ((mpi_ret = MPIX_File_iwrite_at_all(wfh, offset, buffer[i], OBJ_SIZE, MPI_CHAR, &request[i])) != MPI_SUCCESS) { fatal_error(mpi_ret, NULL, "write"); @@ -176,7 +176,7 @@ static void read_file(char *target, int rank, MPI_Info *info, int *corrupt_block verify_buf[i] = (char *)malloc(OBJ_SIZE); fill_buffer(verify_buf[i], OBJ_SIZE, rank, offset[i]); if (debug) printf("Expecting %s", verify_buf[i]); - if ((mpi_ret = MPI_File_iread_at_all(rfh, offset[i], buffer[i], + if ((mpi_ret = MPIX_File_iread_at_all(rfh, offset[i], buffer[i], OBJ_SIZE, MPI_CHAR, &request[i])) != MPI_SUCCESS) { fatal_error(mpi_ret, NULL, "read"); diff --git a/test/mpi/io/i_aggregation2.c b/test/mpi/io/i_aggregation2.c index 99b0be4..0ead78e 100644 --- a/test/mpi/io/i_aggregation2.c +++ b/test/mpi/io/i_aggregation2.c @@ -60,9 +60,9 @@ int main(int argc, char **argv) errcode = MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_WRONLY | MPI_MODE_CREATE, info, &fh); if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_open"); - errcode = MPI_File_iwrite_at_all(fh, off, buffer, BUFSIZE, MPI_INT, + errcode = MPIX_File_iwrite_at_all(fh, off, buffer, BUFSIZE, MPI_INT, &request); - if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_iwrite_at_all"); + if (errcode != MPI_SUCCESS) handle_error(errcode, "MPIX_File_iwrite_at_all"); MPI_Wait(&request, &status); errcode = MPI_File_close(&fh); if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_close"); @@ -70,9 +70,9 @@ int main(int argc, char **argv) errcode = MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_RDONLY, info, &fh); if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_open"); - errcode = MPI_File_iread_at_all(fh, off, buf2, BUFSIZE, MPI_INT, + errcode = MPIX_File_iread_at_all(fh, off, buf2, BUFSIZE, MPI_INT, &request); - if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_iread_at_all"); + if (errcode != MPI_SUCCESS) handle_error(errcode, "MPIX_File_iread_at_all"); MPI_Wait(&request, &status); errcode = MPI_File_close(&fh); if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_close"); diff --git a/test/mpi/io/i_bigtype.c b/test/mpi/io/i_bigtype.c index a5968a9..301b54c 100644 --- a/test/mpi/io/i_bigtype.c +++ b/test/mpi/io/i_bigtype.c @@ -100,7 +100,7 @@ int main(int argc, char **argv) } /* write everything */ - rc = MPI_File_iwrite_at_all(fh, 0, buf_write, 1, mem_type, &request); + rc = MPIX_File_iwrite_at_all(fh, 0, buf_write, 1, mem_type, &request); if (rc != MPI_SUCCESS) { printf("%d ERROR IWRITE AT ALL\n", rc); exit(1); @@ -115,7 +115,7 @@ int main(int argc, char **argv) } /* read everything */ - rc = MPI_File_iread_at_all(fh, 0, buf_read, 1, mem_type, &request); + rc = MPIX_File_iread_at_all(fh, 0, buf_read, 1, mem_type, &request); if (rc != MPI_SUCCESS) { printf("%d ERROR IREAD AT ALL\n", rc); exit(1); diff --git a/test/mpi/io/i_coll_test.c b/test/mpi/io/i_coll_test.c index 5f65cc5..982f4e5 100644 --- a/test/mpi/io/i_coll_test.c +++ b/test/mpi/io/i_coll_test.c @@ -122,8 +122,8 @@ int main(int argc, char **argv) errcode = MPI_File_set_view(fh, 0, MPI_INT, newtype, "native", info); if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_set_view"); - errcode = MPI_File_iwrite_all(fh, writebuf, bufcount, MPI_INT, &request); - if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_iwrite_all"); + errcode = MPIX_File_iwrite_all(fh, writebuf, bufcount, MPI_INT, &request); + if (errcode != MPI_SUCCESS) handle_error(errcode, "MPIX_File_iwrite_all"); MPI_Wait(&request, &status); errcode = MPI_File_close(&fh); @@ -163,8 +163,8 @@ int main(int argc, char **argv) errcode = MPI_File_set_view(fh, 0, MPI_INT, newtype, "native", info); if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_set_view"); - errcode = MPI_File_iread_all(fh, readbuf, bufcount, MPI_INT, &request); - if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_iread_all"); + errcode = MPIX_File_iread_all(fh, readbuf, bufcount, MPI_INT, &request); + if (errcode != MPI_SUCCESS) handle_error(errcode, "MPIX_File_iread_all"); MPI_Wait(&request, &status); errcode = MPI_File_close(&fh); if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_close"); diff --git a/test/mpi/io/i_darray_read.c b/test/mpi/io/i_darray_read.c index 8fc970d..dccb660 100644 --- a/test/mpi/io/i_darray_read.c +++ b/test/mpi/io/i_darray_read.c @@ -92,7 +92,7 @@ int main(int argc, char *argv[]) MPI_INFO_NULL, &mpi_fh)); CHECK(MPI_File_set_view(mpi_fh, 0, MPI_DOUBLE, darray, "native", MPI_INFO_NULL)); - CHECK(MPI_File_iread_all(mpi_fh, ldata, nelem, MPI_DOUBLE, &request)); + CHECK(MPIX_File_iread_all(mpi_fh, ldata, nelem, MPI_DOUBLE, &request)); CHECK(MPI_Wait(&request, &status)); CHECK(MPI_File_close(&mpi_fh)); diff --git a/test/mpi/io/i_hindexed.c b/test/mpi/io/i_hindexed.c index 93471eb..f8523ed 100644 --- a/test/mpi/io/i_hindexed.c +++ b/test/mpi/io/i_hindexed.c @@ -174,7 +174,7 @@ int main(int argc, char **argv) offset = i * global_array_size; /* set the file view */ MPI_File_set_view(fh, offset, MPI_BYTE, ftype, "native", MPI_INFO_NULL); - MPI_File_iwrite_all(fh, buf, ftype_size, MPI_CHAR, &request[i]); + MPIX_File_iwrite_all(fh, buf, ftype_size, MPI_CHAR, &request[i]); } MPI_Waitall(num_io, request, statuses); MPI_File_close(&fh); diff --git a/test/mpi/io/i_hindexed_io.c b/test/mpi/io/i_hindexed_io.c index 40e9f99..5b17819 100644 --- a/test/mpi/io/i_hindexed_io.c +++ b/test/mpi/io/i_hindexed_io.c @@ -71,13 +71,13 @@ int main(int argc, char **argv) MPI_INFO_NULL)); /* write everything */ - CHECK(MPI_File_iwrite_at_all(fh, 0, data, 1, mem_type, &request)); + CHECK(MPIX_File_iwrite_at_all(fh, 0, data, 1, mem_type, &request)); MPI_Wait(&request, &status); /* verify */ CHECK(MPI_File_set_view(fh, 0, MPI_BYTE, MPI_BYTE, "native", MPI_INFO_NULL)); - CHECK(MPI_File_iread_at_all(fh, 0, + CHECK(MPIX_File_iread_at_all(fh, 0, verify, (HEADER + PAD + BLK_COUNT * DATA_SIZE) / sizeof(int), MPI_INT, &request)); MPI_Wait(&request, &status); diff --git a/test/mpi/io/i_noncontig_coll.c b/test/mpi/io/i_noncontig_coll.c index 474023d..f625e9b 100644 --- a/test/mpi/io/i_noncontig_coll.c +++ b/test/mpi/io/i_noncontig_coll.c @@ -79,7 +79,7 @@ int main(int argc, char **argv) for (i = 0; i < SIZE; i++) buf[i] = i + mynod * SIZE; - MPI_File_iwrite_all(fh, buf, 1, newtype, &request); + MPIX_File_iwrite_all(fh, buf, 1, newtype, &request); MPI_Barrier(MPI_COMM_WORLD); MPI_Wait(&request, &status); @@ -87,7 +87,7 @@ int main(int argc, char **argv) for (i = 0; i < SIZE; i++) buf[i] = -1; - MPI_File_iread_at_all(fh, 0, buf, 1, newtype, &request); + MPIX_File_iread_at_all(fh, 0, buf, 1, newtype, &request); MPI_Wait(&request, &status); for (i = 0; i < SIZE; i++) { @@ -134,7 +134,7 @@ int main(int argc, char **argv) MPI_INFO_NULL, &fh); for (i = 0; i < SIZE; i++) buf[i] = i + mynod * SIZE; - MPI_File_iwrite_at_all(fh, mynod * (SIZE / 2) * sizeof(int), buf, 1, + MPIX_File_iwrite_at_all(fh, mynod * (SIZE / 2) * sizeof(int), buf, 1, newtype, &request); MPI_Barrier(MPI_COMM_WORLD); @@ -142,7 +142,7 @@ int main(int argc, char **argv) for (i = 0; i < SIZE; i++) buf[i] = -1; - MPI_File_iread_at_all(fh, mynod * (SIZE / 2) * sizeof(int), buf, 1, + MPIX_File_iread_at_all(fh, mynod * (SIZE / 2) * sizeof(int), buf, 1, newtype, &request); MPI_Wait(&request, &status); @@ -192,7 +192,7 @@ int main(int argc, char **argv) MPI_File_set_view(fh, 0, MPI_INT, newtype, "native", MPI_INFO_NULL); for (i = 0; i < SIZE; i++) buf[i] = i + mynod * SIZE; - MPI_File_iwrite_all(fh, buf, SIZE, MPI_INT, &request); + MPIX_File_iwrite_all(fh, buf, SIZE, MPI_INT, &request); MPI_Barrier(MPI_COMM_WORLD); MPI_Wait(&request, &status); @@ -200,7 +200,7 @@ int main(int argc, char **argv) for (i = 0; i < SIZE; i++) buf[i] = -1; - MPI_File_iread_at_all(fh, 0, buf, SIZE, MPI_INT, &request); + MPIX_File_iread_at_all(fh, 0, buf, SIZE, MPI_INT, &request); MPI_Wait(&request, &status); for (i = 0; i < SIZE; i++) { diff --git a/test/mpi/io/i_noncontig_coll2.c b/test/mpi/io/i_noncontig_coll2.c index 3b97f24..83d8ab8 100644 --- a/test/mpi/io/i_noncontig_coll2.c +++ b/test/mpi/io/i_noncontig_coll2.c @@ -402,9 +402,9 @@ int test_file(char *filename, int mynod, int nprocs, char *cb_hosts, MPI_File_set_view(fh, 0, MPI_INT, newtype, "native", info); for (i = 0; i < SIZE; i++) buf[i] = SEEDER(mynod, i, SIZE); - errcode = MPI_File_iwrite_all(fh, buf, 1, newtype, &request); + errcode = MPIX_File_iwrite_all(fh, buf, 1, newtype, &request); if (errcode != MPI_SUCCESS) { - handle_error(errcode, "nc mem - nc file: MPI_File_iwrite_all"); + handle_error(errcode, "nc mem - nc file: MPIX_File_iwrite_all"); } MPI_Barrier(MPI_COMM_WORLD); @@ -412,9 +412,9 @@ int test_file(char *filename, int mynod, int nprocs, char *cb_hosts, for (i = 0; i < SIZE; i++) buf[i] = -1; - errcode = MPI_File_iread_at_all(fh, 0, buf, 1, newtype, &request); + errcode = MPIX_File_iread_at_all(fh, 0, buf, 1, newtype, &request); if (errcode != MPI_SUCCESS) { - handle_error(errcode, "nc mem - nc file: MPI_File_iread_at_all"); + handle_error(errcode, "nc mem - nc file: MPIX_File_iread_at_all"); } MPI_Wait(&request, &status); @@ -467,10 +467,10 @@ int test_file(char *filename, int mynod, int nprocs, char *cb_hosts, info, &fh); for (i = 0; i < SIZE; i++) buf[i] = SEEDER(mynod, i, SIZE); - errcode = MPI_File_iwrite_at_all(fh, mynod * (SIZE / nprocs) * sizeof(int), + errcode = MPIX_File_iwrite_at_all(fh, mynod * (SIZE / nprocs) * sizeof(int), buf, 1, newtype, &request); if (errcode != MPI_SUCCESS) - handle_error(errcode, "nc mem - c file: MPI_File_iwrite_at_all"); + handle_error(errcode, "nc mem - c file: MPIX_File_iwrite_at_all"); MPI_Barrier(MPI_COMM_WORLD); MPI_Wait(&request, &status); @@ -478,10 +478,10 @@ int test_file(char *filename, int mynod, int nprocs, char *cb_hosts, for (i = 0; i < SIZE; i++) buf[i] = -1; - errcode = MPI_File_iread_at_all(fh, mynod * (SIZE / nprocs) * sizeof(int), + errcode = MPIX_File_iread_at_all(fh, mynod * (SIZE / nprocs) * sizeof(int), buf, 1, newtype, &request); if (errcode != MPI_SUCCESS) - handle_error(errcode, "nc mem - c file: MPI_File_iread_at_all"); + handle_error(errcode, "nc mem - c file: MPIX_File_iread_at_all"); MPI_Wait(&request, &status); /* just like as above */ @@ -527,18 +527,18 @@ int test_file(char *filename, int mynod, int nprocs, char *cb_hosts, for (i = 0; i < SIZE; i++) buf[i] = SEEDER(mynod, i, SIZE); - errcode = MPI_File_iwrite_all(fh, buf, SIZE, MPI_INT, &request); + errcode = MPIX_File_iwrite_all(fh, buf, SIZE, MPI_INT, &request); if (errcode != MPI_SUCCESS) - handle_error(errcode, "c mem - nc file: MPI_File_iwrite_all"); + handle_error(errcode, "c mem - nc file: MPIX_File_iwrite_all"); MPI_Barrier(MPI_COMM_WORLD); MPI_Wait(&request, &status); for (i = 0; i < SIZE; i++) buf[i] = -1; - errcode = MPI_File_iread_at_all(fh, 0, buf, SIZE, MPI_INT, &request); + errcode = MPIX_File_iread_at_all(fh, 0, buf, SIZE, MPI_INT, &request); if (errcode != MPI_SUCCESS) - handle_error(errcode, "c mem - nc file: MPI_File_iread_at_all"); + handle_error(errcode, "c mem - nc file: MPIX_File_iread_at_all"); MPI_Wait(&request, &status); /* same crazy checking */ diff --git a/test/mpi/io/i_rdwrord.c b/test/mpi/io/i_rdwrord.c index eed3f7b..ca4d625 100644 --- a/test/mpi/io/i_rdwrord.c +++ b/test/mpi/io/i_rdwrord.c @@ -42,7 +42,7 @@ int main(int argc, char *argv[]) /* Set the individual pointer to 0, since we want to use a iread_all */ MPI_File_seek(fh, 0, MPI_SEEK_SET); - rc = MPI_File_iread_all(fh, buf, size, MPI_INT, &request); + rc = MPIX_File_iread_all(fh, buf, size, MPI_INT, &request); if (rc != MPI_SUCCESS) { MTestPrintErrorMsg("File_iread_all", rc); errs++; diff --git a/test/mpi/io/i_setviewcur.c b/test/mpi/io/i_setviewcur.c index 61e1558..c696628 100644 --- a/test/mpi/io/i_setviewcur.c +++ b/test/mpi/io/i_setviewcur.c @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) MPI_Comm_rank(comm, &rank); buf = (int *) malloc(size * sizeof(int)); buf[0] = size; - err = MPI_File_iwrite_all(fh, buf, 1, MPI_INT, &request); + err = MPIX_File_iwrite_all(fh, buf, 1, MPI_INT, &request); if (err) { errs++; MTestPrintErrorMsg("Iwrite_all", err); diff --git a/test/mpi/io/i_types_with_zeros.c b/test/mpi/io/i_types_with_zeros.c index d18b065..3f32030 100644 --- a/test/mpi/io/i_types_with_zeros.c +++ b/test/mpi/io/i_types_with_zeros.c @@ -100,8 +100,8 @@ static int test_indexed_with_zeros(char *filename, int testcase) if (err != MPI_SUCCESS) handle_error(err, "MPI_File_open"); err = MPI_File_set_view(fh, 0, MPI_INT, filetype, "native", MPI_INFO_NULL); if (err != MPI_SUCCESS) handle_error(err, "MPI_File_set_view"); - err = MPI_File_iwrite_all(fh, buf, buflen, MPI_INT, &request); - if (err != MPI_SUCCESS) handle_error(err, "MPI_File_iwrite_all"); + err = MPIX_File_iwrite_all(fh, buf, buflen, MPI_INT, &request); + if (err != MPI_SUCCESS) handle_error(err, "MPIX_File_iwrite_all"); err = MPI_Wait(&request, &status); if (err != MPI_SUCCESS) handle_error(err, "MPI_Wait"); MPI_Type_free(&filetype); diff --git a/test/mpi/io/testlist.in b/test/mpi/io/testlist.in index 28ae25b..89ccf48 100644 --- a/test/mpi/io/testlist.in +++ b/test/mpi/io/testlist.in @@ -11,15 +11,15 @@ resized 1 resized2 1 xfail=ticket2088 bigtype 1 hindexed_io 1 -i_bigtype 1 -i_hindexed_io 1 -i_rdwrord 4 -i_setviewcur 4 -i_aggregation1 4 -i_aggregation2 4 -i_coll_test 4 -i_darray_read 4 -i_hindexed 4 -i_noncontig_coll 2 -i_noncontig_coll2 4 -i_types_with_zeros 2 +@mpix@ i_bigtype 1 +@mpix@ i_hindexed_io 1 +@mpix@ i_rdwrord 4 +@mpix@ i_setviewcur 4 +@mpix@ i_aggregation1 4 +@mpix@ i_aggregation2 4 +@mpix@ i_coll_test 4 +@mpix@ i_darray_read 4 +@mpix@ i_hindexed 4 +@mpix@ i_noncontig_coll 2 +@mpix@ i_noncontig_coll2 4 +@mpix@ i_types_with_zeros 2 http://git.mpich.org/mpich.git/commitdiff/87dfd9768c545efdee25abf2d19740563… commit 87dfd9768c545efdee25abf2d19740563d4e61c6 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Wed Mar 4 10:34:36 2015 -0600 Revert "Enable MPI 3.1 MPI_Aint address arithmetic functs." This reverts commit c2ea6afcc5989b0810538fe92ae62c4afb022f32. Signed-off-by: Wesley Bland <wbland(a)anl.gov> diff --git a/src/binding/fortran/mpif_h/buildiface b/src/binding/fortran/mpif_h/buildiface index 180e3a7..ba75a71 100755 --- a/src/binding/fortran/mpif_h/buildiface +++ b/src/binding/fortran/mpif_h/buildiface @@ -4345,27 +4345,27 @@ sub build_specials { } $returnType = "void"; - # MPI_Aint_add/diff do not have the ierror argument. + # MPIX_Aint_add/diff do not have the ierror argument. $OUTFD = "AINTADD"; $filename = "aint_addf.c"; open( $OUTFD, ">$filename.new" ) || die "Cannot open $filename.new\n"; $files[$#files+1] = $filename; $returnType = "MPI_Aint"; - &set_weak_decl( "MPI_Aint_add", "MPI_Aint *, MPI_Aint *", "MPI_Aint" ); - &set_weak_decl( "PMPI_Aint_add", "MPI_Aint *, MPI_Aint *", "MPI_Aint" ); - &print_header( "mpi_", "MPI_Aint_add", "aint_add", "MPI_Aint *, MPI_Aint *"); - &print_routine_type_decl( $OUTFD, "mpi_", "aint_add" ); + &set_weak_decl( "MPIX_Aint_add", "MPI_Aint *, MPI_Aint *", "MPI_Aint" ); + &set_weak_decl( "PMPIX_Aint_add", "MPI_Aint *, MPI_Aint *", "MPI_Aint" ); + &print_header( "mpix_", "MPIX_Aint_add", "aint_add", "MPI_Aint *, MPI_Aint *"); + &print_routine_type_decl( $OUTFD, "mpix_", "aint_add" ); print $OUTFD "(MPI_Aint *base, MPI_Aint *disp)\n"; print $OUTFD "{\n"; - print $OUTFD " return MPI_Aint_add(*base, *disp);\n"; + print $OUTFD " return MPIX_Aint_add(*base, *disp);\n"; print $OUTFD "}\n"; close ($OUTFD); &ReplaceIfDifferent( $filename, $filename . ".new" ); if ($build_prototypes) { print PROTOFD "extern "; - &print_routine_type_decl( PROTOFD, "mpi_", "aint_add" ); + &print_routine_type_decl( PROTOFD, "mpix_", "aint_add" ); print PROTOFD "( MPI_Aint *, MPI_Aint * )"; - &print_attr( PROTOFD, "mpi_"."aint_add_" ); + &print_attr( PROTOFD, "mpix_"."aint_add_" ); print PROTOFD ";\n"; } $returnType = "void"; @@ -4375,21 +4375,21 @@ sub build_specials { open( $OUTFD, ">$filename.new" ) || die "Cannot open $filename.new\n"; $files[$#files+1] = $filename; $returnType = "MPI_Aint"; - &set_weak_decl( "MPI_Aint_diff", "MPI_Aint *, MPI_Aint *", "MPI_Aint" ); - &set_weak_decl( "PMPI_Aint_diff", "MPI_Aint *, MPI_Aint *", "MPI_Aint" ); - &print_header( "mpi_", "MPI_Aint_diff", "aint_diff", "MPI_Aint *, MPI_Aint *"); - &print_routine_type_decl( $OUTFD, "mpi_", "aint_diff" ); + &set_weak_decl( "MPIX_Aint_diff", "MPI_Aint *, MPI_Aint *", "MPI_Aint" ); + &set_weak_decl( "PMPIX_Aint_diff", "MPI_Aint *, MPI_Aint *", "MPI_Aint" ); + &print_header( "mpix_", "MPIX_Aint_diff", "aint_diff", "MPI_Aint *, MPI_Aint *"); + &print_routine_type_decl( $OUTFD, "mpix_", "aint_diff" ); print $OUTFD "(MPI_Aint *addr1, MPI_Aint *addr2)\n"; print $OUTFD "{\n"; - print $OUTFD " return MPI_Aint_diff(*addr1, *addr2);\n"; + print $OUTFD " return MPIX_Aint_diff(*addr1, *addr2);\n"; print $OUTFD "}\n"; close ($OUTFD); &ReplaceIfDifferent( $filename, $filename . ".new" ); if ($build_prototypes) { print PROTOFD "extern "; - &print_routine_type_decl( PROTOFD, "mpi_", "aint_diff" ); + &print_routine_type_decl( PROTOFD, "mpix_", "aint_diff" ); print PROTOFD "( MPI_Aint *, MPI_Aint * )"; - &print_attr( PROTOFD, "mpi_"."aint_diff_" ); + &print_attr( PROTOFD, "mpix_"."aint_diff_" ); print PROTOFD ";\n"; } $returnType = "void"; diff --git a/src/binding/fortran/use_mpi_f08/mpi_c_interface_nobuf.F90 b/src/binding/fortran/use_mpi_f08/mpi_c_interface_nobuf.F90 index 41ec748..38bfaf5 100644 --- a/src/binding/fortran/use_mpi_f08/mpi_c_interface_nobuf.F90 +++ b/src/binding/fortran/use_mpi_f08/mpi_c_interface_nobuf.F90 @@ -2524,7 +2524,7 @@ function MPIR_Comm_spawn_multiple_c(count, array_of_commands, array_of_argv, arr end function MPIR_Comm_spawn_multiple_c function MPIR_Aint_add_c(base, disp) & - bind(C, name="PMPI_Aint_add") result(res) + bind(C, name="PMPIX_Aint_add") result(res) use :: mpi_f08_compile_constants, only : MPI_ADDRESS_KIND implicit none integer(MPI_ADDRESS_KIND), value, intent(in) :: base, disp @@ -2532,7 +2532,7 @@ function MPIR_Aint_add_c(base, disp) & end function MPIR_Aint_add_c function MPIR_Aint_diff_c(addr1, addr2) & - bind(C, name="PMPI_Aint_diff") result(res) + bind(C, name="PMPIX_Aint_diff") result(res) use :: mpi_f08_compile_constants, only : MPI_ADDRESS_KIND implicit none integer(MPI_ADDRESS_KIND), value, intent(in) :: addr1, addr2 diff --git a/src/binding/fortran/use_mpi_f08/mpi_f08.F90 b/src/binding/fortran/use_mpi_f08/mpi_f08.F90 index 338d0ce..ccde0e9 100644 --- a/src/binding/fortran/use_mpi_f08/mpi_f08.F90 +++ b/src/binding/fortran/use_mpi_f08/mpi_f08.F90 @@ -4103,23 +4103,23 @@ interface MPI_Wtime end function MPI_Wtime_f08 end interface MPI_Wtime -interface MPI_Aint_add - function MPI_Aint_add_f08(base, disp) result(res) +interface MPIX_Aint_add + function MPIX_Aint_add_f08(base, disp) result(res) use :: mpi_f08_compile_constants, only : MPI_ADDRESS_KIND implicit none integer(MPI_ADDRESS_KIND), intent(in) :: base, disp integer(MPI_ADDRESS_KIND) :: res - end function MPI_Aint_add_f08 -end interface MPI_Aint_add + end function MPIX_Aint_add_f08 +end interface MPIX_Aint_add -interface MPI_Aint_diff - function MPI_Aint_diff_f08(addr1, addr2) result(res) +interface MPIX_Aint_diff + function MPIX_Aint_diff_f08(addr1, addr2) result(res) use :: mpi_f08_compile_constants, only : MPI_ADDRESS_KIND implicit none integer(MPI_ADDRESS_KIND), intent(in) :: addr1, addr2 integer(MPI_ADDRESS_KIND) :: res - end function MPI_Aint_diff_f08 -end interface MPI_Aint_diff + end function MPIX_Aint_diff_f08 +end interface MPIX_Aint_diff interface MPI_File_iread_all subroutine MPI_File_iread_all_f08ts(fh, buf, count, datatype, request, ierror) diff --git a/src/binding/fortran/use_mpi_f08/wrappers_f/aint_add_f08ts.F90 b/src/binding/fortran/use_mpi_f08/wrappers_f/aint_add_f08ts.F90 index ade7aca..cf6ef8f 100644 --- a/src/binding/fortran/use_mpi_f08/wrappers_f/aint_add_f08ts.F90 +++ b/src/binding/fortran/use_mpi_f08/wrappers_f/aint_add_f08ts.F90 @@ -3,7 +3,7 @@ ! (C) 2014 by Argonne National Laboratory. ! See COPYRIGHT in top-level directory. ! -function MPI_Aint_add_f08(base, disp) result(res) +function MPIX_Aint_add_f08(base, disp) result(res) use :: mpi_f08_compile_constants, only : MPI_ADDRESS_KIND use :: mpi_c_interface_nobuf, only : MPIR_Aint_add_c implicit none @@ -11,4 +11,4 @@ function MPI_Aint_add_f08(base, disp) result(res) integer(MPI_ADDRESS_KIND) :: res res = MPIR_Aint_add_c(base, disp) -end function MPI_Aint_add_f08 \ No newline at end of file +end function MPIX_Aint_add_f08 \ No newline at end of file diff --git a/src/binding/fortran/use_mpi_f08/wrappers_f/aint_diff_f08ts.F90 b/src/binding/fortran/use_mpi_f08/wrappers_f/aint_diff_f08ts.F90 index a58ccee..7c20dec 100644 --- a/src/binding/fortran/use_mpi_f08/wrappers_f/aint_diff_f08ts.F90 +++ b/src/binding/fortran/use_mpi_f08/wrappers_f/aint_diff_f08ts.F90 @@ -3,7 +3,7 @@ ! (C) 2014 by Argonne National Laboratory. ! See COPYRIGHT in top-level directory. ! -function MPI_Aint_diff_f08(addr1, addr2) result(res) +function MPIX_Aint_diff_f08(addr1, addr2) result(res) use :: mpi_f08_compile_constants, only : MPI_ADDRESS_KIND use :: mpi_c_interface_nobuf, only : MPIR_Aint_diff_c implicit none @@ -11,4 +11,4 @@ function MPI_Aint_diff_f08(addr1, addr2) result(res) integer(MPI_ADDRESS_KIND) :: res res = MPIR_Aint_diff_c(addr1, addr2) -end function MPI_Aint_diff_f08 +end function MPIX_Aint_diff_f08 diff --git a/src/include/mpi.h.in b/src/include/mpi.h.in index 0987a84..c78ae17 100644 --- a/src/include/mpi.h.in +++ b/src/include/mpi.h.in @@ -1547,8 +1547,8 @@ int MPIX_Comm_shrink(MPI_Comm comm, MPI_Comm *newcomm); int MPIX_Comm_agree(MPI_Comm comm, int *flag); /* MPI_Aint addressing arithmetic */ -MPI_Aint MPI_Aint_add(MPI_Aint base, MPI_Aint disp); -MPI_Aint MPI_Aint_diff(MPI_Aint addr1, MPI_Aint addr2); +MPI_Aint MPIX_Aint_add(MPI_Aint base, MPI_Aint disp); +MPI_Aint MPIX_Aint_diff(MPI_Aint addr1, MPI_Aint addr2); /* End Prototypes */ #endif /* MPICH_SUPPRESS_PROTOTYPES */ @@ -2193,8 +2193,8 @@ int PMPIX_Comm_shrink(MPI_Comm comm, MPI_Comm *newcomm); int PMPIX_Comm_agree(MPI_Comm comm, int *flag); /* MPI_Aint addressing arithmetic */ -MPI_Aint PMPI_Aint_add(MPI_Aint base, MPI_Aint disp); -MPI_Aint PMPI_Aint_diff(MPI_Aint addr1, MPI_Aint addr2); +MPI_Aint PMPIX_Aint_add(MPI_Aint base, MPI_Aint disp); +MPI_Aint PMPIX_Aint_diff(MPI_Aint addr1, MPI_Aint addr2); #endif /* MPI_BUILD_PROFILING */ /* End of MPI bindings */ diff --git a/src/mpi/misc/aint_add.c b/src/mpi/misc/aint_add.c index 8d42c19..bcc8c82 100644 --- a/src/mpi/misc/aint_add.c +++ b/src/mpi/misc/aint_add.c @@ -7,31 +7,31 @@ #include "mpiimpl.h" -/* -- Begin Profiling Symbol Block for routine MPI_Aint_add */ +/* -- Begin Profiling Symbol Block for routine MPIX_Aint_add */ #if defined(HAVE_PRAGMA_WEAK) -#pragma weak MPI_Aint_add = PMPI_Aint_add +#pragma weak MPIX_Aint_add = PMPIX_Aint_add #elif defined(HAVE_PRAGMA_HP_SEC_DEF) -#pragma _HP_SECONDARY_DEF PMPI_Aint_add MPI_Aint_add +#pragma _HP_SECONDARY_DEF PMPIX_Aint_add MPIX_Aint_add #elif defined(HAVE_PRAGMA_CRI_DUP) -#pragma _CRI duplicate MPI_Aint_add as PMPI_Aint_add +#pragma _CRI duplicate MPIX_Aint_add as PMPIX_Aint_add #elif defined(HAVE_WEAK_ATTRIBUTE) -MPI_Aint MPI_Aint_add(MPI_Aint base, MPI_Aint disp) __attribute__((weak,alias("PMPI_Aint_add"))); +MPI_Aint MPIX_Aint_add(MPI_Aint base, MPI_Aint disp) __attribute__((weak,alias("PMPIX_Aint_add"))); #endif /* -- End Profiling Symbol Block */ /* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build the MPI routines */ #ifndef MPICH_MPI_FROM_PMPI -#undef MPI_Aint_add -#define MPI_Aint_add PMPI_Aint_add +#undef MPIX_Aint_add +#define MPIX_Aint_add PMPIX_Aint_add #endif #undef FUNCNAME -#define FUNCNAME MPI_Aint_add +#define FUNCNAME MPIX_Aint_add /*@ -MPI_Aint_add - Returns the sum of base and disp +MPIX_Aint_add - Returns the sum of base and disp Input Parameters: + base - base address (integer) @@ -50,19 +50,19 @@ a manner that results in the correct MPI_Aint representation of the output addre as if the process that originally produced base had called: MPI_Get_address((char *) base + disp, &result) -.seealso: MPI_Aint_diff +.seealso: MPIX_Aint_diff @*/ -MPI_Aint MPI_Aint_add(MPI_Aint base, MPI_Aint disp) +MPI_Aint MPIX_Aint_add(MPI_Aint base, MPI_Aint disp) { MPI_Aint result; - MPID_MPI_STATE_DECL(MPID_STATE_MPI_AINT_ADD); + MPID_MPI_STATE_DECL(MPID_STATE_MPIX_AINT_ADD); MPIR_ERRTEST_INITIALIZED_ORDIE(); - MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_AINT_ADD); + MPID_MPI_FUNC_ENTER(MPID_STATE_MPIX_AINT_ADD); result = MPID_Aint_add(base, disp); - MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_AINT_ADD); + MPID_MPI_FUNC_EXIT(MPID_STATE_MPIX_AINT_ADD); return result; } diff --git a/src/mpi/misc/aint_diff.c b/src/mpi/misc/aint_diff.c index 61147e4..5c2e5cd 100644 --- a/src/mpi/misc/aint_diff.c +++ b/src/mpi/misc/aint_diff.c @@ -7,31 +7,31 @@ #include "mpiimpl.h" -/* -- Begin Profiling Symbol Block for routine MPI_Aint_diff */ +/* -- Begin Profiling Symbol Block for routine MPIX_Aint_diff */ #if defined(HAVE_PRAGMA_WEAK) -#pragma weak MPI_Aint_diff = PMPI_Aint_diff +#pragma weak MPIX_Aint_diff = PMPIX_Aint_diff #elif defined(HAVE_PRAGMA_HP_SEC_DEF) -#pragma _HP_SECONDARY_DEF PMPI_Aint_diff MPI_Aint_diff +#pragma _HP_SECONDARY_DEF PMPIX_Aint_diff MPIX_Aint_diff #elif defined(HAVE_PRAGMA_CRI_DUP) -#pragma _CRI duplicate MPI_Aint_diff as PMPI_Aint_diff +#pragma _CRI duplicate MPIX_Aint_diff as PMPIX_Aint_diff #elif defined(HAVE_WEAK_ATTRIBUTE) -MPI_Aint MPI_Aint_diff(MPI_Aint addr1, MPI_Aint addr2) __attribute__((weak,alias("PMPI_Aint_diff"))); +MPI_Aint MPIX_Aint_diff(MPI_Aint addr1, MPI_Aint addr2) __attribute__((weak,alias("PMPIX_Aint_diff"))); #endif /* -- End Profiling Symbol Block */ /* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build the MPI routines */ #ifndef MPICH_MPI_FROM_PMPI -#undef MPI_Aint_diff -#define MPI_Aint_diff PMPI_Aint_diff +#undef MPIX_Aint_diff +#define MPIX_Aint_diff PMPIX_Aint_diff #endif #undef FUNCNAME -#define FUNCNAME MPI_Aint_diff +#define FUNCNAME MPIX_Aint_diff /*@ -MPI_Aint_diff - Returns the difference between addr1 and addr2 +MPIX_Aint_diff - Returns the difference between addr1 and addr2 Input Parameters: + addr1 - minuend address (integer) @@ -41,7 +41,7 @@ Return value: Difference between addr1 and addr2 Notes: -MPI_Aint_diff produces a new MPI_Aint value that is equivalent to the difference +MPIX_Aint_diff produces a new MPI_Aint value that is equivalent to the difference between addr1 and addr2 arguments, where addr1 and addr2 represent addresses returned by calls to MPI_GET_ADDRESS. The resulting address is valid only at the process that generated addr1 and addr2, and addr1 and addr2 must correspond to @@ -51,19 +51,19 @@ process that originally produced the addresses had called (char *) addr1 - (char *) addr2 on the addresses initially passed to MPI_GET_ADDRESS. -.seealso: MPI_Aint_add +.seealso: MPIX_Aint_add @*/ -MPI_Aint MPI_Aint_diff(MPI_Aint addr1, MPI_Aint addr2) +MPI_Aint MPIX_Aint_diff(MPI_Aint addr1, MPI_Aint addr2) { MPI_Aint result; - MPID_MPI_STATE_DECL(MPID_STATE_MPI_AINT_DIFF); + MPID_MPI_STATE_DECL(MPID_STATE_MPIX_AINT_DIFF); MPIR_ERRTEST_INITIALIZED_ORDIE(); - MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_AINT_DIFF); + MPID_MPI_FUNC_ENTER(MPID_STATE_MPIX_AINT_DIFF); result = MPID_Aint_diff(addr1, addr2); - MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_AINT_DIFF); + MPID_MPI_FUNC_EXIT(MPID_STATE_MPIX_AINT_DIFF); return result; } diff --git a/test/mpi/f08/rma/aintf08.f90 b/test/mpi/f08/rma/aintf08.f90 index cef75eb..96ddedd 100644 --- a/test/mpi/f08/rma/aintf08.f90 +++ b/test/mpi/f08/rma/aintf08.f90 @@ -52,10 +52,10 @@ program main ! Do MPI_Aint addressing arithmetic if (rank == 0) then disp = intsize*511 - offset = MPI_Aint_add(bases(1), disp) ! offset points to array(1023) + offset = MPIX_Aint_add(bases(1), disp) ! offset points to array(1023) else if (rank == 1) then disp = intsize*512 - offset = MPI_Aint_diff(bases(0), disp) ! offset points to array(0) + offset = MPIX_Aint_diff(bases(0), disp) ! offset points to array(0) endif ! Get value and verify it diff --git a/test/mpi/f08/rma/testlist.in b/test/mpi/f08/rma/testlist.in index a1f3d01..3ae2013 100644 --- a/test/mpi/f08/rma/testlist.in +++ b/test/mpi/f08/rma/testlist.in @@ -10,4 +10,4 @@ c2f2cwinf08 1 baseattrwinf08 1 winattrf08 1 winattr2f08 1 -aintf08 2 strict=false +@mpix@ aintf08 2 strict=false diff --git a/test/mpi/f77/rma/aintf.f b/test/mpi/f77/rma/aintf.f index 88739f6..f7d67df 100644 --- a/test/mpi/f77/rma/aintf.f +++ b/test/mpi/f77/rma/aintf.f @@ -21,8 +21,8 @@ integer :: win integer :: intsize - integer(kind=MPI_ADDRESS_KIND), external :: MPI_Aint_add - integer(kind=MPI_ADDRESS_KIND), external :: MPI_Aint_diff + integer(kind=MPI_ADDRESS_KIND), external :: MPIX_Aint_add + integer(kind=MPI_ADDRESS_KIND), external :: MPIX_Aint_diff errs = 0 call mtest_init(ierr); @@ -60,10 +60,10 @@ ! Do MPI_Aint addressing arithmetic if (rank == 0) then disp = intsize*511 - offset = MPI_Aint_add(bases(1), disp) + offset = MPIX_Aint_add(bases(1), disp) else if (rank == 1) then disp = intsize*512 - offset = MPI_Aint_diff(bases(0), disp) + offset = MPIX_Aint_diff(bases(0), disp) endif ! Get value and verify it diff --git a/test/mpi/f77/rma/testlist.in b/test/mpi/f77/rma/testlist.in index 20112b8..4884257 100644 --- a/test/mpi/f77/rma/testlist.in +++ b/test/mpi/f77/rma/testlist.in @@ -10,4 +10,4 @@ c2f2cwinf 1 baseattrwinf 1 winattrf 1 winattr2f 1 -aintf 2 strict=false xfail=ticket1877 +@mpix@ aintf 2 strict=false xfail=ticket1877 diff --git a/test/mpi/rma/aint.c b/test/mpi/rma/aint.c index 888ecb4..9eba621 100644 --- a/test/mpi/rma/aint.c +++ b/test/mpi/rma/aint.c @@ -55,10 +55,10 @@ int main(int argc, char **argv) /* Do MPI_Aint addressing arithmetic */ if (rank == 0) { disp = sizeof(int)*511; - offset = MPI_Aint_add(bases[1], disp); /* offset points to array[1023]*/ + offset = MPIX_Aint_add(bases[1], disp); /* offset points to array[1023]*/ } else if (rank == 1) { disp = sizeof(int)*512; - offset = MPI_Aint_diff(bases[0], disp); /* offset points to array[0] */ + offset = MPIX_Aint_diff(bases[0], disp); /* offset points to array[0] */ } /* Get val and verify it */ diff --git a/test/mpi/rma/testlist.in b/test/mpi/rma/testlist.in index a836908..f9c3f9b 100644 --- a/test/mpi/rma/testlist.in +++ b/test/mpi/rma/testlist.in @@ -131,7 +131,7 @@ at_complete 2 atomic_rmw_fop 3 atomic_rmw_cas 3 atomic_rmw_gacc 3 -aint 2 strict=false +@mpix@ aint 2 strict=false acc-pairtype 2 ## This test is not strictly correct. This was meant to test out the http://git.mpich.org/mpich.git/commitdiff/0e4b9427a6d204ee958ccd1889c5f7740… commit 0e4b9427a6d204ee958ccd1889c5f774099e95c1 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Wed Mar 4 10:31:54 2015 -0600 Revert "Changed MPI_SUBVERSION to 1" This reverts commit 38df8d2a831b4fb87dfa016a2c0f896cf6ab31e1. Signed-off-by: Wesley Bland <wbland(a)anl.gov> diff --git a/src/include/mpi.h.in b/src/include/mpi.h.in index 9e0390f..0987a84 100644 --- a/src/include/mpi.h.in +++ b/src/include/mpi.h.in @@ -453,7 +453,7 @@ typedef int (MPI_Copy_function) ( MPI_Comm, int, void *, void *, void *, int * ) typedef int (MPI_Delete_function) ( MPI_Comm, int, void *, void * ); #define MPI_VERSION 3 -#define MPI_SUBVERSION 1 +#define MPI_SUBVERSION 0 #define MPICH_NAME 3 #define MPICH 1 #define MPICH_HAS_C2F 1 ----------------------------------------------------------------------- Summary of changes: CHANGES | 12 +++-- src/binding/fortran/mpif_h/buildiface | 30 ++++++------ .../fortran/use_mpi_f08/mpi_c_interface_nobuf.F90 | 4 +- src/binding/fortran/use_mpi_f08/mpi_f08.F90 | 48 ++++++++++---------- .../fortran/use_mpi_f08/wrappers_c/buildiface | 8 ++-- .../use_mpi_f08/wrappers_f/aint_add_f08ts.F90 | 4 +- .../use_mpi_f08/wrappers_f/aint_diff_f08ts.F90 | 4 +- .../wrappers_f/file_iread_all_f08ts.F90 | 4 +- .../wrappers_f/file_iread_at_all_f08ts.F90 | 4 +- .../wrappers_f/file_iwrite_all_f08ts.F90 | 4 +- .../wrappers_f/file_iwrite_at_all_f08ts.F90 | 4 +- src/include/mpi.h.in | 10 ++-- src/mpi/misc/aint_add.c | 28 ++++++------ src/mpi/misc/aint_diff.c | 30 ++++++------ src/mpi/romio/include/mpio.h.in | 16 +++--- src/mpi/romio/mpi-io/iread_all.c | 18 ++++---- src/mpi/romio/mpi-io/iread_atall.c | 16 +++--- src/mpi/romio/mpi-io/iwrite_all.c | 18 ++++---- src/mpi/romio/mpi-io/iwrite_atall.c | 16 +++--- src/mpi/romio/mpi-io/mpioprof.h | 16 +++--- test/mpi/f08/io/i_fcoll_test.f90 | 4 +- test/mpi/f08/io/ioharness.defn | 4 +- test/mpi/f08/io/testlist.in | 4 +- test/mpi/f08/rma/aintf08.f90 | 4 +- test/mpi/f08/rma/testlist.in | 2 +- test/mpi/f77/io/i_setviewcurf.f | 2 +- test/mpi/f77/io/ioharness.defn | 4 +- test/mpi/f77/io/testlist.in | 4 +- test/mpi/f77/rma/aintf.f | 8 ++-- test/mpi/f77/rma/testlist.in | 2 +- test/mpi/io/i_aggregation1.c | 4 +- test/mpi/io/i_aggregation2.c | 8 ++-- test/mpi/io/i_bigtype.c | 4 +- test/mpi/io/i_coll_test.c | 8 ++-- test/mpi/io/i_darray_read.c | 2 +- test/mpi/io/i_hindexed.c | 2 +- test/mpi/io/i_hindexed_io.c | 4 +- test/mpi/io/i_noncontig_coll.c | 12 +++--- test/mpi/io/i_noncontig_coll2.c | 24 +++++----- test/mpi/io/i_rdwrord.c | 2 +- test/mpi/io/i_setviewcur.c | 2 +- test/mpi/io/i_types_with_zeros.c | 4 +- test/mpi/io/testlist.in | 24 +++++----- test/mpi/rma/aint.c | 4 +- test/mpi/rma/testlist.in | 2 +- 45 files changed, 221 insertions(+), 217 deletions(-) hooks/post-receive -- MPICH primary repository

1 0