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

[mpich] MPICH primary repository branch, master, updated. v3.1-42-g0d61a10
by noreply＠mpich.org 13 Mar '14

13 Mar '14

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 0d61a1032115c1a380d967c46d9e39c1bfcda2e1 (commit) from 5477bbdcae1101334d78e12cbde1ac295c83811d (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/0d61a1032115c1a380d967c46d9e39c1b… commit 0d61a1032115c1a380d967c46d9e39c1bfcda2e1 Author: Sameh Sharkawi <sssharka(a)us.ibm.com> Date: Thu Mar 13 10:00:38 2014 -0400 OOM running broadcast stress test w/ COLLECTIVE_SELECTION=yes Insert a barrier for every 16 calls to async collectives (ibm) D192641 Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> diff --git a/src/mpid/pamid/src/coll/allgather/mpido_allgather.c b/src/mpid/pamid/src/coll/allgather/mpido_allgather.c index a65181c..517f20e 100644 --- a/src/mpid/pamid/src/coll/allgather/mpido_allgather.c +++ b/src/mpid/pamid/src/coll/allgather/mpido_allgather.c @@ -611,6 +611,12 @@ MPIDO_Allgather_simple(const void *sendbuf, volatile unsigned allgather_active = 1; const int rank = comm_ptr->rank; const int size = comm_ptr->local_size; +#if ASSERT_LEVEL==0 + /* We can't afford the tracing in ndebug/performance libraries */ + const unsigned verbose = 0; +#else + const unsigned verbose = (MPIDI_Process.verbose >= MPIDI_VERBOSE_DETAILS_ALL) && (rank == 0); +#endif const pami_metadata_t *my_md; @@ -642,6 +648,14 @@ MPIDO_Allgather_simple(const void *sendbuf, recvbuf, recvcount, recvtype, comm_ptr, mpierrno); } + else if(advisor_algorithms[0].metadata && advisor_algorithms[0].metadata->check_correct.values.asyncflowctl && !(--(comm_ptr->mpid.num_requests))) + { + comm_ptr->mpid.num_requests = MPIDI_Process.optimized.num_requests; + int tmpmpierrno; + if(unlikely(verbose)) + fprintf(stderr,"Query barrier required for %s\n", advisor_algorithms[0].metadata->name); + MPIDO_Barrier(comm_ptr, &tmpmpierrno); + } } } diff --git a/src/mpid/pamid/src/coll/allgatherv/mpido_allgatherv.c b/src/mpid/pamid/src/coll/allgatherv/mpido_allgatherv.c index b8ab1ef..1663f8f 100644 --- a/src/mpid/pamid/src/coll/allgatherv/mpido_allgatherv.c +++ b/src/mpid/pamid/src/coll/allgatherv/mpido_allgatherv.c @@ -648,6 +648,12 @@ MPIDO_Allgatherv_simple(const void *sendbuf, const int rank = comm_ptr->rank; const int size = comm_ptr->local_size; const struct MPIDI_Comm* const mpid = &(comm_ptr->mpid); +#if ASSERT_LEVEL==0 + /* We can't afford the tracing in ndebug/performance libraries */ + const unsigned verbose = 0; +#else + const unsigned verbose = (MPIDI_Process.verbose >= MPIDI_VERBOSE_DETAILS_ALL) && (rank == 0); +#endif int recvcontinuous=0; size_t totalrecvcount=0; @@ -683,6 +689,14 @@ MPIDO_Allgatherv_simple(const void *sendbuf, recvbuf, recvcounts, displs, recvtype, comm_ptr, mpierrno); } + else if(advisor_algorithms[0].metadata && advisor_algorithms[0].metadata->check_correct.values.asyncflowctl && !(--(comm_ptr->mpid.num_requests))) + { + comm_ptr->mpid.num_requests = MPIDI_Process.optimized.num_requests; + int tmpmpierrno; + if(unlikely(verbose)) + fprintf(stderr,"Query barrier required for %s\n", advisor_algorithms[0].metadata->name); + MPIDO_Barrier(comm_ptr, &tmpmpierrno); + } } } diff --git a/src/mpid/pamid/src/coll/alltoall/mpido_alltoall.c b/src/mpid/pamid/src/coll/alltoall/mpido_alltoall.c index 354fe71..1e45d58 100644 --- a/src/mpid/pamid/src/coll/alltoall/mpido_alltoall.c +++ b/src/mpid/pamid/src/coll/alltoall/mpido_alltoall.c @@ -250,6 +250,12 @@ int MPIDO_Alltoall_simple(const void *sendbuf, int tmp; const int rank = comm_ptr->rank; const int size = comm_ptr->local_size; +#if ASSERT_LEVEL==0 + /* We can't afford the tracing in ndebug/performance libraries */ + const unsigned verbose = 0; +#else + const unsigned verbose = (MPIDI_Process.verbose >= MPIDI_VERBOSE_DETAILS_ALL) && (comm_ptr->rank == 0); +#endif const struct MPIDI_Comm* const mpid = &(comm_ptr->mpid); @@ -269,6 +275,14 @@ int MPIDO_Alltoall_simple(const void *sendbuf, recvbuf, recvcount, recvtype, comm_ptr, mpierrno); } + else if(advisor_algorithms[0].metadata && advisor_algorithms[0].metadata->check_correct.values.asyncflowctl && !(--(comm_ptr->mpid.num_requests))) + { + comm_ptr->mpid.num_requests = MPIDI_Process.optimized.num_requests; + int tmpmpierrno; + if(unlikely(verbose)) + fprintf(stderr,"Query barrier required for %s\n", advisor_algorithms[0].metadata->name); + MPIDO_Barrier(comm_ptr, &tmpmpierrno); + } } } diff --git a/src/mpid/pamid/src/coll/alltoallv/mpido_alltoallv.c b/src/mpid/pamid/src/coll/alltoallv/mpido_alltoallv.c index 76b45a5..adf3157 100644 --- a/src/mpid/pamid/src/coll/alltoallv/mpido_alltoallv.c +++ b/src/mpid/pamid/src/coll/alltoallv/mpido_alltoallv.c @@ -429,6 +429,12 @@ int MPIDO_Alltoallv_simple(const void *sendbuf, int tmp; const int rank = comm_ptr->rank; const int size = comm_ptr->local_size; +#if ASSERT_LEVEL==0 + /* We can't afford the tracing in ndebug/performance libraries */ + const unsigned verbose = 0; +#else + const unsigned verbose = (MPIDI_Process.verbose >= MPIDI_VERBOSE_DETAILS_ALL) && (rank == 0); +#endif int sendcontinuous , recvcontinuous=0; size_t recv_size=0, send_size=0; @@ -467,6 +473,14 @@ int MPIDO_Alltoallv_simple(const void *sendbuf, recvbuf, recvcounts, recvdispls, recvtype, comm_ptr, mpierrno); } + else if(advisor_algorithms[0].metadata && advisor_algorithms[0].metadata->check_correct.values.asyncflowctl && !(--(comm_ptr->mpid.num_requests))) + { + comm_ptr->mpid.num_requests = MPIDI_Process.optimized.num_requests; + int tmpmpierrno; + if(unlikely(verbose)) + fprintf(stderr,"Query barrier required for %s\n", advisor_algorithms[0].metadata->name); + MPIDO_Barrier(comm_ptr, &tmpmpierrno); + } } } diff --git a/src/mpid/pamid/src/coll/bcast/mpido_bcast.c b/src/mpid/pamid/src/coll/bcast/mpido_bcast.c index 05d0c60..0c2730e 100644 --- a/src/mpid/pamid/src/coll/bcast/mpido_bcast.c +++ b/src/mpid/pamid/src/coll/bcast/mpido_bcast.c @@ -288,6 +288,12 @@ int MPIDO_Bcast_simple(void *buffer, MPIDI_Post_coll_t bcast_post; const struct MPIDI_Comm* const mpid = &(comm_ptr->mpid); const int rank = comm_ptr->rank; +#if ASSERT_LEVEL==0 + /* We can't afford the tracing in ndebug/performance libraries */ + const unsigned verbose = 0; +#else + const unsigned verbose = (MPIDI_Process.verbose >= MPIDI_VERBOSE_DETAILS_ALL) && (rank == 0); +#endif /* Must calculate data_size based on count=1 in case it's total size is > integer */ int data_size_one; @@ -303,6 +309,14 @@ int MPIDO_Bcast_simple(void *buffer, { return MPIR_Bcast_intra(buffer, count, datatype, root, comm_ptr, mpierrno); } + else if(advisor_algorithms[0].metadata && advisor_algorithms[0].metadata->check_correct.values.asyncflowctl && !(--(comm_ptr->mpid.num_requests))) + { + comm_ptr->mpid.num_requests = MPIDI_Process.optimized.num_requests; + int tmpmpierrno; + if(unlikely(verbose)) + fprintf(stderr,"Query barrier required for %s\n", advisor_algorithms[0].metadata->name); + MPIDO_Barrier(comm_ptr, &tmpmpierrno); + } } } diff --git a/src/mpid/pamid/src/coll/gather/mpido_gather.c b/src/mpid/pamid/src/coll/gather/mpido_gather.c index 7ff1807..7e508d8 100644 --- a/src/mpid/pamid/src/coll/gather/mpido_gather.c +++ b/src/mpid/pamid/src/coll/gather/mpido_gather.c @@ -402,6 +402,12 @@ int MPIDO_Gather_simple(const void *sendbuf, const int rank = comm_ptr->rank; const int size = comm_ptr->local_size; const struct MPIDI_Comm* const mpid = &(comm_ptr->mpid); +#if ASSERT_LEVEL==0 + /* We can't afford the tracing in ndebug/performance libraries */ + const unsigned verbose = 0; +#else + const unsigned verbose = (MPIDI_Process.verbose >= MPIDI_VERBOSE_DETAILS_ALL) && (rank == 0); +#endif if(sendbuf != MPI_IN_PLACE) { @@ -419,6 +425,14 @@ int MPIDO_Gather_simple(const void *sendbuf, recvbuf, recvcount, recvtype, root, comm_ptr, mpierrno); } + else if(advisor_algorithms[0].metadata && advisor_algorithms[0].metadata->check_correct.values.asyncflowctl && !(--(comm_ptr->mpid.num_requests))) + { + comm_ptr->mpid.num_requests = MPIDI_Process.optimized.num_requests; + int tmpmpierrno; + if(unlikely(verbose)) + fprintf(stderr,"Query barrier required for %s\n", advisor_algorithms[0].metadata->name); + MPIDO_Barrier(comm_ptr, &tmpmpierrno); + } } } @@ -453,6 +467,15 @@ int MPIDO_Gather_simple(const void *sendbuf, recvbuf, recvcount, recvtype, root, comm_ptr, mpierrno); } + else if(advisor_algorithms[0].metadata && advisor_algorithms[0].metadata->check_correct.values.asyncflowctl && !(--(comm_ptr->mpid.num_requests))) + { + comm_ptr->mpid.num_requests = MPIDI_Process.optimized.num_requests; + int tmpmpierrno; + if(unlikely(verbose)) + fprintf(stderr,"Query barrier required for %s\n", advisor_algorithms[0].metadata->name); + MPIDO_Barrier(comm_ptr, &tmpmpierrno); + } + } } } diff --git a/src/mpid/pamid/src/coll/gatherv/mpido_gatherv.c b/src/mpid/pamid/src/coll/gatherv/mpido_gatherv.c index d7b9764..0c2556a 100644 --- a/src/mpid/pamid/src/coll/gatherv/mpido_gatherv.c +++ b/src/mpid/pamid/src/coll/gatherv/mpido_gatherv.c @@ -270,6 +270,12 @@ int MPIDO_Gatherv_simple(const void *sendbuf, volatile unsigned gatherv_active = 1; const int rank = comm_ptr->rank; const int size = comm_ptr->local_size; +#if ASSERT_LEVEL==0 + /* We can't afford the tracing in ndebug/performance libraries */ + const unsigned verbose = 0; +#else + const unsigned verbose = (MPIDI_Process.verbose >= MPIDI_VERBOSE_DETAILS_ALL) && (rank == 0); +#endif const struct MPIDI_Comm* const mpid = &(comm_ptr->mpid); int recvok=PAMI_SUCCESS, recvcontinuous=0; @@ -290,6 +296,14 @@ int MPIDO_Gatherv_simple(const void *sendbuf, recvbuf, recvcounts, displs, recvtype, root, comm_ptr, mpierrno); } + else if(advisor_algorithms[0].metadata && advisor_algorithms[0].metadata->check_correct.values.asyncflowctl && !(--(comm_ptr->mpid.num_requests))) + { + comm_ptr->mpid.num_requests = MPIDI_Process.optimized.num_requests; + int tmpmpierrno; + if(unlikely(verbose)) + fprintf(stderr,"Query barrier required for %s\n", advisor_algorithms[0].metadata->name); + MPIDO_Barrier(comm_ptr, &tmpmpierrno); + } } } @@ -324,6 +338,14 @@ int MPIDO_Gatherv_simple(const void *sendbuf, recvbuf, recvcounts, displs, recvtype, root, comm_ptr, mpierrno); } + else if(advisor_algorithms[0].metadata && advisor_algorithms[0].metadata->check_correct.values.asyncflowctl && !(--(comm_ptr->mpid.num_requests))) + { + comm_ptr->mpid.num_requests = MPIDI_Process.optimized.num_requests; + int tmpmpierrno; + if(unlikely(verbose)) + fprintf(stderr,"Query barrier required for %s\n", advisor_algorithms[0].metadata->name); + MPIDO_Barrier(comm_ptr, &tmpmpierrno); + } } } } diff --git a/src/mpid/pamid/src/coll/reduce/mpido_reduce.c b/src/mpid/pamid/src/coll/reduce/mpido_reduce.c index 5a53b48..9a0055e 100644 --- a/src/mpid/pamid/src/coll/reduce/mpido_reduce.c +++ b/src/mpid/pamid/src/coll/reduce/mpido_reduce.c @@ -270,6 +270,13 @@ int MPIDO_Reduce_simple(const void *sendbuf, pami_type_t pdt; int rc; int alg_selected = 0; + const int rank = comm_ptr->rank; +#if ASSERT_LEVEL==0 + /* We can't afford the tracing in ndebug/performance libraries */ + const unsigned verbose = 0; +#else + const unsigned verbose = (MPIDI_Process.verbose >= MPIDI_VERBOSE_DETAILS_ALL) && (rank == 0); +#endif const struct MPIDI_Comm* const mpid = &(comm_ptr->mpid); @@ -284,6 +291,14 @@ int MPIDO_Reduce_simple(const void *sendbuf, { return MPIR_Reduce(sendbuf, recvbuf, count, datatype, op, root, comm_ptr, mpierrno); } + else if(advisor_algorithms[0].metadata && advisor_algorithms[0].metadata->check_correct.values.asyncflowctl && !(--(comm_ptr->mpid.num_requests))) + { + comm_ptr->mpid.num_requests = MPIDI_Process.optimized.num_requests; + int tmpmpierrno; + if(unlikely(verbose)) + fprintf(stderr,"Query barrier required for %s\n", advisor_algorithms[0].metadata->name); + MPIDO_Barrier(comm_ptr, &tmpmpierrno); + } } } diff --git a/src/mpid/pamid/src/coll/scan/mpido_scan.c b/src/mpid/pamid/src/coll/scan/mpido_scan.c index 429b355..a6452dc 100644 --- a/src/mpid/pamid/src/coll/scan/mpido_scan.c +++ b/src/mpid/pamid/src/coll/scan/mpido_scan.c @@ -299,6 +299,12 @@ int MPIDO_Doscan_simple(const void *sendbuf, void *recvbuf, else return MPIR_Scan(sendbuf, recvbuf, count, datatype, op, comm_ptr, mpierrno); } + else if(advisor_algorithms[0].metadata && advisor_algorithms[0].metadata->check_correct.values.asyncflowctl && !(--(comm_ptr->mpid.num_requests))) + { + comm_ptr->mpid.num_requests = MPIDI_Process.optimized.num_requests; + int tmpmpierrno; + MPIDO_Barrier(comm_ptr, &tmpmpierrno); + } } } diff --git a/src/mpid/pamid/src/coll/scatter/mpido_scatter.c b/src/mpid/pamid/src/coll/scatter/mpido_scatter.c index 58d371f..b96dc92 100644 --- a/src/mpid/pamid/src/coll/scatter/mpido_scatter.c +++ b/src/mpid/pamid/src/coll/scatter/mpido_scatter.c @@ -367,6 +367,12 @@ int MPIDO_Scatter_simple(const void *sendbuf, recvbuf, recvcount, recvtype, root, comm_ptr, mpierrno); } + else if(advisor_algorithms[0].metadata && advisor_algorithms[0].metadata->check_correct.values.asyncflowctl && !(--(comm_ptr->mpid.num_requests))) + { + comm_ptr->mpid.num_requests = MPIDI_Process.optimized.num_requests; + int tmpmpierrno; + MPIDO_Barrier(comm_ptr, &tmpmpierrno); + } } } } @@ -387,6 +393,13 @@ int MPIDO_Scatter_simple(const void *sendbuf, recvbuf, recvcount, recvtype, root, comm_ptr, mpierrno); } + else if(advisor_algorithms[0].metadata && advisor_algorithms[0].metadata->check_correct.values.asyncflowctl && !(--(comm_ptr->mpid.num_requests))) + { + comm_ptr->mpid.num_requests = MPIDI_Process.optimized.num_requests; + int tmpmpierrno; + MPIDO_Barrier(comm_ptr, &tmpmpierrno); + } + } } } diff --git a/src/mpid/pamid/src/coll/scatterv/mpido_scatterv.c b/src/mpid/pamid/src/coll/scatterv/mpido_scatterv.c index 26b8056..ae0a0aa 100644 --- a/src/mpid/pamid/src/coll/scatterv/mpido_scatterv.c +++ b/src/mpid/pamid/src/coll/scatterv/mpido_scatterv.c @@ -492,6 +492,13 @@ int MPIDO_Scatterv_simple(const void *sendbuf, recvbuf, recvcount, recvtype, root, comm_ptr, mpierrno); } + else if(advisor_algorithms[0].metadata && advisor_algorithms[0].metadata->check_correct.values.asyncflowctl && !(--(comm_ptr->mpid.num_requests))) + { + comm_ptr->mpid.num_requests = MPIDI_Process.optimized.num_requests; + int tmpmpierrno; + MPIDO_Barrier(comm_ptr, &tmpmpierrno); + } + } } } @@ -512,6 +519,13 @@ int MPIDO_Scatterv_simple(const void *sendbuf, recvbuf, recvcount, recvtype, root, comm_ptr, mpierrno); } + else if(advisor_algorithms[0].metadata && advisor_algorithms[0].metadata->check_correct.values.asyncflowctl && !(--(comm_ptr->mpid.num_requests))) + { + comm_ptr->mpid.num_requests = MPIDI_Process.optimized.num_requests; + int tmpmpierrno; + MPIDO_Barrier(comm_ptr, &tmpmpierrno); + } + } } } diff --git a/src/mpid/pamid/src/mpid_init.c b/src/mpid/pamid/src/mpid_init.c index 6abb609..f95dc0e 100644 --- a/src/mpid/pamid/src/mpid_init.c +++ b/src/mpid/pamid/src/mpid_init.c @@ -125,7 +125,7 @@ MPIDI_Process_t MPIDI_Process = { .subcomms = 1, .select_colls = 2, .memory = 0, - .num_requests = 1, + .num_requests = 16, }, .mpir_nbc = 1, ----------------------------------------------------------------------- Summary of changes: .../pamid/src/coll/allgather/mpido_allgather.c | 14 ++++++++++++ .../pamid/src/coll/allgatherv/mpido_allgatherv.c | 14 ++++++++++++ src/mpid/pamid/src/coll/alltoall/mpido_alltoall.c | 14 ++++++++++++ .../pamid/src/coll/alltoallv/mpido_alltoallv.c | 14 ++++++++++++ src/mpid/pamid/src/coll/bcast/mpido_bcast.c | 14 ++++++++++++ src/mpid/pamid/src/coll/gather/mpido_gather.c | 23 ++++++++++++++++++++ src/mpid/pamid/src/coll/gatherv/mpido_gatherv.c | 22 +++++++++++++++++++ src/mpid/pamid/src/coll/reduce/mpido_reduce.c | 15 +++++++++++++ src/mpid/pamid/src/coll/scan/mpido_scan.c | 6 +++++ src/mpid/pamid/src/coll/scatter/mpido_scatter.c | 13 +++++++++++ src/mpid/pamid/src/coll/scatterv/mpido_scatterv.c | 14 ++++++++++++ src/mpid/pamid/src/mpid_init.c | 2 +- 12 files changed, 164 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-41-g5477bbd
by noreply＠mpich.org 13 Mar '14

13 Mar '14

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 5477bbdcae1101334d78e12cbde1ac295c83811d (commit) from f74856274204607a44a17db21290e6066822ec2c (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/5477bbdcae1101334d78e12cbde1ac295… commit 5477bbdcae1101334d78e12cbde1ac295c83811d Author: Rob Latham <robl(a)mcs.anl.gov> Date: Tue Mar 11 15:09:14 2014 -0500 better error handling for NULL filename In the unlikley event that someone checks error codes, let them know they might want to pass a non-null filename to MPI-IO Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/mpi/romio/adio/common/ad_fstype.c b/src/mpi/romio/adio/common/ad_fstype.c index 12fe676..ca97129 100644 --- a/src/mpi/romio/adio/common/ad_fstype.c +++ b/src/mpi/romio/adio/common/ad_fstype.c @@ -649,6 +649,10 @@ void ADIO_ResolveFileType(MPI_Comm comm, const char *filename, int *fstype, static char myname[] = "ADIO_RESOLVEFILETYPE"; file_system = -1; + if (filename == NULL) { + *error_code = ADIOI_Err_create_code(myname, filename, ENOENT); + return; + } tmp = strchr(filename, ':'); if (!tmp) { int have_nfs_enabled=0; ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/common/ad_fstype.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-40-gf748562
by noreply＠mpich.org 11 Mar '14

11 Mar '14

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 f74856274204607a44a17db21290e6066822ec2c (commit) from c4269da24a74fbaa264a5954e5020033ae625b06 (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/f74856274204607a44a17db21290e6066… commit f74856274204607a44a17db21290e6066822ec2c Author: Michael Blocksome <blocksom(a)us.ibm.com> Date: Tue Mar 11 14:51:11 2014 -0500 Uninitialized variable in pamid 'MPID_Win_test' function Thanks be to Charles :) Signed-off-by: Su Huang <suhuang(a)us.ibm.com> diff --git a/src/mpid/pamid/src/onesided/mpid_win_pscw.c b/src/mpid/pamid/src/onesided/mpid_win_pscw.c index ff22460..b2cc6a4 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_pscw.c +++ b/src/mpid/pamid/src/onesided/mpid_win_pscw.c @@ -262,6 +262,7 @@ MPID_Win_test(MPID_Win *win, } else { + *flag = 0; MPID_Progress_poke(); } ----------------------------------------------------------------------- Summary of changes: src/mpid/pamid/src/onesided/mpid_win_pscw.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-39-gc4269da
by noreply＠mpich.org 10 Mar '14

10 Mar '14

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 c4269da24a74fbaa264a5954e5020033ae625b06 (commit) via f4814818573468a0bafc5d9fa5a6e5959548e6c2 (commit) via 36853bb77d2b0cd9b947ca24f476c2004c8116b0 (commit) via 19ce8407a64b76e1243b03fd50867b3a246c76d9 (commit) via f273a6ffafb2e63367a27d545bee3d12d7013091 (commit) via 53f11fd73b2f9aa7b994e78ed05e9ae74264c63f (commit) via 832b94d1f22aa979fe680177579cac87c0d42d25 (commit) via 85e0250e830ed6e018cc894b8b7cf92d4002fc7f (commit) via 102e9ead83ceb9a33aaa5d695e6eb8518721ed7a (commit) via 52937c7bde679da4a500799bfc7d2f9892f9dbcd (commit) via fa20c7c068e4f229ac2173181d8bf6e6ab0623f0 (commit) from 6f6e2dccc70fb7835275524e866f48357de81dab (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/c4269da24a74fbaa264a5954e5020033a… commit c4269da24a74fbaa264a5954e5020033ae625b06 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Tue Mar 4 16:38:35 2014 -0600 request newer features for pread/pwrite Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpi/romio/adio/ad_lustre/ad_lustre_rwcontig.c b/src/mpi/romio/adio/ad_lustre/ad_lustre_rwcontig.c index 3dfdb48..fc4fd89 100644 --- a/src/mpi/romio/adio/ad_lustre/ad_lustre_rwcontig.c +++ b/src/mpi/romio/adio/ad_lustre/ad_lustre_rwcontig.c @@ -8,6 +8,9 @@ * Copyright (C) 2008 Sun Microsystems, Lustre group */ +#define _XOPEN_SOURCE 500 +#include <unistd.h> + #include <stdlib.h> #include <malloc.h> #include "ad_lustre.h" http://git.mpich.org/mpich.git/commitdiff/f4814818573468a0bafc5d9fa5a6e5959… commit f4814818573468a0bafc5d9fa5a6e5959548e6c2 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Tue Mar 4 16:35:37 2014 -0600 fix PVFS2 compile error with hint processing I have the PVFS/Orangefs headers on my system now, so problems like this will stop happening. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_hints.c b/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_hints.c index 217a223..4752206 100644 --- a/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_hints.c +++ b/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_hints.c @@ -85,27 +85,27 @@ void ADIOI_PVFS2_SetInfo(ADIO_File fd, MPI_Info users_info, int *error_code) /* POSIX read */ ADIOI_Info_check_and_install_enabled(fd, users_info, "romio_pvfs2_posix_read", - &(fd->hints->pvfs2.posix_read), myname, error_code); + &(fd->hints->fs_hints.pvfs2.posix_read), myname, error_code); /* POSIX write */ ADIOI_Info_check_and_install_enabled(fd, users_info, "romio_pvfs2_posix_write", - &(fd->hints->pvfs2.posix_write), myname, error_code); + &(fd->hints->fs_hints.pvfs2.posix_write), myname, error_code); /* Datatype read */ ADIOI_Info_check_and_install_enabled(fd, users_info, "romio_pvfs2_dtype_read", - &(fd->hints->pvfs2.dtype_read), myname, error_code); + &(fd->hints->fs_hints.pvfs2.dtype_read), myname, error_code); /* Datatype write */ ADIOI_Info_check_and_install_enabled(fd, users_info, "romio_pvfs2_dtype_write", - &(fd->hints->pvfs2.dtype_write), myname, error_code); + &(fd->hints->fs_hints.pvfs2.dtype_write), myname, error_code); /* Listio read */ ADIOI_Info_check_and_install_enabled(fd, users_info, "romio_pvfs2_listio_read", - &(fd->hints->pvfs2.listio_read), myname, error_code); + &(fd->hints->fs_hints.pvfs2.listio_read), myname, error_code); /* Datatype write */ ADIOI_Info_check_and_install_enabled(fd, users_info, "romio_pvfs2_listio_write", - &(fd->hints->pvfs2.listio_write), myname, error_code); + &(fd->hints->fs_hints.pvfs2.listio_write), myname, error_code); ADIOI_Free(value); } } http://git.mpich.org/mpich.git/commitdiff/36853bb77d2b0cd9b947ca24f476c2004… commit 36853bb77d2b0cd9b947ca24f476c2004c8116b0 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Tue Mar 4 16:15:13 2014 -0600 incorrect header guards Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_common.h b/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_common.h index 453e233..f63f84a 100644 --- a/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_common.h +++ b/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_common.h @@ -5,8 +5,8 @@ * See COPYRIGHT notice in top-level directory. */ -#ifndef _AD_PVFS2_h -#define _AD_PVFS2_H +#ifndef _AD_PVFS2_COMMON_H +#define _AD_PVFS2_COMMON_H #include "ad_pvfs2.h" /* useful values: http://git.mpich.org/mpich.git/commitdiff/19ce8407a64b76e1243b03fd50867b3a2… commit 19ce8407a64b76e1243b03fd50867b3a246c76d9 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Fri Feb 28 13:26:23 2014 -0600 OpenMPI re-sync: remove unneeded end-of-script stuff ROMIO is rarely built standalone, and anyway in 2014 one should need no prompting to "type make". Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac index 7791545..0b1adbb 100644 --- a/src/mpi/romio/configure.ac +++ b/src/mpi/romio/configure.ac @@ -1827,11 +1827,5 @@ AC_CONFIG_FILES([ ]) AC_OUTPUT -# -rm -f *.o - -if test $FROM_MPICH = no ; then - AC_MSG_RESULT([Configure done. Now type make.]) -fi dnl PAC_SUBDIR_CACHE_CLEANUP exit 0 http://git.mpich.org/mpich.git/commitdiff/f273a6ffafb2e63367a27d545bee3d12d… commit f273a6ffafb2e63367a27d545bee3d12d7013091 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Fri Feb 28 13:24:35 2014 -0600 OpenMPI resync: teach ROMIO about OpenMPI option Drive down the differences between OpenMPI's ROMIO and "upstream" ROMIO (us) by teaching ROMIO what to do if it might be part of OpenMPI. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac index 4ad6be9..7791545 100644 --- a/src/mpi/romio/configure.ac +++ b/src/mpi/romio/configure.ac @@ -90,6 +90,10 @@ AC_ARG_VAR([FROM_LAM],[set to "yes" if building ROMIO inside of LAM]) FROM_LAM=${FROM_LAM:-no} if test "$FROM_LAM" = 1 ; then FROM_LAM=yes ; fi +AC_ARG_VAR([FROM_OMPI],[set to "yes" if building ROMIO inside of Open MPI]) +FROM_OMPI=${FROM_OMPI:-no} +if test "$FROM_OMPI" = 1 ; then FROM_OMPI=yes ; fi + CFLAGS=${CFLAGS:-""} LL="lld" AR_LOCAL="" @@ -130,7 +134,7 @@ TEST_F77="" # have_aio=no # -known_mpi_impls="mpich_mpi mpich_mpi sgi_mpi hp_mpi cray_mpi lam_mpi" +known_mpi_impls="mpich_mpi mpich_mpi sgi_mpi hp_mpi cray_mpi lam_mpi open_mpi_mpi" dnl An m4 macro for use with m4_foreach_w and friends. You should modify this dnl list if you want to add a known file system. The list is just whitespace @@ -269,11 +273,17 @@ AC_SUBST(htmldir) # If we are building within a known MPI implementation, we must avoid the # tests about an existing implementation -if test "$FROM_MPICH" != no -o "$FROM_LAM" != no ; then +if test "$FROM_MPICH" != no -o "$FROM_LAM" != no -o "$FROM_OMPI" != no ; then WITHIN_KNOWN_MPI_IMPL=yes else WITHIN_KNOWN_MPI_IMPL=no fi + +# Open MPI: Set the MPI implementation +if test "$FROM_OMPI" = "yes" ; then + MPI_IMPL=open_mpi +fi + # check for valid MPI implementation if test -n "$MPI_IMPL" ; then found=no @@ -1501,7 +1511,28 @@ fi # TEST_LIBNAME=$LIBNAME MPIRUN=mpirun -if test $FROM_LAM = yes ; then +if test $FROM_OMPI = yes ; then + # Open MPI does have the status set bytes functionality + + AC_DEFINE(HAVE_STATUS_SET_BYTES,1,[Define if have MPIR_Status_set_bytes]) + + # Used in the tests/ subdirectory for after ROMIO is built + + TEST_CC=mpicc + TEST_F77=mpif77 + MPIRUN=mpirun + MPI_LIB= + NOPROFILE=1 + ROMIO_INCLUDE= + USER_CFLAGS= + USER_FFLAGS= + TEST_LIBNAME= + AC_DEFINE(HAVE_MPI_DARRAY_SUBARRAY,1,[Define if Darray is available]) + HAVE_MPI_DARRAY_SUBARRAY="#define HAVE_MPI_DARRAY_SUBARRAY" + # Open MPI: see comments in mpi-io/mpioprof.h + AC_DEFINE(MPIO_BUILD_PROFILING, 1, [hack to make ROMIO build without profiling]) + DEFINE_HAVE_MPI_GREQUEST="#define HAVE_MPI_GREQUEST" +elif test $FROM_LAM = yes ; then # LAM does have the status set bytes functionality AC_DEFINE(HAVE_STATUS_SET_BYTES,1,[Define if have MPIR_Status_set_bytes]) @@ -1623,11 +1654,14 @@ EXTRA_SRC_DIRS="" mpio_glue="" if test "$FROM_MPICH" = yes -o "${MPI_IMPL}_mpi" = "mpich_mpi"; then mpio_glue=mpich +elif test "$FROM_OMPI" = yes -o "${MPI_IMPL}_mpi" = "open_mpi_mpi" ; then + mpio_glue=openmpi else mpio_glue=default fi AM_CONDITIONAL([MPIO_GLUE_MPICH],[test "X$mpio_glue" = "Xmpich"]) +AM_CONDITIONAL([MPIO_GLUE_OPENMPI],[test "X$mpio_glue" = "Xopenmpi"]) AM_CONDITIONAL([MPIO_GLUE_DEFAULT],[test "X$mpio_glue" = "Xdefault"]) if test "$BUILD_MPI_INFO" = 1 ; then diff --git a/src/mpi/romio/mpi-io/glue/openmpi/Makefile.mk b/src/mpi/romio/mpi-io/glue/openmpi/Makefile.mk new file mode 100644 index 0000000..ab7c150 --- /dev/null +++ b/src/mpi/romio/mpi-io/glue/openmpi/Makefile.mk @@ -0,0 +1,13 @@ +## -*- Mode: Makefile; -*- +## vim: set ft=automake : +## +## (C) 2011 by Argonne National Laboratory. +## See COPYRIGHT in top-level directory. +## + +if MPIO_GLUE_OPENMPI +romio_other_sources += \ + mpi-io/glue/openmpi/mpio_file.c \ + mpi-io/glue/openmpi/mpio_err.c +endif MPIO_GLUE_OPENMPI + diff --git a/src/mpi/romio/mpi-io/glue/openmpi/mpio_err.c b/src/mpi/romio/mpi-io/glue/openmpi/mpio_err.c new file mode 100644 index 0000000..2dddaee --- /dev/null +++ b/src/mpi/romio/mpi-io/glue/openmpi/mpio_err.c @@ -0,0 +1,52 @@ +/* -*- Mode: C; c-basic-offset:4 ; -*- */ +/* + * Copyright (C) 2004 University of Chicago. + * See COPYRIGHT notice in top-level directory. + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "mpioimpl.h" +#include "adio_extern.h" + +/* Default error handling implementation. + * + * Note that only MPI_ERRORS_ARE_FATAL and MPI_ERRORS_RETURN are + * handled correctly; other handlers cause an abort. + */ + +int MPIO_Err_create_code(int lastcode, int fatal, const char fcname[], + int line, int error_class, const char generic_msg[], + const char specific_msg[], ...) +{ + va_list Argp; + int idx = 0; + char *buf; + + buf = (char *) ADIOI_Malloc(1024); + if (buf != NULL) { + idx += ADIOI_Snprintf(buf, 1023, "%s (line %d): ", fcname, line); + if (specific_msg == NULL) { + ADIOI_Snprintf(&buf[idx], 1023 - idx, "%s\n", generic_msg); + } + else { + va_start(Argp, specific_msg); + vsnprintf(&buf[idx], 1023 - idx, specific_msg, Argp); + va_end(Argp); + } + ADIOI_Free(buf); + } + + return error_class; +} + +int MPIO_Err_return_file(MPI_File mpi_fh, int error_code) +{ + return error_code; +} + +int MPIO_Err_return_comm(MPI_Comm mpi_comm, int error_code) +{ + return error_code; +} diff --git a/src/mpi/romio/mpi-io/glue/openmpi/mpio_file.c b/src/mpi/romio/mpi-io/glue/openmpi/mpio_file.c new file mode 100644 index 0000000..e3ac2e7 --- /dev/null +++ b/src/mpi/romio/mpi-io/glue/openmpi/mpio_file.c @@ -0,0 +1,95 @@ +/* -*- Mode: C; c-basic-offset:4 ; -*- */ +/* + * + * Copyright (C) 2004 University of Chicago. + * See COPYRIGHT notice in top-level directory. + */ + +#include "mpioimpl.h" + +#include "adio_extern.h" + +/* Hooks for allocation of MPI_File handles. + * + * Three functions are used in ROMIO for allocation/deallocation + * of MPI_File structures: + * - MPIO_File_create(size) + * - MPIO_File_resolve(mpi_fh) + * - MPIO_File_free(mpi_fh) + * + */ + +MPI_File MPIO_File_create(int size) +{ + MPI_File mpi_fh; + + mpi_fh = (MPI_File) ADIOI_Calloc(size, 1); + return mpi_fh; +} + +ADIO_File MPIO_File_resolve(MPI_File mpi_fh) +{ + return mpi_fh; +} + +void MPIO_File_free(MPI_File * mpi_fh) +{ + ADIOI_Free(*mpi_fh); + *mpi_fh = MPI_FILE_NULL; +} + +/* these functions aren't needed with the way Open MPI uses ROMIO */ +#if 0 + + +MPI_File MPIO_File_f2c(MPI_Fint fh) +{ +#ifndef INT_LT_POINTER + return (MPI_File) ((void *) fh); + /* the extra cast is to get rid of a compiler warning on Exemplar. + * The warning is because MPI_File points to a structure containing + * longlongs, which may be 8-byte aligned. But MPI_Fint itself + * may not be 8-byte aligned. */ +#else + if (!fh) + return MPI_FILE_NULL; + if ((fh < 0) || (fh > ADIOI_Ftable_ptr)) { + FPRINTF(stderr, "MPI_File_f2c: Invalid file handle\n"); + MPI_Abort(MPI_COMM_WORLD, 1); + } + return ADIOI_Ftable[fh]; +#endif +} + +MPI_Fint MPIO_File_c2f(MPI_File fh) +{ +#ifndef INT_LT_POINTER + return (MPI_Fint) fh; +#else + int i; + + if ((fh <= (MPI_File) 0) || (fh->cookie != ADIOI_FILE_COOKIE)) + return (MPI_Fint) 0; + if (!ADIOI_Ftable) { + ADIOI_Ftable_max = 1024; + ADIOI_Ftable = (MPI_File *) + ADIOI_Malloc(ADIOI_Ftable_max * sizeof(MPI_File)); + ADIOI_Ftable_ptr = 0; /* 0 can't be used though, because + * MPI_FILE_NULL=0 */ + for (i = 0; i < ADIOI_Ftable_max; i++) + ADIOI_Ftable[i] = MPI_FILE_NULL; + } + if (ADIOI_Ftable_ptr == ADIOI_Ftable_max - 1) { + ADIOI_Ftable = (MPI_File *) ADIOI_Realloc(ADIOI_Ftable, + (ADIOI_Ftable_max + 1024) * sizeof(MPI_File)); + for (i = ADIOI_Ftable_max; i < ADIOI_Ftable_max + 1024; i++) + ADIOI_Ftable[i] = MPI_FILE_NULL; + ADIOI_Ftable_max += 1024; + } + ADIOI_Ftable_ptr++; + ADIOI_Ftable[ADIOI_Ftable_ptr] = fh; + return (MPI_Fint) ADIOI_Ftable_ptr; +#endif +} + +#endif /* #if 0 */ http://git.mpich.org/mpich.git/commitdiff/53f11fd73b2f9aa7b994e78ed05e9ae74… commit 53f11fd73b2f9aa7b994e78ed05e9ae74264c63f Author: Rob Latham <robl(a)mcs.anl.gov> Date: Fri Feb 28 10:43:49 2014 -0600 OpenMPI resync: converted wrong buffer in external32 Was converting to and from the same buffer in some cases. OpenMPI SVN r30319 Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpi/romio/mpi-io/read.c b/src/mpi/romio/mpi-io/read.c index 92f11c8..d531a47 100644 --- a/src/mpi/romio/mpi-io/read.c +++ b/src/mpi/romio/mpi-io/read.c @@ -171,7 +171,7 @@ int MPIOI_File_read(MPI_File fh, /* --END ERROR HANDLING-- */ if (e32_buf != NULL) { - error_code = MPIU_read_external32_conversion_fn(xbuf, datatype, + error_code = MPIU_read_external32_conversion_fn(buf, datatype, count, e32_buf); ADIOI_Free(e32_buf); } http://git.mpich.org/mpich.git/commitdiff/832b94d1f22aa979fe680177579cac87c… commit 832b94d1f22aa979fe680177579cac87c0d42d25 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Fri Feb 28 10:32:00 2014 -0600 Romio portability: check for extended greqs This should help OpenMPI next time they want to re-sync. Sort of based on OpenMPI SVN r27501, but now actually checks. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/confdb/aclocal_romio.m4 b/confdb/aclocal_romio.m4 index b0753a4..39dd76d 100644 --- a/confdb/aclocal_romio.m4 +++ b/confdb/aclocal_romio.m4 @@ -833,3 +833,26 @@ EOF fi rm -f conftest$EXEEXT mpitest.c ])dnl + +define(PAC_TEST_MPI_GREQUEST_EXTENSIONS,[ + AC_MSG_CHECKING(support for non-standard extended generalized requests) + rm -f mpitest.c + cat > mpitest.c <<EOF +#include "mpi.h" +#include "stdio.h" + main(int argc, char **argv) + { + MPIX_Grequest_class classtest + } +EOF + rm -f conftest$EXEEXT + $CC $USER_CFLAGS -I$MPI_INCLUDE_DIR -o conftest$EXEEXT mpitest.c $MPI_LIB > /dev/null 2>&1 + if test -x conftest$EXEEXT ; then + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_MPI_GREQUEST_EXTENTIONS,1,[Define if non-standard generalized requests extensions avaliable]) + DEFINE_HAVE_MPI_GREQUEST_EXTENSIONS="#define HAVE_MPI_GREQUEST_EXTENSIONS 1" + else + AC_MSG_RESULT(no) + fi + rm -f conftest$EXEEXT mpitest.c +])dnl diff --git a/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2.c b/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2.c index 55a7523..e2b8b0f 100644 --- a/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2.c +++ b/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2.c @@ -7,8 +7,7 @@ #include "ad_pvfs2.h" -/* adioi.h has the ADIOI_Fns_struct define */ -#include "adioi.h" +#include "adio.h" struct ADIOI_Fns_struct ADIO_PVFS2_operations = { ADIOI_PVFS2_Open, /* Open */ @@ -23,8 +22,13 @@ struct ADIOI_Fns_struct ADIO_PVFS2_operations = { ADIOI_PVFS2_ReadStrided, /* ReadStrided */ ADIOI_PVFS2_WriteStrided, /* WriteStrided */ ADIOI_PVFS2_Close, /* Close */ +#ifdef HAVE_MPI_GREQUEST_EXTENSIONS ADIOI_PVFS2_IReadContig, /* IreadContig */ ADIOI_PVFS2_IWriteContig, /* IwriteContig */ +#else + ADIOI_FAKE_IreadContig, /* IreadContig */ + ADIOI_FAKE_IwriteContig, /* IwriteContig */ +#endif ADIOI_FAKE_IODone, /* ReadDone */ ADIOI_FAKE_IODone, /* WriteDone */ ADIOI_FAKE_IOComplete, /* ReadComplete */ diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac index 2e03292..4ad6be9 100644 --- a/src/mpi/romio/configure.ac +++ b/src/mpi/romio/configure.ac @@ -1546,6 +1546,7 @@ elif test $FROM_MPICH = yes ; then EXTRA_DIRS="" AC_DEFINE(HAVE_STATUS_SET_BYTES,1,[Define if status_set_bytes available]) DEFINE_HAVE_MPI_GREQUEST="#define HAVE_MPI_GREQUEST 1" + DEFINE_HAVE_MPI_GREQUEST_EXTENSIONS="#define HAVE_MPI_GREQUEST_EXTENSIONS 1" AC_DEFINE(HAVE_MPIU_FUNCS,1,[Define if MPICH memory tracing macros defined]) AC_DEFINE(HAVE_MPIX_H, 1, []) AC_DEFINE(HAVE_MPIIO_CONST, const, Set if MPI-IO prototypes use const qualifier) http://git.mpich.org/mpich.git/commitdiff/85e0250e830ed6e018cc894b8b7cf92d4… commit 85e0250e830ed6e018cc894b8b7cf92d4002fc7f Author: Rob Latham <robl(a)mcs.anl.gov> Date: Fri Feb 28 10:15:13 2014 -0600 OpenMPI-resync: housekeeping: clean up MIN macro Basic rule for C macros: wrap the macro arguments with parens to prevent unexpected order of operations. From OpenMPI SVN r24356 Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpi/romio/adio/ad_bg/ad_bg_pset.h b/src/mpi/romio/adio/ad_bg/ad_bg_pset.h index ab57e46..b1ed6bc 100644 --- a/src/mpi/romio/adio/ad_bg/ad_bg_pset.h +++ b/src/mpi/romio/adio/ad_bg/ad_bg_pset.h @@ -48,7 +48,7 @@ typedef struct { #undef MIN -#define MIN(a,b) ((a<b ? a : b)) +#define MIN(a,b) (((a)<(b) ? (a) : (b))) diff --git a/src/mpi/romio/adio/ad_bgl/ad_bgl_pset.h b/src/mpi/romio/adio/ad_bgl/ad_bgl_pset.h index f6a9164..774e04a 100644 --- a/src/mpi/romio/adio/ad_bgl/ad_bgl_pset.h +++ b/src/mpi/romio/adio/ad_bgl/ad_bgl_pset.h @@ -49,7 +49,7 @@ typedef struct { #undef MIN -#define MIN(a,b) ((a<b ? a : b)) +#define MIN(a,b) (((a)<(b) ? (a) : (b))) /* Default is to choose 8 aggregator nodes in each 32 CN pset. http://git.mpich.org/mpich.git/commitdiff/102e9ead83ceb9a33aaa5d695e6eb8518… commit 102e9ead83ceb9a33aaa5d695e6eb8518721ed7a Author: Rob Latham <robl(a)mcs.anl.gov> Date: Fri Feb 28 10:09:39 2014 -0600 Ompi re-sync: check for statfs function Seems unlikely that anything *doesn't* have statfs these days, but OpenMPI SVN r22547 added this check for Catamount. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpi/romio/adio/common/ad_fstype.c b/src/mpi/romio/adio/common/ad_fstype.c index 145bda2..12fe676 100644 --- a/src/mpi/romio/adio/common/ad_fstype.c +++ b/src/mpi/romio/adio/common/ad_fstype.c @@ -326,7 +326,7 @@ static void ADIO_FileSysType_fncall(const char *filename, int *fstype, int *erro /* --END ERROR HANDLING-- */ #endif /* STATVFS APPROACH */ -#ifdef HAVE_STRUCT_STATFS +#if defined(HAVE_STRUCT_STATFS) && defined(HAVE_STATFS) retry_cnt = 0; do { err = statfs(filename, &fsbuf); diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac index e9d388d..2e03292 100644 --- a/src/mpi/romio/configure.ac +++ b/src/mpi/romio/configure.ac @@ -1244,6 +1244,7 @@ fi # Check for statfs (many) and specifically f_fstypename field (BSD) # AC_CHECK_HEADERS(sys/vfs.h sys/param.h sys/mount.h sys/statvfs.h) +AC_CHECK_FUNCS([statfs]) AC_MSG_CHECKING([whether struct statfs properly defined]) AC_TRY_COMPILE([ #ifdef HAVE_SYS_VFS_H http://git.mpich.org/mpich.git/commitdiff/52937c7bde679da4a500799bfc7d2f989… commit 52937c7bde679da4a500799bfc7d2f9892f9dbcd Author: Rob Latham <robl(a)mcs.anl.gov> Date: Fri Feb 28 09:42:44 2014 -0600 avoid ompi redefinition of MPI_MAX_DATAREP_STRING. OpenMPI defines this constant in mpi.h See OpenMPI svn revsion r21307 Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpi/romio/include/mpio.h.in b/src/mpi/romio/include/mpio.h.in index a860cbe..5ad085f 100644 --- a/src/mpi/romio/include/mpio.h.in +++ b/src/mpi/romio/include/mpio.h.in @@ -92,7 +92,11 @@ typedef int MPI_Fint; #define MPI_SEEK_CUR 602 #define MPI_SEEK_END 604 +/* Open MPI: don't define MPI_MAX_DATAREP_STRING here; it's defined in + OMPI's mpi.h. */ +#ifndef OPEN_MPI #define MPI_MAX_DATAREP_STRING 128 +#endif #ifndef HAVE_MPI_DARRAY_SUBARRAY @HAVE_MPI_DARRAY_SUBARRAY@ http://git.mpich.org/mpich.git/commitdiff/fa20c7c068e4f229ac2173181d8bf6e6a… commit fa20c7c068e4f229ac2173181d8bf6e6ab0623f0 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Thu Feb 27 11:15:23 2014 -0600 panasas: some layout types not handled from OpenMPI SVN, revision r17543 Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpi/romio/adio/ad_panfs/ad_panfs_open.c b/src/mpi/romio/adio/ad_panfs/ad_panfs_open.c index c052c83..161fd48 100644 --- a/src/mpi/romio/adio/ad_panfs/ad_panfs_open.c +++ b/src/mpi/romio/adio/ad_panfs/ad_panfs_open.c @@ -327,6 +327,10 @@ void ADIOI_PANFS_Open(ADIO_File fd, int *error_code) ADIOI_Snprintf(temp_buffer,TEMP_BUFFER_SIZE,"%u",file_query_args.layout.u.raid10.layout_visit_policy); ADIOI_Info_set(fd->info, "panfs_layout_visit_policy", temp_buffer); break; + case PAN_FS_CLIENT_LAYOUT_TYPE__INVALID: + case PAN_FS_CLIENT_LAYOUT_TYPE__DEFAULT: + MPI_Info_set(fd->info, "panfs_layout_type", + "PAN_FS_CLIENT_LAYOUT_TYPE__INVALID"); default: break; } ----------------------------------------------------------------------- Summary of changes: confdb/aclocal_romio.m4 | 23 +++++ src/mpi/romio/adio/ad_bg/ad_bg_pset.h | 2 +- src/mpi/romio/adio/ad_bgl/ad_bgl_pset.h | 2 +- src/mpi/romio/adio/ad_lustre/ad_lustre_rwcontig.c | 3 + src/mpi/romio/adio/ad_panfs/ad_panfs_open.c | 4 + src/mpi/romio/adio/ad_pvfs2/ad_pvfs2.c | 8 ++- src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_common.h | 4 +- src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_hints.c | 12 ++-- src/mpi/romio/adio/common/ad_fstype.c | 2 +- src/mpi/romio/configure.ac | 48 ++++++++-- src/mpi/romio/include/mpio.h.in | 4 + .../mpi-io/glue/{default => openmpi}/Makefile.mk | 8 +- src/mpi/romio/mpi-io/glue/openmpi/mpio_err.c | 52 +++++++++++ src/mpi/romio/mpi-io/glue/openmpi/mpio_file.c | 95 ++++++++++++++++++++ src/mpi/romio/mpi-io/read.c | 2 +- 15 files changed, 242 insertions(+), 27 deletions(-) copy src/mpi/romio/mpi-io/glue/{default => openmpi}/Makefile.mk (61%) create mode 100644 src/mpi/romio/mpi-io/glue/openmpi/mpio_err.c create mode 100644 src/mpi/romio/mpi-io/glue/openmpi/mpio_file.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-28-g6f6e2dc
by noreply＠mpich.org 10 Mar '14

10 Mar '14

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 6f6e2dccc70fb7835275524e866f48357de81dab (commit) from e65d15dcd45aa30c20b697e7762e79016ff02ec7 (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/6f6e2dccc70fb7835275524e866f48357… commit 6f6e2dccc70fb7835275524e866f48357de81dab Author: Huiwei Lu <huiweilu(a)mcs.anl.gov> Date: Sun Mar 9 16:27:24 2014 -0500 Fixes freeing uninitialized memory Last fix corrected malloc(0) problem but forgot the free part. Fixes #2054 Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_finalize.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_finalize.c index ebd2792..272ac50 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_finalize.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_finalize.c @@ -34,7 +34,8 @@ int MPID_nem_finalize(void) MPIU_Free(MPID_nem_mem_region.FreeQ); MPIU_Free(MPID_nem_mem_region.RecvQ); MPIU_Free(MPID_nem_mem_region.local_ranks); - MPIU_Free(MPID_nem_mem_region.ext_ranks); + if (MPID_nem_mem_region.ext_procs > 0) + MPIU_Free(MPID_nem_mem_region.ext_ranks); MPIU_Free(MPID_nem_mem_region.seg); MPIU_Free(MPID_nem_mem_region.mailboxes.out); MPIU_Free(MPID_nem_mem_region.mailboxes.in); ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/src/mpid_nem_finalize.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-27-ge65d15d
by noreply＠mpich.org 08 Mar '14

08 Mar '14

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 e65d15dcd45aa30c20b697e7762e79016ff02ec7 (commit) from ff16f6f65cc4b92b37947bc3755f8bf129163f85 (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/e65d15dcd45aa30c20b697e7762e79016… commit e65d15dcd45aa30c20b697e7762e79016ff02ec7 Author: Huiwei Lu <huiweilu(a)mcs.anl.gov> Date: Fri Mar 7 16:06:38 2014 -0600 Fixes failing electric-fence check electric-fence tool detects malloc(0) in mpid_nem_init.c Fixes #2054 Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_init.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_init.c index 095ab20..6a23ed1 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_init.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_init.c @@ -183,7 +183,8 @@ MPID_nem_init(int pg_rank, MPIDI_PG_t *pg_p, int has_parent ATTRIBUTE((unused))) MPID_nem_mem_region.local_rank = local_rank; MPIU_CHKPMEM_MALLOC (MPID_nem_mem_region.local_ranks, int *, num_procs * sizeof(int), mpi_errno, "mem_region local ranks"); MPID_nem_mem_region.ext_procs = num_procs - num_local ; - MPIU_CHKPMEM_MALLOC (MPID_nem_mem_region.ext_ranks, int *, MPID_nem_mem_region.ext_procs * sizeof(int), mpi_errno, "mem_region ext ranks"); + if (MPID_nem_mem_region.ext_procs > 0) + MPIU_CHKPMEM_MALLOC (MPID_nem_mem_region.ext_ranks, int *, MPID_nem_mem_region.ext_procs * sizeof(int), mpi_errno, "mem_region ext ranks"); MPID_nem_mem_region.next = NULL; for (idx = 0 ; idx < num_procs; idx++) ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/channels/nemesis/src/mpid_nem_init.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-26-gff16f6f
by noreply＠mpich.org 04 Mar '14

04 Mar '14

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 ff16f6f65cc4b92b37947bc3755f8bf129163f85 (commit) via 974d50299cbcf2fd909d6b9a5d7d13f2a3c0a9c3 (commit) from c73c33196510911bd99ffbadcf04d1290e651d4d (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/ff16f6f65cc4b92b37947bc3755f8bf12… commit ff16f6f65cc4b92b37947bc3755f8bf129163f85 Author: Bob Cernohous <bobc(a)us.ibm.com> Date: Tue Oct 15 10:39:32 2013 -0500 Free the builtin communicators (world/self/iworld) Also, do not reserve the internal-only copy of comm world context id when it isn't being used (MPID_NEEDS_ICOMM_WORLD) See mpich.org ticket #1947 closes #1947 (ibm) 984acc33d6c8149987016b62da5afb36450be94e Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/mpid/pamid/src/mpid_finalize.c b/src/mpid/pamid/src/mpid_finalize.c index 82da86f..10d8dce 100644 --- a/src/mpid/pamid/src/mpid_finalize.c +++ b/src/mpid/pamid/src/mpid_finalize.c @@ -99,6 +99,13 @@ int MPID_Finalize() PAMIX_Finalize(MPIDI_Client); +#ifdef MPID_NEEDS_ICOMM_WORLD + MPIR_Comm_release_always(MPIR_Process.icomm_world, 0); +#endif + + MPIR_Comm_release_always(MPIR_Process.comm_self,0); + MPIR_Comm_release_always(MPIR_Process.comm_world,0); + rc = PAMI_Context_destroyv(MPIDI_Context, MPIDI_Process.avail_contexts); MPID_assert_always(rc == PAMI_SUCCESS); http://git.mpich.org/mpich.git/commitdiff/974d50299cbcf2fd909d6b9a5d7d13f2a… commit 974d50299cbcf2fd909d6b9a5d7d13f2a3c0a9c3 Author: Haizhu Liu <haizhu(a)us.ibm.com> Date: Fri Oct 11 10:48:18 2013 -0400 Fix Memory leak due to dynamic task change Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/mpid/pamid/src/dyntask/mpidi_pg.c b/src/mpid/pamid/src/dyntask/mpidi_pg.c index f59890d..7d59b3a 100644 --- a/src/mpid/pamid/src/dyntask/mpidi_pg.c +++ b/src/mpid/pamid/src/dyntask/mpidi_pg.c @@ -204,11 +204,11 @@ int MPIDI_PG_Finalize(void) fails to use MPI_Comm_disconnect on communicators that were created with the dynamic process routines.*/ /* XXX DJG FIXME-MT should we be checking this? */ - if (MPIU_Object_get_ref(pg) == 0 || 1) { + if (MPIU_Object_get_ref(pg) == 0 ) { if (pg == MPIDI_Process.my_pg) MPIDI_Process.my_pg = NULL; - MPIU_Object_set_ref(pg, 0); /* satisfy assertions in PG_Destroy */ - MPIDI_PG_Destroy( pg ); + MPIU_Object_set_ref(pg, 0); /* satisfy assertions in PG_Destroy */ + MPIDI_PG_Destroy( pg ); } pg = pgNext; } @@ -218,10 +218,9 @@ int MPIDI_PG_Finalize(void) point is that comm_world (and comm_self) still exist, and hence the usual process to free the related VC structures will not be invoked. */ - if (MPIDI_Process.my_pg) { - MPIDI_PG_Destroy(MPIDI_Process.my_pg); - } - MPIDI_Process.my_pg = NULL; + + /* The process group associated with MPI_COMM_WORLD will be + freed when MPI_COMM_WORLD is freed */ return mpi_errno; } diff --git a/src/mpid/pamid/src/dyntask/mpidi_port.c b/src/mpid/pamid/src/dyntask/mpidi_port.c index fcdbee1..2488ed6 100644 --- a/src/mpid/pamid/src/dyntask/mpidi_port.c +++ b/src/mpid/pamid/src/dyntask/mpidi_port.c @@ -693,10 +693,6 @@ int MPIDI_Comm_connect(const char *port_name, MPID_Info *info, int root, } TRACE_ERR("connect:free new vc\n"); - /* Free new_vc. It was explicitly allocated in MPIDI_Connect_to_root.*/ - if (rank == root) { - MPIU_Free( new_vc); - } fn_exit: if(local_translation) MPIU_Free(local_translation); @@ -1350,11 +1346,6 @@ int MPIDI_Comm_accept(const char *port_name, MPID_Info *info, int root, TRACE_ERR("MPIR_Barrier_intra returned with mpi_errno=%d\n", mpi_errno); } - /* Free new_vc once the connection is completed. */ - if (rank == root) { - MPIU_Free( new_vc ); - } - fn_exit: if(local_translation) MPIU_Free(local_translation); return mpi_errno; diff --git a/src/mpid/pamid/src/mpid_init.c b/src/mpid/pamid/src/mpid_init.c index 5a63d44..6abb609 100644 --- a/src/mpid/pamid/src/mpid_init.c +++ b/src/mpid/pamid/src/mpid_init.c @@ -1246,9 +1246,6 @@ int MPID_Init(int * argc, * for getting the business card */ MPIDI_Process.my_pg_rank = pg_rank; - /* FIXME: Why do we add a ref to pg here? */ - TRACE_ERR("Adding ref pg=%x\n", pg); - MPIDI_PG_add_ref(pg); } #endif diff --git a/src/mpid/pamid/src/mpid_vc.c b/src/mpid/pamid/src/mpid_vc.c index a49f3a8..7a22133 100644 --- a/src/mpid/pamid/src/mpid_vc.c +++ b/src/mpid/pamid/src/mpid_vc.c @@ -34,7 +34,7 @@ struct MPIDI_VCRT { MPIU_OBJECT_HEADER; unsigned size; /**< Number of entries in the table */ - MPID_VCR vcr_table[0]; /**< Array of virtual connection references */ + MPID_VCR *vcr_table; /**< Array of virtual connection references */ }; @@ -48,7 +48,11 @@ int MPID_VCR_Dup(MPID_VCR orig_vcr, MPID_VCR * new_vcr) } #endif - *new_vcr = orig_vcr; + (*new_vcr)->taskid = orig_vcr->taskid; +#ifdef DYNAMIC_TASKING + (*new_vcr)->pg_rank = orig_vcr->pg_rank; + (*new_vcr)->pg = orig_vcr->pg; +#endif return MPI_SUCCESS; } @@ -63,9 +67,12 @@ int MPID_VCRT_Create(int size, MPID_VCRT *vcrt_ptr) struct MPIDI_VCRT * vcrt; int i,result; - vcrt = MPIU_Malloc(sizeof(struct MPIDI_VCRT) + size*sizeof(MPID_VCR)); - for(i = 0; i < size; i++) + vcrt = MPIU_Malloc(sizeof(struct MPIDI_VCRT)); + vcrt->vcr_table = MPIU_Malloc(size*sizeof(MPID_VCR)); + + for(i = 0; i < size; i++) { vcrt->vcr_table[i] = MPIU_Malloc(sizeof(struct MPID_VCR_t)); + } if (vcrt != NULL) { MPIU_Object_set_ref(vcrt, 1); @@ -98,17 +105,17 @@ int MPID_VCRT_Release(MPID_VCRT vcrt, int isDisconnect) for (i = 0; i < vcrt->size; i++) { MPID_VCR const vcr = vcrt->vcr_table[i]; + if (vcr->pg == MPIDI_Process.my_pg && vcr->pg_rank == MPIDI_Process.my_pg_rank) { TRACE_ERR("before MPIDI_PG_release_ref on vcr=%x pg=%x pg=%s inuse=%d\n", vcr, vcr->pg, (vcr->pg)->id, inuse); inuse=MPIU_Object_get_ref(vcr->pg); - TRACE_ERR("before MPIDI_PG_release_ref on vcr=%x pg=%x pg=%s inuse=%d\n", vcr, vcr->pg, (vcr->pg)->id, inuse); MPIDI_PG_release_ref(vcr->pg, &inuse); - TRACE_ERR("MPIDI_PG_release_ref on pg=%s inuse=%d\n", (vcr->pg)->id, inuse); if (inuse == 0) { MPIDI_PG_Destroy(vcr->pg); + MPIU_Free(vcr); } continue; } @@ -117,11 +124,21 @@ int MPID_VCRT_Release(MPID_VCRT vcrt, int isDisconnect) MPIDI_PG_release_ref(vcr->pg, &inuse); if (inuse == 0) MPIDI_PG_Destroy(vcr->pg); - /*MPIU_Free(vcrt->vcr_table[i]);*/ + if(vcr) MPIU_Free(vcr); } + MPIU_Free(vcrt->vcr_table); } /** CHECK */ + else { + for (i = 0; i < vcrt->size; i++) + MPIU_Free(vcrt->vcr_table[i]); + MPIU_Free(vcrt->vcr_table);vcrt->vcr_table=NULL; + } +#else + for (i = 0; i < vcrt->size; i++) + MPIU_Free(vcrt->vcr_table[i]); + MPIU_Free(vcrt->vcr_table);vcrt->vcr_table=NULL; #endif - MPIU_Free(vcrt); + MPIU_Free(vcrt);vcrt=NULL; } return MPI_SUCCESS; } ----------------------------------------------------------------------- Summary of changes: src/mpid/pamid/src/dyntask/mpidi_pg.c | 13 +++++------ src/mpid/pamid/src/dyntask/mpidi_port.c | 9 -------- src/mpid/pamid/src/mpid_finalize.c | 7 ++++++ src/mpid/pamid/src/mpid_init.c | 3 -- src/mpid/pamid/src/mpid_vc.c | 33 +++++++++++++++++++++++------- 5 files changed, 38 insertions(+), 27 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-24-gc73c331
by noreply＠mpich.org 04 Mar '14

04 Mar '14

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 c73c33196510911bd99ffbadcf04d1290e651d4d (commit) from c5d0d88db1ce0f468157ccd871568b501d870814 (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/c73c33196510911bd99ffbadcf04d1290… commit c73c33196510911bd99ffbadcf04d1290e651d4d Author: Rob Latham <robl(a)mcs.anl.gov> Date: Tue Mar 4 15:35:39 2014 -0600 Add missing pvfs2 headers to tarball See OpenMPI revision 30932: https://svn.open-mpi.org/trac/ompi/changeset/30932 diff --git a/src/mpi/romio/adio/ad_pvfs2/Makefile.mk b/src/mpi/romio/adio/ad_pvfs2/Makefile.mk index 1ec4848..4ee9d0f 100644 --- a/src/mpi/romio/adio/ad_pvfs2/Makefile.mk +++ b/src/mpi/romio/adio/ad_pvfs2/Makefile.mk @@ -7,7 +7,9 @@ if BUILD_AD_PVFS2 -noinst_HEADERS += adio/ad_pvfs2/ad_pvfs2.h +noinst_HEADERS += adio/ad_pvfs2/ad_pvfs2.h \ + adio/ad_pvfs2/ad_pvfs2_io.h \ + adio/ad_pvfs2/ad_pvfs2_common.h romio_other_sources += \ adio/ad_pvfs2/ad_pvfs2_close.c \ ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/ad_pvfs2/Makefile.mk | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-23-gc5d0d88
by noreply＠mpich.org 02 Mar '14

02 Mar '14

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 c5d0d88db1ce0f468157ccd871568b501d870814 (commit) from de80ec8704071f3b9c810509fb8acee345865902 (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/c5d0d88db1ce0f468157ccd871568b501… commit c5d0d88db1ce0f468157ccd871568b501d870814 Author: William Gropp <wgropp(a)illinois.edu> Date: Fri Feb 28 16:09:49 2014 +0900 Correct CPP name ifdef test on the need for a prototype declaration was using the wrong name. This may have been caused by a change in the name of the CPP value without correcting the use of that name in this file. diff --git a/src/pm/util/newsession.c b/src/pm/util/newsession.c index 91271c4..c597dd7 100644 --- a/src/pm/util/newsession.c +++ b/src/pm/util/newsession.c @@ -24,7 +24,7 @@ void MPIE_CreateNewSession( void ) { #if defined(HAVE_SETSID) && defined(HAVE_ISATTY) && \ defined(USE_NEW_SESSION) && defined(HAVE_GETSID) -#ifdef NEEDS_GETSID_PROTOTYPE +#ifdef NEEDS_GETSID_DECL pid_t getsid(pid_t); #endif if (!isatty(0) && !isatty(1) && !isatty(2) && getsid(0) != getpid()) { ----------------------------------------------------------------------- Summary of changes: src/pm/util/newsession.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0