November 2013 - commits - mailman3.cels.anl.gov

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-11-gea66029
by noreply＠mpich.org 11 Nov '13

11 Nov '13

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 ea66029303a939a907537013b811f7e99bf45ad1 (commit) from 6442aa7b82322906126b5b7c12b6481eeb4a0ae7 (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/ea66029303a939a907537013b811f7e99… commit ea66029303a939a907537013b811f7e99bf45ad1 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Wed Nov 6 15:43:51 2013 -0600 addtional tests for FT collectives Test collectives where all processes do not contribute to the result. These tests use the MPI_Comm_group_create function to create a new communicator excluding the failed process in order to do error collection. Closes #1901 Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/test/mpi/ft/Makefile.am b/test/mpi/ft/Makefile.am index 4b70c96..b01f80a 100644 --- a/test/mpi/ft/Makefile.am +++ b/test/mpi/ft/Makefile.am @@ -10,4 +10,4 @@ include $(top_srcdir)/Makefile.mtest ## 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 = die abort sendalive isendalive senddead recvdead isenddead irecvdead barrier gather reduce +noinst_PROGRAMS = die abort sendalive isendalive senddead recvdead isenddead irecvdead barrier gather reduce bcast scatter diff --git a/test/mpi/ft/bcast.c b/test/mpi/ft/bcast.c new file mode 100644 index 0000000..0bdae30 --- /dev/null +++ b/test/mpi/ft/bcast.c @@ -0,0 +1,91 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2003 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ +#include "mpi.h" +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include "mpitest.h" + +/* + * This test attempts collective bcast communication after a process in + * the communicator has failed. + */ +int main(int argc, char **argv) +{ + int rank, size, rc, errclass, toterrs, errs = 0; + int deadprocs[] = {1}; + char buf[100000]; + MPI_Group world, newgroup; + MPI_Comm newcomm; + + MPI_Init(&argc, &argv); + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + MPI_Comm_size(MPI_COMM_WORLD, &size); + MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN); + + if (size < 3) { + fprintf( stderr, "Must run with at least 3 processes\n" ); + MPI_Abort( MPI_COMM_WORLD, 1 ); + } + + if (rank == 1) { + exit(EXIT_FAILURE); + } + + if (rank == 0) { + strcpy(buf, "No Errors"); + } + + /* do a small bcast first */ + rc = MPI_Bcast(buf, 10, MPI_CHAR, 0, MPI_COMM_WORLD); + +#if defined (MPICH) && (MPICH_NUMVERSION >= 30100102) + MPI_Error_class(rc, &errclass); + if ((rc) && (errclass != MPIX_ERR_PROC_FAIL_STOP)) { + fprintf(stderr, "Wrong error code (%d) returned. Expected MPIX_ERR_PROC_FAIL_STOP\n", errclass); + errs++; + } +#endif + + /* reset the non-root buffers */ + if (rank != 0) + memset(buf, 0, sizeof(buf)); + + /* do a larger bcast */ + rc = MPI_Bcast(buf, 100000, MPI_CHAR, 0, MPI_COMM_WORLD); + +#if defined (MPICH) && (MPICH_NUMVERSION >= 30100102) + MPI_Error_class(rc, &errclass); + if ((rc) && (errclass != MPIX_ERR_PROC_FAIL_STOP)) { + fprintf(stderr, "Wrong error code (%d) returned. Expected MPIX_ERR_PROC_FAIL_STOP\n", errclass); + errs++; + } +#endif + + MPI_Comm_group(MPI_COMM_WORLD, &world); + MPI_Group_excl(world, 1, deadprocs, &newgroup); + MPI_Comm_create_group(MPI_COMM_WORLD, newgroup, 0, &newcomm); + + rc = MPI_Reduce(&errs, &toterrs, 1, MPI_INT, MPI_SUM, 0, newcomm); + if(rc) + fprintf(stderr, "Failed to get errors from other processes\n"); + + if (rank == 0) { + if (toterrs) { + printf( " Found %d errors\n", toterrs ); + } + else { + printf( " No Errors\n" ); + } + fflush(stdout); + } + + MPI_Finalize(); + + return 0; + +} diff --git a/test/mpi/ft/scatter.c b/test/mpi/ft/scatter.c new file mode 100644 index 0000000..93f7b86 --- /dev/null +++ b/test/mpi/ft/scatter.c @@ -0,0 +1,102 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2003 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ +#include "mpi.h" +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +/* + * This test attempts collective communication after a process in + * the communicator has failed. + */ +int main(int argc, char **argv) +{ + int rank, size, i, rc, errclass, toterrs, errs = 0; + char rbuf[100000]; + char *sendbuf; + int deadprocs[1] = {1}; + MPI_Group world, newgroup; + MPI_Comm newcomm; + + MPI_Init(&argc, &argv); + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + MPI_Comm_size(MPI_COMM_WORLD, &size); + MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN); + + if (size < 3) { + fprintf( stderr, "Must run with at least 3 processes\n" ); + MPI_Abort( MPI_COMM_WORLD, 1 ); + } + + if (rank == 1) { + exit(EXIT_FAILURE); + } + + /* try a small send first */ + sendbuf = (char *)malloc(10*size*sizeof(char)); + + if (rank == 0) { + for (i=0;i<size;i++) { + strcpy(sendbuf + i*10, "No Errors"); + } + } + + rc = MPI_Scatter(sendbuf, 10, MPI_CHAR, rbuf, 10, MPI_CHAR, 0, MPI_COMM_WORLD); + +#if defined (MPICH) && (MPICH_NUMVERSION >= 30100102) + MPI_Error_class(rc, &errclass); + if ((rc) && (errclass != MPIX_ERR_PROC_FAIL_STOP)) { + fprintf(stderr, "Wrong error code (%d) returned. Expected MPIX_ERR_PROC_FAIL_STOP\n", errclass); + errs++; + } +#endif + + /* reset the buffers and try a larger scatter */ + free(sendbuf); + memset(rbuf, 0, sizeof(rbuf)); + sendbuf = (char *)malloc(100000*size*sizeof(char)); + + if (rank == 0) { + for (i=0;i<size;i++) { + strcpy(sendbuf + i*100000, "No Errors"); + } + } + + rc = MPI_Scatter(sendbuf, 100000, MPI_CHAR, rbuf, 100000, MPI_CHAR, 0, MPI_COMM_WORLD); + +#if defined (MPICH) && (MPICH_NUMVERSION >= 30100102) + MPI_Error_class(rc, &errclass); + if ((rc) && (errclass != MPIX_ERR_PROC_FAIL_STOP)) { + fprintf(stderr, "Wrong error code (%d) returned. Expected MPIX_ERR_PROC_FAIL_STOP\n", errclass); + errs++; + } +#endif + + MPI_Comm_group(MPI_COMM_WORLD, &world); + MPI_Group_excl(world, 1, deadprocs, &newgroup); + MPI_Comm_create_group(MPI_COMM_WORLD, newgroup, 0, &newcomm); + + rc = MPI_Reduce(&errs, &toterrs, 1, MPI_INT, MPI_SUM, 0, newcomm); + if(rc) + fprintf(stderr, "Failed to get errors from other processes\n"); + + if (rank == 0) { + if (toterrs) { + printf( " Found %d errors\n", toterrs ); + } + else { + printf( " No Errors\n" ); + } + fflush(stdout); + } + + free(sendbuf); + + MPI_Finalize(); + + return 0; +} diff --git a/test/mpi/ft/testlist b/test/mpi/ft/testlist index 3bb71a0..8c00b02 100644 --- a/test/mpi/ft/testlist +++ b/test/mpi/ft/testlist @@ -9,3 +9,5 @@ irecvdead 2 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors stric barrier 4 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945 gather 4 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945 reduce 4 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945 +bcast 4 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945 +scatter 4 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945 ----------------------------------------------------------------------- Summary of changes: test/mpi/ft/Makefile.am | 2 +- test/mpi/ft/bcast.c | 91 +++++++++++++++++++++++++++++++++++++++++ test/mpi/ft/scatter.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++ test/mpi/ft/testlist | 2 + 4 files changed, 196 insertions(+), 1 deletions(-) create mode 100644 test/mpi/ft/bcast.c create mode 100644 test/mpi/ft/scatter.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-10-g6442aa7
by noreply＠mpich.org 11 Nov '13

11 Nov '13

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 6442aa7b82322906126b5b7c12b6481eeb4a0ae7 (commit) from b6d4dde351ff286bbe1e4f059d06654694c4b526 (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/6442aa7b82322906126b5b7c12b6481ee… commit 6442aa7b82322906126b5b7c12b6481eeb4a0ae7 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Thu Nov 7 18:54:33 2013 -0600 MPICH_INFODLL_LOC incorrectly formed in configure Fixes #1965 Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> diff --git a/configure.ac b/configure.ac index ea90595..044ce8f 100644 --- a/configure.ac +++ b/configure.ac @@ -2627,7 +2627,7 @@ on all link lines (consider adding it to LDFLAGS)]) eval SHLIB_EXT='"'$shrext_cmds'"' if test -z "$MPICH_DEBUGLIBNAME" ; then - DEBUGLIBNAME=libtvmpich.$SHLIB_EXT + DEBUGLIBNAME=libtvmpich$SHLIB_EXT else # FIXME DJG I don't think this can be supported arbitrarily by the new # build system (I'm not sure it was supported correctly by the old ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-9-gb6d4dde
by noreply＠mpich.org 08 Nov '13

08 Nov '13

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 b6d4dde351ff286bbe1e4f059d06654694c4b526 (commit) from b2ec3e57ba40a4208c2c0af75cb2f67690d8fad0 (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/b6d4dde351ff286bbe1e4f059d0665469… commit b6d4dde351ff286bbe1e4f059d06654694c4b526 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Fri Nov 8 16:25:54 2013 -0600 make MPIU_Assert more robust instead of assigning and then checking for overflow, check if the overflow will happen, and then assign. Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/src/include/mpiutil.h b/src/include/mpiutil.h index f2fbaf0..d6e764d 100644 --- a/src/include/mpiutil.h +++ b/src/include/mpiutil.h @@ -239,9 +239,9 @@ int MPIR_Assert_fail_fmt(const char *cond, const char *file_name, int line_num, #endif #define MPIU_Assign_trunc(dst_,src_,dst_type_) \ do { \ - dst_ = (dst_type_)(src_); \ /* will catch some of the cases if the expr_inttype macros aren't available */ \ - MPIU_Assert((dst_) == (src_)); \ + MPIU_Assert((src_) == (dst_type_)(src_)); \ + dst_ = (dst_type_)(src_); \ } while (0) /* ----------------------------------------------------------------------- Summary of changes: src/include/mpiutil.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-8-gb2ec3e5
by noreply＠mpich.org 08 Nov '13

08 Nov '13

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 b2ec3e57ba40a4208c2c0af75cb2f67690d8fad0 (commit) from 84000fccb620e79c00a33440c3484f7ffe0d3f58 (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/b2ec3e57ba40a4208c2c0af75cb2f6769… commit b2ec3e57ba40a4208c2c0af75cb2f67690d8fad0 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Fri Nov 8 14:25:36 2013 -0600 Fix win_dynamic_acc test for any number of ranks Fixes #1971 Signed-off-by: Xin Zhao <xinzhao3(a)illinois.edu> diff --git a/test/mpi/rma/win_dynamic_acc.c b/test/mpi/rma/win_dynamic_acc.c index ee9f725..2640edd 100644 --- a/test/mpi/rma/win_dynamic_acc.c +++ b/test/mpi/rma/win_dynamic_acc.c @@ -11,7 +11,7 @@ #include <mpi.h> #include "mpitest.h" -#define ITER 100 +#define ITER_PER_RANK 25 const int verbose = 0; @@ -19,6 +19,7 @@ int main(int argc, char **argv) { int i, j, rank, nproc; int errors = 0, all_errors = 0; int val = 0, one = 1; + int iter; MPI_Aint *val_ptrs; MPI_Win dyn_win; @@ -27,6 +28,8 @@ int main(int argc, char **argv) { MPI_Comm_rank(MPI_COMM_WORLD, &rank); MPI_Comm_size(MPI_COMM_WORLD, &nproc); + iter = ITER_PER_RANK * nproc; + val_ptrs = malloc(nproc * sizeof(MPI_Aint)); MPI_Get_address(&val, &val_ptrs[rank]); @@ -36,7 +39,7 @@ int main(int argc, char **argv) { MPI_Win_create_dynamic(MPI_INFO_NULL, MPI_COMM_WORLD, &dyn_win); MPI_Win_attach(dyn_win, &val, sizeof(int)); - for (i = 0; i < ITER; i++) { + for (i = 0; i < iter; i++) { MPI_Win_fence(MPI_MODE_NOPRECEDE, dyn_win); MPI_Accumulate(&one, 1, MPI_INT, i%nproc, val_ptrs[i%nproc], 1, MPI_INT, MPI_SUM, dyn_win); MPI_Win_fence(MPI_MODE_NOSUCCEED, dyn_win); @@ -45,9 +48,9 @@ int main(int argc, char **argv) { MPI_Barrier(MPI_COMM_WORLD); /* Read and verify my data */ - if ( val != ITER ) { + if ( val != iter ) { errors++; - printf("%d -- Got %d, expected %d\n", rank, val, ITER); + printf("%d -- Got %d, expected %d\n", rank, val, iter); } MPI_Win_detach(dyn_win, &val); ----------------------------------------------------------------------- Summary of changes: test/mpi/rma/win_dynamic_acc.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-7-g84000fc
by noreply＠mpich.org 07 Nov '13

07 Nov '13

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 84000fccb620e79c00a33440c3484f7ffe0d3f58 (commit) from a31d19c849957d6e400b58d7aca759e88b4ffd00 (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/84000fccb620e79c00a33440c3484f7ff… commit 84000fccb620e79c00a33440c3484f7ffe0d3f58 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Thu Nov 7 15:05:04 2013 -0600 ignore new test directory No reviewer diff --git a/test/mpi/.gitignore b/test/mpi/.gitignore index c4de65a..3474829 100644 --- a/test/mpi/.gitignore +++ b/test/mpi/.gitignore @@ -12,6 +12,7 @@ /errors/f90/errhan/Makefile.am /errors/f90/errhan/testlist /errors/f90/errhan/uerrhandf90.f90 +/errors/f90/io /errors/f77/errhan/addsize.h /errors/f77/errhan/iooffset.h /f90/coll/ ----------------------------------------------------------------------- Summary of changes: test/mpi/.gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-6-ga31d19c
by noreply＠mpich.org 07 Nov '13

07 Nov '13

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 a31d19c849957d6e400b58d7aca759e88b4ffd00 (commit) via 7d983392bf3fc8eda70f2cb96d1e8579afb0f301 (commit) from e61b9a5baa187922a06481a48833ac3d8ba7eb90 (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/a31d19c849957d6e400b58d7aca759e88… commit a31d19c849957d6e400b58d7aca759e88b4ffd00 Author: Huiwei Lu <huiweilu(a)mcs.anl.gov> Date: Tue Nov 5 13:31:01 2013 -0600 Fix #1920 - enhance the output format Changes singe long line function definitions to multiple lines Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/mpi/coll/iallgather.c b/src/mpi/coll/iallgather.c index 8f5a321..b526cdd 100644 --- a/src/mpi/coll/iallgather.c +++ b/src/mpi/coll/iallgather.c @@ -655,7 +655,9 @@ Output Parameters: .N Errors @*/ -int MPI_Iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request) +int MPI_Iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Comm *comm_ptr = NULL; diff --git a/src/mpi/coll/iallreduce.c b/src/mpi/coll/iallreduce.c index acd90be..8829c61 100644 --- a/src/mpi/coll/iallreduce.c +++ b/src/mpi/coll/iallreduce.c @@ -711,7 +711,9 @@ Output Parameters: .N Errors @*/ -int MPI_Iallreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request) +int MPI_Iallreduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, + MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Comm *comm_ptr = NULL; diff --git a/src/mpi/coll/ialltoall.c b/src/mpi/coll/ialltoall.c index fc1eeec..0e8e539 100644 --- a/src/mpi/coll/ialltoall.c +++ b/src/mpi/coll/ialltoall.c @@ -584,7 +584,9 @@ Output Parameters: .N Errors @*/ -int MPI_Ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request) +int MPI_Ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Comm *comm_ptr = NULL; diff --git a/src/mpi/coll/iexscan.c b/src/mpi/coll/iexscan.c index 53abce9..b5d1ae7 100644 --- a/src/mpi/coll/iexscan.c +++ b/src/mpi/coll/iexscan.c @@ -250,7 +250,8 @@ Output Parameters: .N Errors @*/ -int MPI_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request) +int MPI_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, + MPI_Op op, MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Comm *comm_ptr = NULL; diff --git a/src/mpi/coll/igather.c b/src/mpi/coll/igather.c index 8e3da9a..c1e43a4 100644 --- a/src/mpi/coll/igather.c +++ b/src/mpi/coll/igather.c @@ -580,7 +580,9 @@ Output Parameters: .N Errors @*/ -int MPI_Igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request *request) +int MPI_Igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Comm *comm_ptr = NULL; diff --git a/src/mpi/coll/ired_scat_block.c b/src/mpi/coll/ired_scat_block.c index 08aba15..b224b41 100644 --- a/src/mpi/coll/ired_scat_block.c +++ b/src/mpi/coll/ired_scat_block.c @@ -978,7 +978,10 @@ Output Parameters: .N Errors @*/ -int MPI_Ireduce_scatter_block(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request) +int MPI_Ireduce_scatter_block(const void *sendbuf, void *recvbuf, + int recvcount, + MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, + MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Comm *comm_ptr = NULL; diff --git a/src/mpi/coll/ireduce.c b/src/mpi/coll/ireduce.c index 6502537..feb9c31 100644 --- a/src/mpi/coll/ireduce.c +++ b/src/mpi/coll/ireduce.c @@ -829,7 +829,8 @@ Output Parameters: .N Errors @*/ -int MPI_Ireduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm, MPI_Request *request) +int MPI_Ireduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, + MPI_Op op, int root, MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Comm *comm_ptr = NULL; diff --git a/src/mpi/coll/iscan.c b/src/mpi/coll/iscan.c index 55449d7..7b0d286 100644 --- a/src/mpi/coll/iscan.c +++ b/src/mpi/coll/iscan.c @@ -384,7 +384,8 @@ Output Parameters: .N Errors @*/ -int MPI_Iscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request) +int MPI_Iscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, + MPI_Op op, MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Comm *comm_ptr = NULL; diff --git a/src/mpi/coll/iscatter.c b/src/mpi/coll/iscatter.c index 765de9a..7a6774e 100644 --- a/src/mpi/coll/iscatter.c +++ b/src/mpi/coll/iscatter.c @@ -614,7 +614,9 @@ Output Parameters: .N Errors @*/ -int MPI_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request *request) +int MPI_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, + MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Comm *comm_ptr = NULL; http://git.mpich.org/mpich.git/commitdiff/7d983392bf3fc8eda70f2cb96d1e8579a… commit 7d983392bf3fc8eda70f2cb96d1e8579afb0f301 Author: Huiwei Lu <huiweilu(a)mcs.anl.gov> Date: Tue Nov 5 09:34:16 2013 -0600 Fix #1920 - NBC Man Pages have no description Adds man pages for nonblocking collectives Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/mpi/coll/iallgather.c b/src/mpi/coll/iallgather.c index 4e7673b..8f5a321 100644 --- a/src/mpi/coll/iallgather.c +++ b/src/mpi/coll/iallgather.c @@ -634,7 +634,8 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_Iallgather - XXX description here +MPI_Iallgather - Gathers data from all tasks and distribute the combined data + to all tasks in a nonblocking way Input Parameters: + sendbuf - starting address of the send buffer (choice) diff --git a/src/mpi/coll/iallgatherv.c b/src/mpi/coll/iallgatherv.c index 1f5a7af..81e9030 100644 --- a/src/mpi/coll/iallgatherv.c +++ b/src/mpi/coll/iallgatherv.c @@ -736,7 +736,8 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_Iallgatherv - XXX description here +MPI_Iallgatherv - Gathers data from all tasks and deliver the combined data + to all tasks in a nonblocking way Input Parameters: + sendbuf - starting address of the send buffer (choice) diff --git a/src/mpi/coll/iallreduce.c b/src/mpi/coll/iallreduce.c index ffdd34a..acd90be 100644 --- a/src/mpi/coll/iallreduce.c +++ b/src/mpi/coll/iallreduce.c @@ -691,7 +691,8 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_Iallreduce - XXX description here +MPI_Iallreduce - Combines values from all processes and distributes the result + back to all processes in a nonblocking way Input Parameters: + sendbuf - starting address of the send buffer (choice) diff --git a/src/mpi/coll/ialltoall.c b/src/mpi/coll/ialltoall.c index efbecda..fc1eeec 100644 --- a/src/mpi/coll/ialltoall.c +++ b/src/mpi/coll/ialltoall.c @@ -564,7 +564,7 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_Ialltoall - XXX description here +MPI_Ialltoall - Sends data from all to all processes in a nonblocking way Input Parameters: + sendbuf - starting address of the send buffer (choice) diff --git a/src/mpi/coll/ialltoallv.c b/src/mpi/coll/ialltoallv.c index ab06c43..a5f6d99 100644 --- a/src/mpi/coll/ialltoallv.c +++ b/src/mpi/coll/ialltoallv.c @@ -291,7 +291,9 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_Ialltoallv - XXX description here +MPI_Ialltoallv - Sends data from all to all processes in a nonblocking way; + each process may send a different amount of data and provide displacements + for the input and output data. Input Parameters: + sendbuf - starting address of the send buffer (choice) diff --git a/src/mpi/coll/ialltoallw.c b/src/mpi/coll/ialltoallw.c index 47a3c6b..fe76606 100644 --- a/src/mpi/coll/ialltoallw.c +++ b/src/mpi/coll/ialltoallw.c @@ -297,7 +297,8 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_Ialltoallw - XXX description here +MPI_Ialltoallw - Nonblocking generalized all-to-all communication allowing + different datatypes, counts, and displacements for each partner Input Parameters: + sendbuf - starting address of the send buffer (choice) diff --git a/src/mpi/coll/ibarrier.c b/src/mpi/coll/ibarrier.c index eecf07d..ac16943 100644 --- a/src/mpi/coll/ibarrier.c +++ b/src/mpi/coll/ibarrier.c @@ -215,7 +215,8 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_Ibarrier - XXX description here +MPI_Ibarrier - Notifies the process that it has reached the barrier and returns + immediately Input Parameters: . comm - communicator (handle) @@ -223,6 +224,16 @@ Input Parameters: Output Parameters: . request - communication request (handle) +Notes: +MPI_Ibarrier is a nonblocking version of MPI_barrier. By calling MPI_Ibarrier, +a process notifies that it has reached the barrier. The call returns +immediately, independent of whether other processes have called MPI_Ibarrier. +The usual barrier semantics are enforced at the corresponding completion +operation (test or wait), which in the intra-communicator case will complete +only after all other processes in the communicator have called MPI_Ibarrier. In +the intercommunicator case, it will complete when all processes in the remote +group have called MPI_Ibarrier. + .N ThreadSafe .N Fortran diff --git a/src/mpi/coll/ibcast.c b/src/mpi/coll/ibcast.c index 483c335..3b8e9d6 100644 --- a/src/mpi/coll/ibcast.c +++ b/src/mpi/coll/ibcast.c @@ -902,7 +902,8 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_Ibcast - XXX description here +MPI_Ibcast - Broadcasts a message from the process with rank "root" to + all other processes of the communicator in a nonblocking way Input/Output Parameters: . buffer - starting address of buffer (choice) diff --git a/src/mpi/coll/iexscan.c b/src/mpi/coll/iexscan.c index 6393861..53abce9 100644 --- a/src/mpi/coll/iexscan.c +++ b/src/mpi/coll/iexscan.c @@ -229,7 +229,9 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_Iexscan - XXX description here +MPI_Iexscan - Computes the exclusive scan (partial reductions) of data on a + collection of processes in a nonblocking way + Input Parameters: + sendbuf - starting address of the send buffer (choice) diff --git a/src/mpi/coll/igather.c b/src/mpi/coll/igather.c index e5f4512..8e3da9a 100644 --- a/src/mpi/coll/igather.c +++ b/src/mpi/coll/igather.c @@ -558,7 +558,8 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_Igather - XXX description here +MPI_Igather - Gathers together values from a group of processes in + a nonblocking way Input Parameters: + sendbuf - starting address of the send buffer (choice) diff --git a/src/mpi/coll/igatherv.c b/src/mpi/coll/igatherv.c index b7d5422..1985b73 100644 --- a/src/mpi/coll/igatherv.c +++ b/src/mpi/coll/igatherv.c @@ -157,7 +157,8 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_Igatherv - XXX description here +MPI_Igatherv - Gathers into specified locations from all processes in a group + in a nonblocking way Input Parameters: + sendbuf - starting address of the send buffer (choice) diff --git a/src/mpi/coll/ired_scat.c b/src/mpi/coll/ired_scat.c index 989cfa6..07ccd20 100644 --- a/src/mpi/coll/ired_scat.c +++ b/src/mpi/coll/ired_scat.c @@ -1056,7 +1056,8 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_Ireduce_scatter - XXX description here +MPI_Ireduce_scatter - Combines values and scatters the results in + a nonblocking way Input Parameters: + sendbuf - starting address of the send buffer (choice) diff --git a/src/mpi/coll/ired_scat_block.c b/src/mpi/coll/ired_scat_block.c index 3801ed1..08aba15 100644 --- a/src/mpi/coll/ired_scat_block.c +++ b/src/mpi/coll/ired_scat_block.c @@ -958,7 +958,8 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_Ireduce_scatter_block - XXX description here +MPI_Ireduce_scatter_block - Combines values and scatters the results in + a nonblocking way Input Parameters: + sendbuf - starting address of the send buffer (choice) diff --git a/src/mpi/coll/ireduce.c b/src/mpi/coll/ireduce.c index ff897e3..6502537 100644 --- a/src/mpi/coll/ireduce.c +++ b/src/mpi/coll/ireduce.c @@ -808,7 +808,8 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_Ireduce - XXX description here +MPI_Ireduce - Reduces values on all processes to a single value + in a nonblocking way Input Parameters: + sendbuf - address of the send buffer (choice) diff --git a/src/mpi/coll/iscan.c b/src/mpi/coll/iscan.c index a8c242e..55449d7 100644 --- a/src/mpi/coll/iscan.c +++ b/src/mpi/coll/iscan.c @@ -364,7 +364,8 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_Iscan - XXX description here +MPI_Iscan - Computes the scan (partial reductions) of data on a collection of + processes in a nonblocking way Input Parameters: + sendbuf - starting address of the send buffer (choice) diff --git a/src/mpi/coll/iscatter.c b/src/mpi/coll/iscatter.c index 506ffa5..765de9a 100644 --- a/src/mpi/coll/iscatter.c +++ b/src/mpi/coll/iscatter.c @@ -592,7 +592,8 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_Iscatter - XXX description here +MPI_Iscatter - Sends data from one process to all other processes in a + communicator in a nonblocking way Input Parameters: + sendbuf - address of send buffer (significant only at root) (choice) diff --git a/src/mpi/coll/iscatterv.c b/src/mpi/coll/iscatterv.c index 4e86fcd..13210ca 100644 --- a/src/mpi/coll/iscatterv.c +++ b/src/mpi/coll/iscatterv.c @@ -163,7 +163,8 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_Iscatterv - XXX description here +MPI_Iscatterv - Scatters a buffer in parts to all processes in a communicator + in a nonblocking way Input Parameters: + sendbuf - address of send buffer (significant only at root) (choice) ----------------------------------------------------------------------- Summary of changes: src/mpi/coll/iallgather.c | 7 +++++-- src/mpi/coll/iallgatherv.c | 3 ++- src/mpi/coll/iallreduce.c | 7 +++++-- src/mpi/coll/ialltoall.c | 6 ++++-- src/mpi/coll/ialltoallv.c | 4 +++- src/mpi/coll/ialltoallw.c | 3 ++- src/mpi/coll/ibarrier.c | 13 ++++++++++++- src/mpi/coll/ibcast.c | 3 ++- src/mpi/coll/iexscan.c | 7 +++++-- src/mpi/coll/igather.c | 7 +++++-- src/mpi/coll/igatherv.c | 3 ++- src/mpi/coll/ired_scat.c | 3 ++- src/mpi/coll/ired_scat_block.c | 8 ++++++-- src/mpi/coll/ireduce.c | 6 ++++-- src/mpi/coll/iscan.c | 6 ++++-- src/mpi/coll/iscatter.c | 7 +++++-- src/mpi/coll/iscatterv.c | 3 ++- 17 files changed, 70 insertions(+), 26 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-4-ge61b9a5
by noreply＠mpich.org 07 Nov '13

07 Nov '13

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 e61b9a5baa187922a06481a48833ac3d8ba7eb90 (commit) via 3384e24c52b341274e6b95b83b9d6af8921dc36b (commit) via e9458c25a143b0c8c1733e521e09d996a19a0284 (commit) from ad1bdb5867e75247c05c67f5d27da9a57abebbd4 (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/e61b9a5baa187922a06481a48833ac3d8… commit e61b9a5baa187922a06481a48833ac3d8ba7eb90 Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Mon Nov 4 13:15:15 2013 -0600 Revise test case get_elem_d.f90 Also added comments to make it less misleading. Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/test/mpi/f90/datatype/get_elem_d.f90 b/test/mpi/f90/datatype/get_elem_d.f90 index 498f170..45130ce 100644 --- a/test/mpi/f90/datatype/get_elem_d.f90 +++ b/test/mpi/f90/datatype/get_elem_d.f90 @@ -21,7 +21,7 @@ program get_elem_d integer :: blklen(nb)=(/2,2/) integer :: types(nb)=(/MPI_DOUBLE_PRECISION,MPI_INTEGER/) integer(kind=MPI_ADDRESS_KIND) :: disp(nb) - integer :: newtype,ntlen,ians(0:23),ians0(0:3),ians1(24),ians2(20) + integer :: newtype,ntlen,ians(20),ians0(0:3),ians1(24),ians2(20) double precision :: dbuff(dmax), a integer :: ibuff(imax) character :: cbuff(cmax)='X' @@ -42,13 +42,13 @@ program get_elem_d ians0(2)=2*ka+kj ians0(3)=2*ka+2*kj ii=0 - do i=1,24 + do i=1,24 ! answers for the test sending 1~24 bytes if (i .eq. ians0(ii)) ii=ii+1 ians1(i)=ii enddo if (rank == 0 .and. verbose > 0) print *, (ians1(k),k=1,24) jj=0 - do j=0,19,4 + do j=1,17,4 ! 4 means newtype has 4 primitives ians(j)=jj+ka/kj ians(j+1)=jj+2*(ka/kj) ians(j+2)=jj+2*(ka/kj)+1 @@ -56,9 +56,11 @@ program get_elem_d if (rank == 0 .and. verbose > 0) print *, (ians(k),k=j,j+3) jj=jj+ntlen/kj enddo + ! To have k elements, need to receive ians(k) integers + ii=0 - do i=1,20 - if (i .eq. ians(ii)) ii=ii+1 + do i=1,20 ! answers for the test sending 1~20 integers + if (i .eq. ians(ii+1)) ii=ii+1 ians2(i)=ii enddo if (rank == 0 .and. verbose > 0) print *, (ians2(k),k=1,20) @@ -68,7 +70,7 @@ program get_elem_d call MPI_Type_create_struct(nb, blklen, disp, types, newtype, ierror) call MPI_Type_commit(newtype, ierror) - do i=1,24 + do i=1,24 ! sending 1~24 bytes if (rank == 0) then call MPI_Send(cbuff, i, MPI_BYTE, dest, 100, comm, ierror) @@ -89,7 +91,7 @@ program get_elem_d endif enddo - do i=1,20 + do i=1,20 ! sending 1~20 integers if (rank == 0) then call MPI_Send(ibuff, i, MPI_INTEGER, dest, 100, comm, ierror) http://git.mpich.org/mpich.git/commitdiff/3384e24c52b341274e6b95b83b9d6af89… commit 3384e24c52b341274e6b95b83b9d6af8921dc36b Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Wed Oct 30 18:38:08 2013 -0500 Fixed buffer overflow in test get_elem_d.f90 Fixes #884. Signed-off-by: Junchao Zhang <jczhang(a)mcs.anl.gov> diff --git a/test/mpi/f90/datatype/get_elem_d.f90 b/test/mpi/f90/datatype/get_elem_d.f90 index 8a9e42b..498f170 100644 --- a/test/mpi/f90/datatype/get_elem_d.f90 +++ b/test/mpi/f90/datatype/get_elem_d.f90 @@ -21,7 +21,7 @@ program get_elem_d integer :: blklen(nb)=(/2,2/) integer :: types(nb)=(/MPI_DOUBLE_PRECISION,MPI_INTEGER/) integer(kind=MPI_ADDRESS_KIND) :: disp(nb) - integer :: newtype,ntlen,ians(0:23),ians0(0:3),ians1(20),ians2(20) + integer :: newtype,ntlen,ians(0:23),ians0(0:3),ians1(24),ians2(20) double precision :: dbuff(dmax), a integer :: ibuff(imax) character :: cbuff(cmax)='X' http://git.mpich.org/mpich.git/commitdiff/e9458c25a143b0c8c1733e521e09d996a… commit e9458c25a143b0c8c1733e521e09d996a19a0284 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Wed Oct 30 18:36:41 2013 -0500 Removed unused code from get_elem_d.f90 The full path of the test is test/mpi/f90/datatype/get_elem_d.f90 Signed-off-by: Junchao Zhang <jczhang(a)mcs.anl.gov> diff --git a/test/mpi/f90/datatype/get_elem_d.f90 b/test/mpi/f90/datatype/get_elem_d.f90 index 6b9edde..8a9e42b 100644 --- a/test/mpi/f90/datatype/get_elem_d.f90 +++ b/test/mpi/f90/datatype/get_elem_d.f90 @@ -17,7 +17,7 @@ program get_elem_d integer, parameter :: nb=2 integer :: comm,rank,size,dest,ierror,errs=0 integer :: status(MPI_STATUS_SIZE) - integer :: i,ii,count,ka,j,jj,k,kj,krat,tag=100 + integer :: i,ii,count,ka,j,jj,k,kj integer :: blklen(nb)=(/2,2/) integer :: types(nb)=(/MPI_DOUBLE_PRECISION,MPI_INTEGER/) integer(kind=MPI_ADDRESS_KIND) :: disp(nb) @@ -34,7 +34,6 @@ program get_elem_d call MPI_Sizeof (j, kj, ierror) call MPI_Sizeof (a, ka, ierror) ntlen=2*ka+2*kj - krat=ntlen/kj disp=(/0,2*ka/) ! calculate answers for expected i values for Get_elements with derived type ----------------------------------------------------------------------- Summary of changes: test/mpi/f90/datatype/get_elem_d.f90 | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-1-gad1bdb5
by noreply＠mpich.org 06 Nov '13

06 Nov '13

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 ad1bdb5867e75247c05c67f5d27da9a57abebbd4 (commit) from 6a9def627a35fe6c7d1a08dffd39a6387dbffe83 (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/ad1bdb5867e75247c05c67f5d27da9a57… commit ad1bdb5867e75247c05c67f5d27da9a57abebbd4 Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Fri Nov 1 19:18:06 2013 -0500 Fix compiler warnings related to MPI_T code Fixed a set of compiler warnings related to MPI_T code when compiled with -Wall, including "assignment discards 'const' qualifier from pointer target type", "unused variable", "shadows a global declaration" etc. Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/maint/gencvars b/maint/gencvars index 0f7575c..7da93bd 100755 --- a/maint/gencvars +++ b/maint/gencvars @@ -238,7 +238,7 @@ foreach my $p (@{$cvars->{cvars}}) { $mpi_dtype = "MPI_CHAR"; $count = "MPIR_CVAR_MAX_STRLEN"; my $str_val = fmt_default($p->{name}, $p->{default}, $p->{defaultliteral}, $p->{type}); - printf CVAR_C qq( defaultval.str = %s;\n), $str_val; + printf CVAR_C qq( defaultval.str = (char *)%s;\n), $str_val; } elsif ($p->{type} eq 'int' or $p->{type} eq 'boolean') { $mpi_dtype = "MPI_INT"; diff --git a/src/include/mpit.h b/src/include/mpit.h index 44d68ab..68d67af 100644 --- a/src/include/mpit.h +++ b/src/include/mpit.h @@ -104,7 +104,6 @@ static inline cvar_table_entry_t * LOOKUP_CVAR_BY_NAME(const char* cvar_name) #define MPIR_T_CVAR_REGISTER_STATIC(dtype_, name_, addr_, count_, verb_, \ scope_, default_, cat_, desc_) \ do { \ - MPIU_Assert(addr_ != NULL); \ MPIU_Assert(count_ > 0); \ MPIR_T_CVAR_REGISTER_impl(dtype_, #name_, addr_, count_, MPI_T_ENUM_NULL, \ verb_, MPI_T_BIND_NO_OBJECT, scope_, NULL, NULL, default_, cat_, desc_); \ diff --git a/src/include/mpitimpl.h b/src/include/mpitimpl.h index 9f3120d..7feedc0 100644 --- a/src/include/mpitimpl.h +++ b/src/include/mpitimpl.h @@ -1390,8 +1390,8 @@ extern MPIU_Thread_mutex_t mpi_t_mutex; #endif /* Init and finalize routines */ -extern void MPIR_T_env_init(); -extern void MPIR_T_env_finalize(); +extern void MPIR_T_env_init(void); +extern void MPIR_T_env_finalize(void); #define MPIR_T_FAIL_IF_UNINITIALIZED() \ do { \ diff --git a/src/mpi_t/cvar_get_info.c b/src/mpi_t/cvar_get_info.c index 6d17e6d..ef2f1ab 100644 --- a/src/mpi_t/cvar_get_info.c +++ b/src/mpi_t/cvar_get_info.c @@ -54,7 +54,7 @@ Output Parameters: @*/ int MPI_T_cvar_get_info(int cvar_index, char *name, int *name_len, int *verbosity, MPI_Datatype *datatype, MPI_T_enum *enumtype, - char *desc, int *desc_len, int *bind, int *scope) + char *desc, int *desc_len, int *binding, int *scope) { int mpi_errno = MPI_SUCCESS; @@ -97,8 +97,8 @@ int MPI_T_cvar_get_info(int cvar_index, char *name, int *name_len, if (enumtype != NULL) *enumtype = cvar->enumtype; - if (bind != NULL) - *bind = cvar->bind; + if (binding != NULL) + *binding = cvar->bind; if (scope != NULL) *scope = cvar->scope; @@ -116,7 +116,7 @@ fn_fail: mpi_errno = MPIR_Err_create_code( mpi_errno, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OTHER, "**mpi_t_cvar_get_info", "**mpi_t_cvar_get_info %d %p %p %p %p %p %p %p %p %p", - cvar_index, name, name_len, verbosity, datatype, enumtype, desc, desc_len, bind, scope); + cvar_index, name, name_len, verbosity, datatype, enumtype, desc, desc_len, binding, scope); } #endif mpi_errno = MPIR_Err_return_comm(NULL, FCNAME, mpi_errno); diff --git a/src/mpi_t/mpit.c b/src/mpi_t/mpit.c index 8636b80..7932d34 100644 --- a/src/mpi_t/mpit.c +++ b/src/mpi_t/mpit.c @@ -278,7 +278,7 @@ fn_fail: * IN: count, # of elements of this cvar if known at registeration, otherwise 0. * IN: etype, MPI_T_enum or MPI_T_ENUM_NULL * IN: verb, MPI_T_PVAR_VERBOSITY_* - * IN: bind, MPI_T_BIND_* + * IN: binding, MPI_T_BIND_* * IN: Scope, MPI_T_SCOPE_* * IN: get_addr, If not NULL, it is a callback to get address of the cvar. * IN: get_count, If not NULL, it is a callback to read count of the cvar. @@ -287,7 +287,7 @@ fn_fail: */ void MPIR_T_CVAR_REGISTER_impl( MPI_Datatype dtype, const char* name, const void *addr, int count, - MPIR_T_enum_t *etype, MPIR_T_verbosity_t verb, MPIR_T_bind_t bind, + MPIR_T_enum_t *etype, MPIR_T_verbosity_t verb, MPIR_T_bind_t binding, MPIR_T_scope_t scope, MPIR_T_cvar_get_addr_cb get_addr, MPIR_T_cvar_get_count_cb get_count, MPIR_T_cvar_value_t defaultval, const char *cat, const char * desc) @@ -318,7 +318,7 @@ void MPIR_T_CVAR_REGISTER_impl( cvar->addr = (void *)addr; cvar->count = count; cvar->verbosity = verb; - cvar->bind = bind; + cvar->bind = binding; cvar->scope = scope; cvar->get_addr = get_addr; cvar->get_count = get_count; @@ -352,7 +352,7 @@ void MPIR_T_CVAR_REGISTER_impl( * IN: count, # of elements of this pvar if known at registeration, otherwise 0. * IN: etype, MPI_T_enum or MPI_T_ENUM_NULL * IN: verb, MPI_T_PVAR_VERBOSITY_* - * IN: bind, MPI_T_BIND_* + * IN: binding, MPI_T_BIND_* * IN: flags, Bitwise OR of MPIR_T_R_PVAR_FLAGS_{} * IN: get_value, If not NULL, it is a callback to read the pvar. * IN: get_count, If not NULL, it is a callback to read count of the pvar. @@ -361,7 +361,7 @@ void MPIR_T_CVAR_REGISTER_impl( */ void MPIR_T_PVAR_REGISTER_impl( int varclass, MPI_Datatype dtype, const char* name, void *addr, int count, - MPIR_T_enum_t *etype, int verb, int bind, int flags, + MPIR_T_enum_t *etype, int verb, int binding, int flags, MPIR_T_pvar_get_value_cb get_value, MPIR_T_pvar_get_count_cb get_count, const char * cat, const char * desc) { @@ -394,7 +394,7 @@ void MPIR_T_PVAR_REGISTER_impl( pvar->count = count; pvar->enumtype = etype; pvar->verbosity = verb; - pvar->bind = bind; + pvar->bind = binding; pvar->flags = flags; pvar->get_value = get_value; pvar->get_count = get_count; diff --git a/src/mpi_t/pvar_get_info.c b/src/mpi_t/pvar_get_info.c index 67bd80f..5df055f 100644 --- a/src/mpi_t/pvar_get_info.c +++ b/src/mpi_t/pvar_get_info.c @@ -57,7 +57,7 @@ Output Parameters: @*/ int MPI_T_pvar_get_info(int pvar_index, char *name, int *name_len, int *verbosity, int *var_class, MPI_Datatype *datatype, MPI_T_enum *enumtype, char *desc, - int *desc_len, int *bind, int *readonly, int *continuous, int *atomic) + int *desc_len, int *binding, int *readonly, int *continuous, int *atomic) { int mpi_errno = MPI_SUCCESS; @@ -111,8 +111,8 @@ int MPI_T_pvar_get_info(int pvar_index, char *name, int *name_len, int *verbosit if (enumtype != NULL) *enumtype = info->enumtype; - if (bind != NULL) - *bind = info->bind; + if (binding != NULL) + *binding = info->bind; if (readonly != NULL) *readonly = info->flags & MPIR_T_PVAR_FLAG_READONLY; @@ -138,7 +138,7 @@ fn_fail: mpi_errno, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OTHER, "**mpi_t_pvar_get_info", "**mpi_t_pvar_get_info %d %p %p %p %p %p %p %p %p %p %p %p %p", pvar_index, name, name_len, verbosity, var_class, datatype, enumtype, desc, desc_len, - bind, readonly, continuous, atomic); + binding, readonly, continuous, atomic); } # endif mpi_errno = MPIR_Err_return_comm(NULL, FCNAME, mpi_errno); diff --git a/src/mpi_t/pvar_read.c b/src/mpi_t/pvar_read.c index 6035476..0ef169c 100644 --- a/src/mpi_t/pvar_read.c +++ b/src/mpi_t/pvar_read.c @@ -31,7 +31,6 @@ int MPIR_T_pvar_read_impl(MPI_T_pvar_session session, MPI_T_pvar_handle handle, void *restrict buf) { int i, mpi_errno = MPI_SUCCESS; - void *tmp; /* Reading a never started pvar, or a stopped and then reset wartermark, * will run into this nasty situation. Wait for an error code to be defined diff --git a/src/mpid/ch3/src/ch3u_recvq.c b/src/mpid/ch3/src/ch3u_recvq.c index 1cbd413..e07c0f1 100644 --- a/src/mpid/ch3/src/ch3u_recvq.c +++ b/src/mpid/ch3/src/ch3u_recvq.c @@ -116,7 +116,7 @@ int MPIDI_CH3U_Recvq_init(void) 0, /* init value */ MPI_T_VERBOSITY_USER_DETAIL, MPI_T_BIND_NO_OBJECT, - MPIR_T_PVAR_FLAG_READONLY | MPIR_T_PVAR_FLAG_CONTINUOUS, + (MPIR_T_PVAR_FLAG_READONLY | MPIR_T_PVAR_FLAG_CONTINUOUS), "CH3", /* category name */ "length of the posted message receive queue"); @@ -127,7 +127,7 @@ int MPIDI_CH3U_Recvq_init(void) 0, /* init value */ MPI_T_VERBOSITY_USER_DETAIL, MPI_T_BIND_NO_OBJECT, - MPIR_T_PVAR_FLAG_READONLY | MPIR_T_PVAR_FLAG_CONTINUOUS, + (MPIR_T_PVAR_FLAG_READONLY | MPIR_T_PVAR_FLAG_CONTINUOUS), "CH3", /* category name */ "length of the unexpected message receive queue"); @@ -137,7 +137,7 @@ int MPIDI_CH3U_Recvq_init(void) posted_recvq_match_attempts, MPI_T_VERBOSITY_USER_DETAIL, MPI_T_BIND_NO_OBJECT, - MPIR_T_PVAR_FLAG_READONLY | MPIR_T_PVAR_FLAG_CONTINUOUS, + (MPIR_T_PVAR_FLAG_READONLY | MPIR_T_PVAR_FLAG_CONTINUOUS), "CH3", /* category name */ "number of search passes on the message receive queue"); @@ -147,7 +147,7 @@ int MPIDI_CH3U_Recvq_init(void) unexpected_recvq_match_attempts, MPI_T_VERBOSITY_USER_DETAIL, MPI_T_BIND_NO_OBJECT, - MPIR_T_PVAR_FLAG_READONLY | MPIR_T_PVAR_FLAG_CONTINUOUS, + (MPIR_T_PVAR_FLAG_READONLY | MPIR_T_PVAR_FLAG_CONTINUOUS), "CH3", "number of search passes on the message receive queue"); @@ -157,7 +157,7 @@ int MPIDI_CH3U_Recvq_init(void) time_failed_matching_postedq, MPI_T_VERBOSITY_USER_DETAIL, MPI_T_BIND_NO_OBJECT, - MPIR_T_PVAR_FLAG_READONLY | MPIR_T_PVAR_FLAG_CONTINUOUS, + (MPIR_T_PVAR_FLAG_READONLY | MPIR_T_PVAR_FLAG_CONTINUOUS), "CH3", /* category name */ "total time spent on unsuccessful search passes on the posted receives queue"); @@ -167,7 +167,7 @@ int MPIDI_CH3U_Recvq_init(void) time_matching_unexpectedq, MPI_T_VERBOSITY_USER_DETAIL, MPI_T_BIND_NO_OBJECT, - MPIR_T_PVAR_FLAG_READONLY | MPIR_T_PVAR_FLAG_CONTINUOUS, + (MPIR_T_PVAR_FLAG_READONLY | MPIR_T_PVAR_FLAG_CONTINUOUS), "CH3", /* category name */ "total time spent on search passes on the unexpected receive queue"); @@ -178,7 +178,7 @@ int MPIDI_CH3U_Recvq_init(void) 0, /* init value */ MPI_T_VERBOSITY_USER_DETAIL, MPI_T_BIND_NO_OBJECT, - MPIR_T_PVAR_FLAG_READONLY | MPIR_T_PVAR_FLAG_CONTINUOUS, + (MPIR_T_PVAR_FLAG_READONLY | MPIR_T_PVAR_FLAG_CONTINUOUS), "CH3", /* category name */ "total buffer size allocated in the unexpected receive queue"); ----------------------------------------------------------------------- Summary of changes: maint/gencvars | 2 +- src/include/mpit.h | 1 - src/include/mpitimpl.h | 4 ++-- src/mpi_t/cvar_get_info.c | 8 ++++---- src/mpi_t/mpit.c | 12 ++++++------ src/mpi_t/pvar_get_info.c | 8 ++++---- src/mpi_t/pvar_read.c | 1 - src/mpid/ch3/src/ch3u_recvq.c | 14 +++++++------- 8 files changed, 24 insertions(+), 26 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository annotated tag, v3.1rc1, created. v3.1rc1
by noreply＠mpich.org 05 Nov '13

05 Nov '13

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 annotated tag, v3.1rc1 has been created at 9cc2099cc86beaa2a1c47a29658172f76394db62 (tag) tagging 6a9def627a35fe6c7d1a08dffd39a6387dbffe83 (commit) replaces v3.1b1 tagged by Antonio J. Pena on Tue Nov 5 22:52:42 2013 -0600 - Log ----------------------------------------------------------------- tagging 'v3.1rc1' Antonio J. Pena (4): Increased tmp string buffer len from 1K to 16K Updated release information for 3.1rc1 Partially revert 9088ea81 Removed ABI mention from CHANGES Dave Goodell (1): large count work: use MPI_Aint for dtype size and collectives Huiwei Lu (3): Fixes #1851 - sizeof() usage inconsistencies in sock.c Adding a test case for MPI_Comm_idup Add comm_idup_mul to .gitignore Jan Bierbaum (1): fix check for duplicate KVS entries Jeff Hammond (3): update discuss email address return result of strlen to proper type remove cast-to-integer associated with count field Junchao Zhang (32): Make mpi_t_str always fail when MPI_T is not done Add MPI_T return codes. Fix #1905 Return MPI_ERR_INTERN for not-impl MPI_T functions Add the missing constant MPI_T_SCOPE_CONSTANT Add a test mpit_vars.c to print all MPI_T stuffs Primary implementation of MPI_T specified in MPI3 Replace mpi_t_util.c with mpit.c In MPI init/finalize, use updated MPI_T routines Delete the old interfaces on pvars Change var names in enable_pvar_* style Change wording for option --enable-mpit-pvars Adapt old nemesis pvars to new MPI_T impl Adapt old ch3 pvars to new MPI_T impl Capitalize parameter category names Add missing info of parameters (cvars) Revise genparams to gen files needed by new MPI_T Rename mpich_param_vals.h, param_vals.c Rename cat_get_pv.c to cat_get_pvars.c Rename mpit_init_thread.c to mpit_initthread.c Revise the test case mpit_vars.c Revise two tests under test/mpi/manual/mpi_t/ Delete xfail=ticket1898 of mpi_t_str Add a test case to test multithreading MPI_T Rename parameters MPIR_PARAM_* to MPIR_CVAR_* Rename mpich_params.{c,h} to mpich_cvars.{c,h} Fix a problem in passing thread id to a function Swap the priority between MPICH_* and MPIR_PARAM_* Use the new MPI_T cvar name prefix MPIR_CVAR_ Include mpitimpl.h in mpich_cvars.h Use the standard #ifndef/#include in mpitimpl.h Set almost all cvar scope as MPI_T_SCOPE_ALL_EQ Correct the cvars names and delete unnessary init Ken Raffenetti (10): Fault Tolerance test fixes. Remove Linux-isms in test code. Test for PTHREAD_PROCESS_SHARED attribute Change to PMI proxy on unknown key lookup Update fault tolerance test params turn off TAP xfail info for passing tests Add resultTest routine to test suite. Fixup and add pt2pt fault tolerance tests Fault tolerance tests for some collectives Disable xfail test from running by default Lisandro Dalcin (1): Fix for uncommitted datatypes Michael Blocksome (1): Fix pamid bgq configure for v1r2m1 installs Pavan Balaji (50): Trigger the RMA error more frequently. Update version and CHANGES for 3.1b2 Fix range format in README.envvar Explain default port range for CH3_PORT_RANGE. Revert "Fix range format in README.envvar" Added a link to the bugs fixed. Check whether todo tickets are valid. Mark transp-datatype as xfail. White-space change for consistency. Remove stale information from README.vin Upgrade to hwloc-1.7.2. Hydra-specific patches for hwloc. Update README with hwloc version. Cleanup multiple aspects of the is_local lookup. Improve the win_shared test to check for more errors. Updated changes with RMA improvements. Improve test to not rely on the default alloc_shm. Win_flush_all optimization. Do a memory barrier at the end of a flushall. Simplify checks for shared memory windows. Move predefined datatype check to the MPI layer. Optimize localcopy for predefined datatypes. Optimization to the shared memory copy code. Check for BUILTIN kinds, not just predefined datatypes. clang compilation fixes. Warning squash. Change the MPI_MAX_ERROR_STRING back to 512. Renumber MPI_COMBINER constants to maintain ABI. Fortran ABI changes from Intel. Update libmpich ABI string for the 3.1b2 release. Bug fix for the mpit_vars test. Added information about MPI_T to the documentation. Update version string. Correct output format in the new impls/ test. Revert "Fix for #1804 - Alignment issues in Fortran with MPI_Status" MPI_Status updates for ABI. Fortran updates for MPI_Status. Remove bogus checks for MPIF_STATUS size. Bug fix for MPI_WEIGHTS_EMPTY. Fix to buildiface when Fint != int. Added MPICH ABI information to CHANGES. Updated git link. Added a nonblocking MPI_Test test. Mark nbtest as xfail. Move the errors/f77/errhan directory to an iodir. Mark comm_idup_mul as xfail. Remove xfails for ticket 1893. Fix perl warnings in the C++ buildiface. Fix bit manipulation in the MPI_Status object. Fix assertion for large counts. Rob Latham (38): use AS_VAR_ARITH add error checking to aio test fall back to blocking version if aio not implemented Improve aggregation selection on Blue Gene Datatype test describing large amounts of data add make rule for large_type and typo in testlist Improvements to large_type test Maintain requested perms in more cases remove unused, undeclared variable reduce duplcated code in hint processing clean up tests with enable-strict improved error handling for test/file_info unused variable warning update adio drivers to use common hint processing funcs improve comments, formatting on some tricky code compile error removed unused variable clang finds an incorrect header guard teach type-dumping code about subarray another big type test Configure check for (need for) header padding ROMIO: improve handling of large datatypes Increase size of internal datatype values More ROMIO updates for large count resized wasn't setting max_contig_count implement MPIU_Assign_trunc without _Generic datatype_size no longer needs to be an integer make shared file pointer code "large datatype" safe A round of 64-to-32 warning squashes Small parens-related warning with clang casting to make formatting happy remove MPIR_Type_get_contig_blocks defective MPI_Pack/Unpack/Pack_size interface type promotion for MPIR_Bsend structure fix MPI_T test failure due to uninit variables testcase for status object manipulations Align nemesis payload: union approach blurb about large count/type changes Wesley Bland (7): Fixes #1923 - Incorrect error message. Remove Windows section from User Guide. Remove Windows section from Install Guide. Add note about MPI_Init accepting NULL. Add documentation for errhandler callback Reword the mpiexec usage guide. Fix bad quote character in the last commit. William Gropp (18): Minor fix for typo in documentation comment Fix two errors in basic MPI_T test Removed duplicate Make target and make clean commands consistent Add FIXME for reduction operation macro Removed irrelevant comment Add comment on end of PMPI ifdef to improve readability Fail instead of continuing with broken environment Removed trailing blank Check for other Testmpio locations Ensure MPIR_COUNT_ALIGNMENT set Add way to test implementation specific features Allow MPI_ERR_IO as error class in test Change buildiface for C++ to control output order Add option to remove distgraph support in C++ Detect unknown feature request Remove support for MPI::Distgraphcomm Eliminate test for C++ Distgraphcomm routines Force ordering of functions in C++ binding Xin Zhao (18): fix bug on "list_complete" variable set disp_unit in win_shared_query. fix bug: add a memory barrier in win_fence. fix bug: delete memory barriers in win_post/start. fix bug: delete memory barriers in win_lock/lock_all. change the condition of memory barrier. Delete judgements of datatypes of RMA operations. Delete MPIDI_CH3I_DO_SHM_OP macro. perform SHM operations immediately. eagerly acquire lock in win_lock/lock_all for SHM operations. Allocate shared memory by default for WIN_ALLOCATE Update FLAVOR checks with shared memory checks. Change FLAVOR to shared memory checks in win_flush. delete exit after do memory barrier. fix bug:pass info to win_allocate and free info. make MMAP SHM handle as MPI_Aint type. Add a test for allocating 1GB SHM window memory per process. Multi-threaded RMA test. ----------------------------------------------------------------------- hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1b1-187-g6a9def6
by noreply＠mpich.org 05 Nov '13

05 Nov '13

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 6a9def627a35fe6c7d1a08dffd39a6387dbffe83 (commit) from 2946b9b7a984629ca4d990651e62b33fdb35ee0f (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/6a9def627a35fe6c7d1a08dffd39a6387… commit 6a9def627a35fe6c7d1a08dffd39a6387dbffe83 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Tue Nov 5 22:50:36 2013 -0600 Removed ABI mention from CHANGES diff --git a/CHANGES b/CHANGES index ba0b4ac..dac8198 100644 --- a/CHANGES +++ b/CHANGES @@ -2,11 +2,6 @@ Changes in 3.1 =============================================================================== - # MPICH ABI Consortium: Starting this release, MPICH is ABI - compatible with several MPICH derivatives including Intel MPI, IBM - MPI and Cray MPI (supported only on select platform/compiler - combinations). - # Integrated MPICH-PAMI code base for Blue Gene/Q and other IBM platforms. ----------------------------------------------------------------------- Summary of changes: CHANGES | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) hooks/post-receive -- MPICH primary repository

1 0