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

[mpich] MPICH primary repository branch, master, updated. v3.1-195-g2487b73
by noreply＠mpich.org 30 Apr '14

30 Apr '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 2487b73e5e9b5160d75035d57e745827aaf3564b (commit) via d2fadf793bf3cef2710ab681efeac91f29e4021d (commit) via 6bef671154acff90af4d40c8095ba333aa12eb30 (commit) from a00839739260055c6d2373f41e2a0c53abf679d1 (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/2487b73e5e9b5160d75035d57e745827a… commit 2487b73e5e9b5160d75035d57e745827aaf3564b Author: Su Huang <suhuang(a)us.ibm.com> Date: Wed Apr 23 23:19:22 2014 -0400 pamid: mapped datatypes needed to be unmapped for one-sided communication, the completion of a local operation is when the completion handler of the operation is activated. The datatype associated with the operation can not be freed until the completion handler is activated which is MPIDI_Win_DoneCB. In the current code, the mapped datatype is unmapped immediately freed after the routine gets the control from PAMI calls. The calls could be PAMI_Send, PAMI_Get, PAMI_Rget, PAMI_Put and PAMI_Rget. Please note that the datatype is needed for PAMI to process the data. The fix is to unmap the datatype in MPIDI_Win_DoneCB() and remove all "unmap" datatype operations from put and get operations. Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> diff --git a/src/mpid/pamid/src/onesided/mpid_1s.c b/src/mpid/pamid/src/onesided/mpid_1s.c index 0f504ff..447530b 100644 --- a/src/mpid/pamid/src/onesided/mpid_1s.c +++ b/src/mpid/pamid/src/onesided/mpid_1s.c @@ -43,9 +43,6 @@ MPIDI_Win_DoneCB(pami_context_t context, req->origin.count, req->origin.datatype); MPID_assert(mpi_errno == MPI_SUCCESS); -#ifndef USE_PAMI_RDMA - MPIDI_Win_datatype_unmap(&req->target.dt); -#endif MPID_Datatype_release(req->origin.dt.pointer); MPIU_Free(req->buffer); MPIU_Free(req->user_buffer); @@ -66,6 +63,7 @@ MPIDI_Win_DoneCB(pami_context_t context, MPIU_Free(req->user_buffer); req->buffer_free = 0; } + MPIDI_Win_datatype_unmap(&req->target.dt); if (req->accum_headers) MPIU_Free(req->accum_headers); if (!((req->type > MPIDI_WIN_REQUEST_GET_ACCUMULATE) && (req->type <=MPIDI_WIN_REQUEST_RGET_ACCUMULATE))) diff --git a/src/mpid/pamid/src/onesided/mpid_win_accumulate.c b/src/mpid/pamid/src/onesided/mpid_win_accumulate.c index 714852f..2ab1f14 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_accumulate.c +++ b/src/mpid/pamid/src/onesided/mpid_win_accumulate.c @@ -108,14 +108,8 @@ MPIDI_Accumulate(pami_context_t context, will not change till that RMA has completed. In the meanwhile the rest of the RMAs will have memory leaks */ if (req->target.dt.num_contig - req->state.index == 1) { - map=NULL; - if (req->target.dt.map != &req->target.dt.__map) { - map=(void *) req->target.dt.map; - } rc = PAMI_Send(context, &params); MPID_assert(rc == PAMI_SUCCESS); - if (map) - MPIU_Free(map); return PAMI_SUCCESS; } else { rc = PAMI_Send(context, &params); @@ -125,7 +119,6 @@ MPIDI_Accumulate(pami_context_t context, } } - MPIDI_Win_datatype_unmap(&req->target.dt); return PAMI_SUCCESS; } diff --git a/src/mpid/pamid/src/onesided/mpid_win_get.c b/src/mpid/pamid/src/onesided/mpid_win_get.c index f731e48..e3d9885 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_get.c +++ b/src/mpid/pamid/src/onesided/mpid_win_get.c @@ -24,11 +24,11 @@ static inline int -MPIDI_Get_use_pami_rget(pami_context_t context, MPIDI_Win_request * req, int *freed) +MPIDI_Get_use_pami_rget(pami_context_t context, MPIDI_Win_request * req) __attribute__((__always_inline__)); #ifdef RDMA_FAILOVER static inline int -MPIDI_Get_use_pami_get(pami_context_t context, MPIDI_Win_request * req, int *freed) +MPIDI_Get_use_pami_get(pami_context_t context, MPIDI_Win_request * req) __attribute__((__always_inline__)); #endif @@ -38,17 +38,16 @@ MPIDI_Get(pami_context_t context, { MPIDI_Win_request *req = (MPIDI_Win_request*)_req; pami_result_t rc; - int freed=0; #ifdef USE_PAMI_RDMA - rc = MPIDI_Get_use_pami_rget(context,req,&freed); + rc = MPIDI_Get_use_pami_rget(context,req); #else if( (req->origin.memregion_used) && (req->win->mpid.info[req->target.rank].memregion_used) ) { - rc = MPIDI_Get_use_pami_rget(context,req,&freed); + rc = MPIDI_Get_use_pami_rget(context,req); } else { - rc = MPIDI_Get_use_pami_get(context,req,&freed); + rc = MPIDI_Get_use_pami_get(context,req); } #endif if(rc == PAMI_EAGAIN) @@ -59,10 +58,9 @@ MPIDI_Get(pami_context_t context, static inline int -MPIDI_Get_use_pami_rget(pami_context_t context, MPIDI_Win_request * req, int *freed) +MPIDI_Get_use_pami_rget(pami_context_t context, MPIDI_Win_request * req) { pami_result_t rc; - void *map=NULL; pami_rget_simple_t params; params=zero_rget_parms; @@ -102,15 +100,8 @@ MPIDI_Get_use_pami_rget(pami_context_t context, MPIDI_Win_request * req, int *fr will not change till that RMA has completed. In the meanwhile the rest of the RMAs will have memory leaks */ if (req->target.dt.num_contig - req->state.index == 1) { - map=NULL; - if (req->target.dt.map != &req->target.dt.__map) { - map=(void *) req->target.dt.map; - } rc = PAMI_Rget(context, &params); MPID_assert(rc == PAMI_SUCCESS); - if (map) - MPIU_Free(map); - *freed=1; return PAMI_SUCCESS; } else { rc = PAMI_Rget(context, &params); @@ -125,10 +116,9 @@ MPIDI_Get_use_pami_rget(pami_context_t context, MPIDI_Win_request * req, int *fr #ifdef RDMA_FAILOVER static inline int -MPIDI_Get_use_pami_get(pami_context_t context, MPIDI_Win_request * req, int *freed) +MPIDI_Get_use_pami_get(pami_context_t context, MPIDI_Win_request * req) { pami_result_t rc; - void *map=NULL; pami_get_simple_t params; params=zero_get_parms; diff --git a/src/mpid/pamid/src/onesided/mpid_win_put.c b/src/mpid/pamid/src/onesided/mpid_win_put.c index 5c4a1ff..a552fa0 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_put.c +++ b/src/mpid/pamid/src/onesided/mpid_win_put.c @@ -24,11 +24,11 @@ static inline int -MPIDI_Put_use_pami_rput(pami_context_t context, MPIDI_Win_request * req,int *freed) +MPIDI_Put_use_pami_rput(pami_context_t context, MPIDI_Win_request * req) __attribute__((__always_inline__)); #ifdef RDMA_FAILOVER static inline int -MPIDI_Put_use_pami_put(pami_context_t context, MPIDI_Win_request * req,int *freed) +MPIDI_Put_use_pami_put(pami_context_t context, MPIDI_Win_request * req) __attribute__((__always_inline__)); #endif @@ -39,33 +39,29 @@ MPIDI_Put(pami_context_t context, { MPIDI_Win_request *req = (MPIDI_Win_request*)_req; pami_result_t rc; - int freed=0; #ifdef USE_PAMI_RDMA - rc = MPIDI_Put_use_pami_rput(context, req, &freed); + rc = MPIDI_Put_use_pami_rput(context, req); #else if( (req->origin.memregion_used) && (req->win->mpid.info[req->target.rank].memregion_used) ) { - rc = MPIDI_Put_use_pami_rput(context, req, &freed); + rc = MPIDI_Put_use_pami_rput(context, req); } else { - rc = MPIDI_Put_use_pami_put(context, req, &freed); + rc = MPIDI_Put_use_pami_put(context, req); } #endif if( rc == PAMI_EAGAIN) return rc; - if (!freed) - MPIDI_Win_datatype_unmap(&req->target.dt); return PAMI_SUCCESS; } static inline int -MPIDI_Put_use_pami_rput(pami_context_t context, MPIDI_Win_request * req,int *freed) +MPIDI_Put_use_pami_rput(pami_context_t context, MPIDI_Win_request * req) { pami_result_t rc; - void *map; pami_rput_simple_t params; /* params need to zero out to avoid passing garbage to PAMI */ params=zero_rput_parms; @@ -107,16 +103,8 @@ MPIDI_Put_use_pami_rput(pami_context_t context, MPIDI_Win_request * req,int *fre will not change till that RMA has completed. In the meanwhile the rest of the RMAs will have memory leaks */ if (req->target.dt.num_contig - req->state.index == 1) { - map=NULL; - if (req->target.dt.map != &req->target.dt.__map) { - map=(void *) req->target.dt.map; - } rc = PAMI_Rput(context, &params); MPID_assert(rc == PAMI_SUCCESS); - if (map) { - MPIU_Free(map); - } - *freed=1; return PAMI_SUCCESS; } else { rc = PAMI_Rput(context, &params); @@ -130,10 +118,9 @@ MPIDI_Put_use_pami_rput(pami_context_t context, MPIDI_Win_request * req,int *fre #ifdef RDMA_FAILOVER static inline int -MPIDI_Put_use_pami_put(pami_context_t context, MPIDI_Win_request * req,int *freed) +MPIDI_Put_use_pami_put(pami_context_t context, MPIDI_Win_request * req) { pami_result_t rc; - void *map; pami_put_simple_t params; params = zero_put_parms; @@ -176,16 +163,8 @@ MPIDI_Put_use_pami_put(pami_context_t context, MPIDI_Win_request * req,int *fr will not change till that RMA has completed. In the meanwhile the rest of the RMAs will have memory leaks */ if (req->target.dt.num_contig - req->state.index == 1) { - map=NULL; - if (req->target.dt.map != &req->target.dt.__map) { - map=(void *) req->target.dt.map; - } rc = PAMI_Put(context, &params); MPID_assert(rc == PAMI_SUCCESS); - if (map) { - MPIU_Free(map); - } - *freed=1; return PAMI_SUCCESS; } else { rc = PAMI_Put(context, &params); http://git.mpich.org/mpich.git/commitdiff/d2fadf793bf3cef2710ab681efeac91f2… commit d2fadf793bf3cef2710ab681efeac91f29e4021d Author: Su Huang <suhuang(a)us.ibm.com> Date: Thu Apr 24 04:33:53 2014 -0400 pamid: fix a bug in MPID_Win_free MPID_Win_allocated_shared(), the routine could obtain memory space via either shmget() or MPIU_Malloc() if one task on a node. In MPID_Win_free(), the routine only frees shared memory space. The fix is to free none-shared space if there is one. Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> diff --git a/src/mpid/pamid/src/onesided/mpid_win_free.c b/src/mpid/pamid/src/onesided/mpid_win_free.c index 1c5a7ec..b09fe6c 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_free.c +++ b/src/mpid/pamid/src/onesided/mpid_win_free.c @@ -53,6 +53,8 @@ int MPIDI_SHM_Win_free(MPID_Win **win_ptr) rc=shmctl((*win_ptr)->mpid.shm->shm_id,IPC_RMID,NULL); MPIU_ERR_CHKANDJUMP((rc == -1), errno,MPI_ERR_RMA_SHARED, "**shmctl"); } + } else {/* one task on a node */ + MPIU_Free((*win_ptr)->base); } MPIU_Free((*win_ptr)->mpid.shm); (*win_ptr)->mpid.shm = NULL; http://git.mpich.org/mpich.git/commitdiff/6bef671154acff90af4d40c8095ba333a… commit 6bef671154acff90af4d40c8095ba333aa12eb30 Author: Su Huang <suhuang(a)us.ibm.com> Date: Thu Apr 24 03:50:06 2014 -0400 pamid: memory leak on handles for request based RMA operations Request based RMA communication operations require that each operation allocates a communication request object and associates it with the request handle (the argument request) that can be used to wait or test for completion. Both the structures for the request handle and the window structure are not being freed. The problem is when the request handle is created, the ref_count of the object is set to 2. When MPID_Request_releas_inline() is called by a request based RMA operation, the ref_count of the handle is decremented to 1. The allocated memory spaces are freed only if ref_count is equal to 0. To fix the problem, set the ref_count to 1 when the request handle is created. In MPID_Request_release_inline, the routine decrements the ref_count to 0 which leads the memory space be freed. Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> diff --git a/src/mpid/pamid/src/mpid_request.h b/src/mpid/pamid/src/mpid_request.h index 389a8b5..a9fb6de 100644 --- a/src/mpid/pamid/src/mpid_request.h +++ b/src/mpid/pamid/src/mpid_request.h @@ -244,6 +244,15 @@ MPIDI_Request_create2() return req; } +static inline MPID_Request * +MPIDI_Request_create1() +{ + MPID_Request * req; + req = MPID_Request_create(); + MPIU_Object_set_ref(req, 1); + + return req; +} /** * \brief Mark a request as cancel-pending diff --git a/src/mpid/pamid/src/onesided/mpid_win_reqops.c b/src/mpid/pamid/src/onesided/mpid_win_reqops.c index 15ac4e4..6e597c5 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_reqops.c +++ b/src/mpid/pamid/src/onesided/mpid_win_reqops.c @@ -58,7 +58,7 @@ MPID_Rput(const void *origin_addr, return mpi_errno, "**rmasync"); } - MPID_Request *rreq = MPIDI_Request_create2(); + MPID_Request *rreq = MPIDI_Request_create1(); *request = rreq; rreq->kind = MPID_WIN_REQUEST; win->mpid.rreq = rreq; @@ -110,7 +110,7 @@ MPID_Rget(void *origin_addr, return mpi_errno, "**rmasync"); } - MPID_Request *rreq = MPIDI_Request_create2(); + MPID_Request *rreq = MPIDI_Request_create1(); rreq->kind = MPID_WIN_REQUEST; *request = rreq; win->mpid.rreq = rreq; @@ -169,7 +169,7 @@ MPID_Raccumulate(const void *origin_addr, return mpi_errno, "**rmasync"); } - MPID_Request *rreq = MPIDI_Request_create2(); + MPID_Request *rreq = MPIDI_Request_create1(); rreq->kind = MPID_WIN_REQUEST; *request = rreq; win->mpid.rreq = rreq; @@ -234,7 +234,7 @@ MPID_Rget_accumulate(const void *origin_addr, return mpi_errno, "**rmasync"); } - MPID_Request *rreq = MPIDI_Request_create2(); + MPID_Request *rreq = MPIDI_Request_create1(); rreq->kind = MPID_WIN_REQUEST; *request = rreq; win->mpid.rreq = rreq; ----------------------------------------------------------------------- Summary of changes: src/mpid/pamid/src/mpid_request.h | 9 +++++ src/mpid/pamid/src/onesided/mpid_1s.c | 4 +-- src/mpid/pamid/src/onesided/mpid_win_accumulate.c | 7 ---- src/mpid/pamid/src/onesided/mpid_win_free.c | 2 + src/mpid/pamid/src/onesided/mpid_win_get.c | 24 ++++---------- src/mpid/pamid/src/onesided/mpid_win_put.c | 35 ++++---------------- src/mpid/pamid/src/onesided/mpid_win_reqops.c | 8 ++-- 7 files changed, 30 insertions(+), 59 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-192-ga008397
by noreply＠mpich.org 29 Apr '14

29 Apr '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 a00839739260055c6d2373f41e2a0c53abf679d1 (commit) from 172968b2ed596d5ccd444ea10b9bead5104ef7bf (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/a00839739260055c6d2373f41e2a0c53a… commit a00839739260055c6d2373f41e2a0c53abf679d1 Author: Su Huang <suhuang(a)us.ibm.com> Date: Tue Apr 29 08:49:51 2014 -0400 pamid: datatype is not freed in MPID_Win_accumulate In MPID_Win_accumulate, when processing non-contiguous datatype for origin, the ref_count of datatype is incremented by one which prevents the space allocated for contents and datatloop from being freed. MPID_Datatype_add_ref(req->origin.dt.pointer); In the routine, the data is processed by MPIR_Localcopy and no need to increment the reference count (ref_count) of the object by 1. Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> diff --git a/src/mpid/pamid/src/onesided/mpid_win_accumulate.c b/src/mpid/pamid/src/onesided/mpid_win_accumulate.c index 6ee57d2..714852f 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_accumulate.c +++ b/src/mpid/pamid/src/onesided/mpid_win_accumulate.c @@ -270,7 +270,6 @@ MPID_Accumulate(const void *origin_addr, req->buffer_free = 1; req->buffer = MPIU_Malloc(req->origin.dt.size); MPID_assert(req->buffer != NULL); - MPID_Datatype_add_ref(req->origin.dt.pointer); int mpi_errno = 0; mpi_errno = MPIR_Localcopy(origin_addr, origin_count, ----------------------------------------------------------------------- Summary of changes: src/mpid/pamid/src/onesided/mpid_win_accumulate.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-191-g172968b
by noreply＠mpich.org 29 Apr '14

29 Apr '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 172968b2ed596d5ccd444ea10b9bead5104ef7bf (commit) from 58d9076d12a9f5b4a15965dd4250b1a6a1ddf00b (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/172968b2ed596d5ccd444ea10b9bead51… commit 172968b2ed596d5ccd444ea10b9bead5104ef7bf Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Fri Apr 25 16:16:29 2014 -0500 cleanup .gitignore for src/env directory No reviewer diff --git a/.gitignore b/.gitignore index e4c86e4..18697d1 100644 --- a/.gitignore +++ b/.gitignore @@ -161,7 +161,6 @@ Makefile.am-stamp /maint/extracterrmsgs /src/binding/fortran/use_mpi/mpi_base.f90.in /src/binding/fortran/use_mpi/mpi_constants.f90.in -/src/env/mpixxx_opts.conf /src/mpi/romio/include/mpio.h /src/mpi/romio/include/mpiof.h /src/mpid/ch3/channels/nemesis/include/mpid_nem_net_module_defs.h @@ -175,11 +174,6 @@ Makefile.am-stamp # random additions 2 /mpich-doxygen -/src/env/mpicc.sh -/src/env/mpichversion -/src/env/mpicxx.sh -/src/env/mpif77.sh -/src/env/mpif90.sh /src/include/glue_romio.h /src/include/mpichinfo.h /src/packaging/envmods/mpich.module @@ -217,10 +211,6 @@ Makefile.am-stamp /src/mpi/romio/libtool /src/pm/mpd/aclocal.m4 /src/pm/gforker/mpiexec.gforker -/src/env/cc_shlib.conf -/src/env/cxx_shlib.conf -/src/env/f77_shlib.conf -/src/env/fc_shlib.conf /maint/Version /src/binding/fortran/mpif_h/Makefile.mk /src/binding/fortran/use_mpi/Makefile.mk @@ -440,20 +430,28 @@ Makefile.am-stamp # /src/env/ /src/env/mpicc +/src/env/mpicc.sh /src/env/mpicc.bash /src/env/mpicc.conf /src/env/mpicxx +/src/env/mpicxx.sh /src/env/mpicxx.bash /src/env/mpicxx.conf /src/env/mpif77 +/src/env/mpif77.sh /src/env/mpif77.bash /src/env/mpif77.conf -/src/env/mpif90 -/src/env/mpif90.bash -/src/env/mpif90.conf -/src/env/mpich2version +/src/env/mpifort +/src/env/mpifort.sh +/src/env/mpifort.bash +/src/env/mpichversion /src/env/parkill /src/env/mpivars +/src/env/mpixxx_opts.conf +/src/env/cc_shlib.conf +/src/env/cxx_shlib.conf +/src/env/f77_shlib.conf +/src/env/fc_shlib.conf # /src/include/ /src/include/mpi.h ----------------------------------------------------------------------- Summary of changes: .gitignore | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-190-g58d9076
by noreply＠mpich.org 29 Apr '14

29 Apr '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 58d9076d12a9f5b4a15965dd4250b1a6a1ddf00b (commit) via e38c59a82a0805d60e40c577aa09436e70295027 (commit) via 4dbe135a9ddedb5ad72a4abd0aafb75843140763 (commit) from b9d677473725748de832f7a67d5835baddfa6279 (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/58d9076d12a9f5b4a15965dd4250b1a6a… commit 58d9076d12a9f5b4a15965dd4250b1a6a1ddf00b Author: Sameer Kumar <sameerk(a)us.ibm.com> Date: Tue Apr 8 09:20:35 2014 -0500 pamid: fixes for MPI_Win_allocate_shared on BG/Q. Tested using the mpich testsuite and the following command: make testing MPITEST_PROGRAM_WRAPPER=" --ranks-per-node=8 --block R00-M1-N10 --timeout 60 --envs BG_MAPCOMMONHEAP=1 : " MPIEXEC=runjob V=1 diff --git a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c index 7d70b87..332cf47 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c +++ b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c @@ -48,15 +48,28 @@ int CheckRankOnNode(MPID_Comm * comm_ptr,int *onNode ) { *onNode=1; - if (comm_ptr->intranode_table == NULL) - *onNode = 0; - else +#ifdef __PE__ for (i=0; i< comm_size; i++) { if (comm_ptr->intranode_table[i] == -1) { *onNode=0; break; } } +#else +#ifdef PAMIX_IS_LOCAL_TASK + for (i=0; i< comm_size; i++) { + if (!PAMIX_Task_is_local(comm_ptr->vcr[i]->taskid)) { + *onNode=0; + break; + } + } +#else + if (comm_ptr->intranode_table == NULL) + *onNode = 0; +#endif +#endif + + if (*onNode== 0) { MPIU_ERR_SETANDSTMT(mpi_errno, MPI_ERR_RMA_CONFLICT, return mpi_errno, "**rmaconflict"); @@ -374,32 +387,71 @@ MPID_Win_allocate_shared(MPI_Aint size, MPID_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; + int onNode = 0; + MPID_Win *win = NULL; + int rank; + void **baseP = base_ptr; MPIDI_Win_info *winfo; - MPID_Win *win; - int rank, comm_size,i; - int onNode,noncontig=FALSE; + int comm_size,i; + int noncontig=FALSE; MPI_Aint pageSize=0; - - + + /* Verify all ranks are on-node */ + mpi_errno=CheckRankOnNode(comm_ptr,&onNode); + if (mpi_errno) MPIU_ERR_POP(mpi_errno); + MPIU_ERR_CHKANDJUMP((onNode == 0), mpi_errno, MPI_ERR_RMA_SHARED, "**rmashared"); + /* Initialize the window */ mpi_errno =MPIDI_Win_init(size,disp_unit,win_ptr, info, comm_ptr, MPI_WIN_FLAVOR_SHARED, MPI_WIN_UNIFIED); if (mpi_errno) MPIU_ERR_POP(mpi_errno); win = *win_ptr; - mpi_errno=CheckRankOnNode(comm_ptr,&onNode); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - MPIU_ERR_CHKANDJUMP((onNode == 0), mpi_errno, MPI_ERR_RMA_SHARED, "**rmashared"); - mpi_errno=CheckSpaceType(win_ptr,info,&noncontig); - rank = (*win_ptr)->comm_ptr->rank; - comm_size = (*win_ptr)->comm_ptr->local_size; win->mpid.shm = MPIU_Malloc(sizeof(MPIDI_Win_shm_t)); - win->mpid.shm->allocated=0; MPID_assert(win->mpid.shm != NULL); + memset(win->mpid.shm, 0, sizeof(MPIDI_Win_shm_t)); + + rank = comm_ptr->rank; + win->mpid.info[rank].win = win; + win->mpid.info[rank].disp_unit = disp_unit; + +#ifdef __BGQ__ + /* verify BG_MAPCOMMONHEAP=1 env. variable is set */ + if (rank == 0) { + assert(NULL!=getenv("BG_MAPCOMMONHEAP")); + baseP = MPIU_Malloc(size+sizeof(pthread_mutex_t)); +#ifdef MPIDI_NO_ASSERT + MPIU_ERR_CHKANDJUMP((baseP == NULL), mpi_errno, MPI_ERR_BUFFER, "**bufnull"); +#else + MPID_assert(baseP != NULL); +#endif + + pthread_mutex_t *mutex = (pthread_mutex_t *)(((uintptr_t) baseP) + size); + pthread_mutexattr_t attr; + pthread_mutexattr_init(&attr); + pthread_mutex_init(mutex, &attr); + } + + int errflag = 0; + mpi_errno = MPIR_Bcast_impl(&baseP, sizeof(char*), MPI_BYTE, 0, + win->comm_ptr, &errflag); + + win->mpid.shm->mutex_lock = (pthread_mutex_t *)(((uintptr_t) baseP) + size); + win->mpid.shm->allocated = 1; + win->mpid.shm->base_addr = baseP; + + win->base = baseP; + win->mpid.info[rank].base_addr = baseP; + + mpi_errno = MPIDI_Win_allgather(size,win_ptr); + if (mpi_errno != MPI_SUCCESS) { + MPIU_Free(win->mpid.shm); + return mpi_errno; + } +#else + mpi_errno=CheckSpaceType(win_ptr,info,&noncontig); + comm_size = (*win_ptr)->comm_ptr->local_size; MPID_getSharedSegment(size, disp_unit,comm_ptr,baseP, win_ptr,&pageSize,&noncontig); - winfo = &win->mpid.info[rank]; - winfo->win = win; - winfo->disp_unit = disp_unit; mpi_errno = MPIDI_Win_allgather(size,win_ptr); if (mpi_errno != MPI_SUCCESS) return mpi_errno; @@ -419,15 +471,18 @@ MPID_Win_allocate_shared(MPI_Aint size, } } } +#endif + *(void**) base_ptr = (void *) win->mpid.info[rank].base_addr; mpi_errno = MPIR_Barrier_impl(comm_ptr, &mpi_errno); - fn_exit: return mpi_errno; /* --BEGIN ERROR HANDLING-- */ fn_fail: - MPIU_Free(win->mpid.shm); + if (win != NULL) + if (win->mpid.shm != NULL) + MPIU_Free(win->mpid.shm); goto fn_exit; /* --END ERROR HANDLING-- */ diff --git a/src/mpid/pamid/src/onesided/mpid_win_free.c b/src/mpid/pamid/src/onesided/mpid_win_free.c index a9399ac..1c5a7ec 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_free.c +++ b/src/mpid/pamid/src/onesided/mpid_win_free.c @@ -31,24 +31,35 @@ int MPIDI_SHM_Win_free(MPID_Win **win_ptr) int rc; int mpi_errno = MPI_SUCCESS; - /* Free shared memory region */ - /* free shm_base_addrs that's only used for shared memory windows */ - if ((*win_ptr)->mpid.shm->allocated) { - OPA_fetch_and_add_int((OPA_int_t *) (*win_ptr)->mpid.shm->shm_count,-1); - while(*(*win_ptr)->mpid.shm->shm_count) MPIDI_QUICKSLEEP; - if ((*win_ptr)->comm_ptr->rank == 0) { - MPIDI_SHM_MUTEX_DESTROY(*win_ptr); - } - mpi_errno = shmdt((*win_ptr)->mpid.shm->base_addr); - if ((*win_ptr)->comm_ptr->rank == 0) { - rc=shmctl((*win_ptr)->mpid.shm->shm_id,IPC_RMID,NULL); - MPIU_ERR_CHKANDJUMP((rc == -1), errno,MPI_ERR_RMA_SHARED, "**shmctl"); - } +#ifdef __BGQ__ + if ((*win_ptr)->comm_ptr->rank == 0) { + MPIDI_SHM_MUTEX_DESTROY(*win_ptr); + MPIU_Free ((*win_ptr)->base); + } + (*win_ptr)->mpid.shm = NULL; +#endif + +#ifdef __PE__ + /* Free shared memory region */ + /* free shm_base_addrs that's only used for shared memory windows */ + if ((*win_ptr)->mpid.shm->allocated) { + OPA_fetch_and_add_int((OPA_int_t *) (*win_ptr)->mpid.shm->shm_count,-1); + while(*(*win_ptr)->mpid.shm->shm_count) MPIDI_QUICKSLEEP; + if ((*win_ptr)->comm_ptr->rank == 0) { + MPIDI_SHM_MUTEX_DESTROY(*win_ptr); + } + mpi_errno = shmdt((*win_ptr)->mpid.shm->base_addr); + if ((*win_ptr)->comm_ptr->rank == 0) { + rc=shmctl((*win_ptr)->mpid.shm->shm_id,IPC_RMID,NULL); + MPIU_ERR_CHKANDJUMP((rc == -1), errno,MPI_ERR_RMA_SHARED, "**shmctl"); } - MPIU_Free((*win_ptr)->mpid.shm); - (*win_ptr)->mpid.shm = NULL; - fn_fail: - return mpi_errno; + } + MPIU_Free((*win_ptr)->mpid.shm); + (*win_ptr)->mpid.shm = NULL; +#endif + + fn_fail: + return mpi_errno; } /** diff --git a/src/mpid/pamid/src/pamix/pamix.c b/src/mpid/pamid/src/pamix/pamix.c index 4a49c9f..1d399b1 100644 --- a/src/mpid/pamid/src/pamix/pamix.c +++ b/src/mpid/pamid/src/pamix/pamix.c @@ -23,6 +23,7 @@ #include <assert.h> #include <limits.h> +#include "mpidimpl.h" #include <pamix.h> #define PAMIX_assert_always(x) assert(x) http://git.mpich.org/mpich.git/commitdiff/e38c59a82a0805d60e40c577aa09436e7… commit e38c59a82a0805d60e40c577aa09436e70295027 Author: Michael Blocksome <blocksom(a)us.ibm.com> Date: Tue Apr 8 16:44:13 2014 -0500 pamid: support downlevel pami 'is_local_task' extension diff --git a/src/mpid/pamid/include/mpidi_platform.h b/src/mpid/pamid/include/mpidi_platform.h index 4a280aa..ce6b232 100644 --- a/src/mpid/pamid/include/mpidi_platform.h +++ b/src/mpid/pamid/include/mpidi_platform.h @@ -24,6 +24,10 @@ #ifndef __include_mpidi_platform_h__ #define __include_mpidi_platform_h__ +/* Allow MPICH to detect local tasks */ +#define MPID_USE_NODE_IDS +typedef int32_t MPID_Node_id_t; + /* Default values */ #define MPIDI_MAX_CONTEXTS 64 @@ -140,10 +144,6 @@ static const char _ibm_release_version_[] = "V1R2M0"; #define DYNAMIC_TASKING 1 #define QUEUE_BINARY_SEARCH_SUPPORT 1 -/* Allow MPICH to detect local tasks */ -#define MPID_USE_NODE_IDS 1 -typedef int32_t MPID_Node_id_t; - /* 'is local task' extension and limits */ #define PAMIX_IS_LOCAL_TASK #define PAMIX_IS_LOCAL_TASK_STRIDE (1) diff --git a/src/mpid/pamid/include/pamix.h b/src/mpid/pamid/include/pamix.h index 6adbab5..80ef77a 100644 --- a/src/mpid/pamid/include/pamix.h +++ b/src/mpid/pamid/include/pamix.h @@ -102,6 +102,11 @@ void PAMIX_Progress_disable(pami_context_t context, pamix_progress_t event_type); +pami_result_t +PAMIX_is_local_task_get_node_info(pami_task_t task, + uint32_t *node_id, + uint32_t *offset, + uint32_t *max_nodes); #ifdef __BGQ__ diff --git a/src/mpid/pamid/src/pamix/pamix.c b/src/mpid/pamid/src/pamix/pamix.c index ab16295..4a49c9f 100644 --- a/src/mpid/pamid/src/pamix/pamix.c +++ b/src/mpid/pamid/src/pamix/pamix.c @@ -36,6 +36,7 @@ #ifdef __BGQ__ #define __BG__ +#include <spi/include/kernel/location.h> #endif typedef pami_result_t (*pamix_progress_register_fn) (pami_context_t context, @@ -81,7 +82,6 @@ pamix_extension_info_t PAMIX_Extensions; ({ \ void* fn; \ fn = PAMI_Extension_symbol(ext, name); \ - PAMIX_assert_always(fn != NULL); \ (type)fn; \ }) void @@ -115,6 +115,13 @@ PAMIX_Initialize(pami_client_t client) PAMIX_Extensions.is_local_task.bitmask = PAMI_EXTENSION_FUNCTION(uintptr_t, "bitmask", PAMIX_Extensions.is_local_task.extension); #if defined(MPID_USE_NODE_IDS) PAMIX_Extensions.is_local_task.node_info = PAMI_EXTENSION_FUNCTION(node_info_fn, "get_node_info", PAMIX_Extensions.is_local_task.extension); + if (PAMIX_Extensions.is_local_task.node_info == NULL) + { + /* The "node information" is not available via the "is_local_task" + * extension to pami - possibly due to a downlevel version of pami. + * */ + PAMIX_Extensions.is_local_task.node_info = (node_info_fn) PAMIX_is_local_task_get_node_info; + } #endif } @@ -268,6 +275,36 @@ PAMIX_Progress_disable(pami_context_t context, } +pami_result_t +PAMIX_is_local_task_get_node_info(pami_task_t task, + uint32_t *node_id, + uint32_t *offset, + uint32_t *max_nodes) +{ +#if defined(__BG__) + size_t coords[5]; + if (PAMI_SUCCESS == PAMIX_Task2torus(task, coords)) + { + const pamix_torus_info_t * info = PAMIX_Torus_info(); + + *node_id = + coords[0] + + coords[1] * info->size[0] + + coords[2] * info->size[0] * info->size[1] + + coords[3] * info->size[0] * info->size[1] * info->size[2] + + coords[1] * info->size[0] * info->size[1] * info->size[2] * info->size[3]; + + *max_nodes = info->size[0] * info->size[1] * info->size[2] * info->size[3] * info->size[4]; + + *offset = 0; /* ???????????????????????????????? */ + } +#else + MPID_abort(); /* Other platforms should not need a fallback implementation */ +#endif + + return PAMI_SUCCESS; +} + #if defined(__BG__) const pamix_torus_info_t * http://git.mpich.org/mpich.git/commitdiff/4dbe135a9ddedb5ad72a4abd0aafb7584… commit 4dbe135a9ddedb5ad72a4abd0aafb75843140763 Author: Michael Blocksome <blocksom(a)us.ibm.com> Date: Thu Apr 17 15:47:58 2014 -0500 pamid: mpid_win_* fixes diff --git a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c index dea20d7..7d70b87 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c +++ b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c @@ -47,10 +47,14 @@ int CheckRankOnNode(MPID_Comm * comm_ptr,int *onNode ) { comm_size = comm_ptr->local_size; *onNode=1; - for (i=0; i< comm_size; i++) { + + if (comm_ptr->intranode_table == NULL) + *onNode = 0; + else + for (i=0; i< comm_size; i++) { if (comm_ptr->intranode_table[i] == -1) { - *onNode=0; - break; + *onNode=0; + break; } } if (*onNode== 0) { diff --git a/src/mpid/pamid/src/onesided/mpid_win_free.c b/src/mpid/pamid/src/onesided/mpid_win_free.c index c8a8867..a9399ac 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_free.c +++ b/src/mpid/pamid/src/onesided/mpid_win_free.c @@ -86,6 +86,9 @@ MPID_Win_free(MPID_Win **win_ptr) + if (win->create_flavor == MPI_WIN_FLAVOR_ALLOCATE) + MPIU_Free(win->base); + struct MPIDI_Win_info *winfo = &win->mpid.info[rank]; #ifdef USE_PAMI_RDMA if (win->size != 0) ----------------------------------------------------------------------- Summary of changes: src/mpid/pamid/include/mpidi_platform.h | 8 +- src/mpid/pamid/include/pamix.h | 5 + .../pamid/src/onesided/mpid_win_allocate_shared.c | 99 ++++++++++++++++---- src/mpid/pamid/src/onesided/mpid_win_free.c | 48 ++++++---- src/mpid/pamid/src/pamix/pamix.c | 40 ++++++++- 5 files changed, 158 insertions(+), 42 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-187-gb9d6774
by noreply＠mpich.org 29 Apr '14

29 Apr '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 b9d677473725748de832f7a67d5835baddfa6279 (commit) from b38571fb59ab8a08a7a75c1057f5015b59931070 (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/b9d677473725748de832f7a67d5835bad… commit b9d677473725748de832f7a67d5835baddfa6279 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Mon Apr 28 08:46:03 2014 -0500 move the F77 compiler tests later in configure The configure script could accidentally override the user's selection of Fortran compiler for mpif77. Move AC_PROG_F77 until after we've potentially set F77 = FC. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/configure.ac b/configure.ac index c5a0d50..77b9b58 100644 --- a/configure.ac +++ b/configure.ac @@ -666,10 +666,6 @@ AS_IF([test "x$enable_cxx" = "xno"],[CXX=no]) : ${CXXFLAGS=""} AC_PROG_CXX([PAC_CXX_SEARCH_LIST]) -# suppress default "-g -O2" from AC_PROG_F77 -: ${FFLAGS=""} -AC_PROG_F77([PAC_F77_SEARCH_LIST]) - # suppress default "-g -O2" from AC_PROG_FC : ${FCFLAGS=""} AC_PROG_FC([PAC_FC_SEARCH_LIST]) @@ -718,6 +714,13 @@ fi AM_CONDITIONAL([INSTALL_MPIF77],[test "$F77" != "$FC" -a "$FFLAGS" != "$FCFLAGS"]) +# This needs to come after we've potentially set F77=$FC. Otherwise, we could +# override the user's Fortran compiler selection when only specifying FC at configure +# time, as is allowed. +# suppress default "-g -O2" from AC_PROG_F77 +: ${FFLAGS=""} +AC_PROG_F77([PAC_F77_SEARCH_LIST]) + # compute canonical system types AC_CANONICAL_BUILD AC_CANONICAL_HOST ----------------------------------------------------------------------- Summary of changes: configure.ac | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-186-gb38571f
by noreply＠mpich.org 28 Apr '14

28 Apr '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 b38571fb59ab8a08a7a75c1057f5015b59931070 (commit) via 120dde4cfd7077c6a70b84ee31e83f669daa8373 (commit) via 449eab8d30a5cee33b78052f10e84a15153972c2 (commit) from 87de5b090b505993b7519cf01900e0fedf3e352f (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/b38571fb59ab8a08a7a75c1057f5015b5… commit b38571fb59ab8a08a7a75c1057f5015b59931070 Author: Lisandro Dalcin <dalcinl(a)gmail.com> Date: Wed Apr 23 14:34:34 2014 -0500 Deal with empty error class/code strings The standard says a user-defined error code without a string should return "", not NULL. Closes #2067 Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/mpi/errhan/dynerrutil.c b/src/mpi/errhan/dynerrutil.c index 943e8c3..2e3bb27 100644 --- a/src/mpi/errhan/dynerrutil.c +++ b/src/mpi/errhan/dynerrutil.c @@ -48,6 +48,7 @@ static const char *(user_class_msgs[ERROR_MAX_NCLASS]) = { 0 }; static const char *(user_code_msgs[ERROR_MAX_NCODE]) = { 0 }; static int first_free_class = 0; static int first_free_code = 1; /* code 0 is reserved */ +static const char empty_error_string[1] = { 0 }; /* Forward reference */ const char *MPIR_Err_get_dynerr_string( int code ); @@ -297,11 +298,13 @@ const char *MPIR_Err_get_dynerr_string( int code ) if (errcode) { if (errcode < first_free_code) { errstr = user_code_msgs[errcode]; + if (!errstr) errstr = empty_error_string; } } else { if (errclass < first_free_class) { errstr = user_class_msgs[errclass]; + if (!errstr) errstr = empty_error_string; } } http://git.mpich.org/mpich.git/commitdiff/120dde4cfd7077c6a70b84ee31e83f669… commit 120dde4cfd7077c6a70b84ee31e83f669daa8373 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Tue Apr 22 21:34:16 2014 -0500 update errstring2 for MPICH test harness a successful test gives ' No Errors' diff --git a/test/mpi/errhan/errstring2.c b/test/mpi/errhan/errstring2.c index 262491c..5e9761c 100644 --- a/test/mpi/errhan/errstring2.c +++ b/test/mpi/errhan/errstring2.c @@ -1,5 +1,7 @@ #include <stdio.h> #include <mpi.h> +#include <string.h> + int main(int argc, char *argv[]) { int errorclass; @@ -8,8 +10,12 @@ int main(int argc, char *argv[]) MPI_Init(&argc, &argv); MPI_Add_error_class(&errorclass); MPI_Error_string(errorclass, errorstring, &slen); - printf("errorclass:%d errorstring:'%s' len:%d\n", errorclass, + if (strncmp(errorstring, "", 1)) { + fprintf(stderr, "errorclass:%d errorstring:'%s' len:%d\n", errorclass, errorstring, slen); + } else { + printf(" No Errors\n"); + } MPI_Finalize(); return 0; } http://git.mpich.org/mpich.git/commitdiff/449eab8d30a5cee33b78052f10e84a151… commit 449eab8d30a5cee33b78052f10e84a15153972c2 Author: Lisandro Dalcin <dalcinl(a)gmail.com> Date: Tue Apr 22 14:31:02 2014 -0500 testcase for MPI_Error_string() The MPI-3 standard says (pp.354, lines 39-40): """ If MPI_ERROR_STRING is called when no string has been set, it will return a empty string (all spaces in Fortran, "" in C). """ RobL added bits to hook into the test infrastrucutre. Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/test/mpi/errhan/Makefile.am b/test/mpi/errhan/Makefile.am index 46e2d49..2d28fa9 100644 --- a/test/mpi/errhan/Makefile.am +++ b/test/mpi/errhan/Makefile.am @@ -18,7 +18,8 @@ noinst_PROGRAMS = \ adderr \ commcall \ errfatal \ - predef_eh + predef_eh \ + errstring2 EXTRA_PROGRAMS = errcode errring errstring diff --git a/test/mpi/errhan/errstring2.c b/test/mpi/errhan/errstring2.c new file mode 100644 index 0000000..262491c --- /dev/null +++ b/test/mpi/errhan/errstring2.c @@ -0,0 +1,15 @@ +#include <stdio.h> +#include <mpi.h> +int main(int argc, char *argv[]) +{ + int errorclass; + char errorstring[MPI_MAX_ERROR_STRING] = {64,0}; + int slen; + MPI_Init(&argc, &argv); + MPI_Add_error_class(&errorclass); + MPI_Error_string(errorclass, errorstring, &slen); + printf("errorclass:%d errorstring:'%s' len:%d\n", errorclass, + errorstring, slen); + MPI_Finalize(); + return 0; +} diff --git a/test/mpi/errhan/testlist b/test/mpi/errhan/testlist index 9bee2b4..8ddc826 100644 --- a/test/mpi/errhan/testlist +++ b/test/mpi/errhan/testlist @@ -3,3 +3,4 @@ commcall 2 errfatal 1 resultTest=TestErrFatal predef_eh 1 predef_eh 2 +errstring2 1 ----------------------------------------------------------------------- Summary of changes: src/mpi/errhan/dynerrutil.c | 3 +++ test/mpi/errhan/Makefile.am | 3 ++- test/mpi/errhan/errstring2.c | 21 +++++++++++++++++++++ test/mpi/errhan/testlist | 1 + 4 files changed, 27 insertions(+), 1 deletions(-) create mode 100644 test/mpi/errhan/errstring2.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-183-g87de5b0
by noreply＠mpich.org 28 Apr '14

28 Apr '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 87de5b090b505993b7519cf01900e0fedf3e352f (commit) from d20f90c6ec7dcc3107d448273d29cc08f0b8d50c (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/87de5b090b505993b7519cf01900e0fed… commit 87de5b090b505993b7519cf01900e0fedf3e352f Author: Rob Latham <robl(a)mcs.anl.gov> Date: Tue Apr 1 21:31:48 2014 +0000 modify MPL_trdump to make a single fprintf call if there are a lot of mpi processes with memory errors, the output can get horribly jumbled if the "memory at address" bit is emitted in one fprintf call and the "at file/line" bit emitted in a second. For each memory region, Build up the address/file-name string in memory and make one fprintf (instead of two) per memory region. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/mpl/src/mpltrmem.c b/src/mpl/src/mpltrmem.c index e91a215..5efdbbe 100644 --- a/src/mpl/src/mpltrmem.c +++ b/src/mpl/src/mpltrmem.c @@ -606,19 +606,25 @@ void MPL_trdump(FILE * fp, int minid) } head = TRhead[1]; while (head) { + /* these "rank and size" strings are supposed to be small: enough to + * hold an mpi rank, a size, and a hexadecimal address. */ +#define ADDRESS_STR_BUFLEN 256 + + char address_str[ADDRESS_STR_BUFLEN]; MPL_VG_MAKE_MEM_DEFINED(head, sizeof(*head)); if (head->id >= minid) { addrToHex((char *) head + sizeof(TrSPACE), hexstring); - fprintf(fp, "[%d] %lu at [%s], ", world_rank, + address_str[ADDRESS_STR_BUFLEN-1] = 0; + snprintf(address_str, ADDRESS_STR_BUFLEN-1, "[%d] %lu at [%s],", world_rank, (unsigned long)head->size, hexstring); head->fname[TR_FNAME_LEN - 1] = 0; /* Be extra careful */ if (TRidSet) { /* For head->id >= 0, we can add code to map the id to * the name of a package, rather than using a raw number */ - fprintf(fp, "id = %d %s[%d]\n", head->id, head->fname, head->lineno); + fprintf(fp, "%s id = %d %s[%d]\n", address_str, head->id, head->fname, head->lineno); } else { - fprintf(fp, "%s[%d]\n", head->fname, head->lineno); + fprintf(fp, "%s %s[%d]\n", address_str, head->fname, head->lineno); } } #ifdef VALGRIND_MAKE_MEM_NOACCESS ----------------------------------------------------------------------- Summary of changes: src/mpl/src/mpltrmem.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-182-gd20f90c
by noreply＠mpich.org 27 Apr '14

27 Apr '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 d20f90c6ec7dcc3107d448273d29cc08f0b8d50c (commit) via 7bfa2437bdccde8be3b8225c5727abdfb0468f8b (commit) from f714d81cfef5b7c5dde136a2306531fe57453d6c (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/d20f90c6ec7dcc3107d448273d29cc08f… commit d20f90c6ec7dcc3107d448273d29cc08f0b8d50c Author: Pavan Balaji <balaji(a)anl.gov> Date: Sat Apr 26 05:13:16 2014 -0500 Remove the --enable-f90 option. This has been essentially removed for a while now and has been throwing an error when someone uses it. This patch gets rid of the code for good. Signed-off-by: Junchao Zhang <jczhang(a)mcs.anl.gov> diff --git a/configure.ac b/configure.ac index 501d2ad..c5a0d50 100644 --- a/configure.ac +++ b/configure.ac @@ -423,14 +423,6 @@ AC_ARG_ENABLE(f77, AC_HELP_STRING([--enable-f77], [DEPRECATED: Use --enable-fortran or --disable-fortran instead]),,[enable_f77=yes]) -AC_ARG_ENABLE(f90, - AC_HELP_STRING([--enable-f90], - [Obsolete option: Use --enable-fortran or --disable-fortran instead]), - [AC_MSG_ERROR([ ---enable-f90 and --disable-f90 are NO longer valid configure options, -use --enable-fortran or --disable-fortran instead])] -) - AC_ARG_ENABLE(fc, AC_HELP_STRING([--enable-fc], [DEPRECATED: Use --enable-fortran or --disable-fortran instead]),,[enable_fc=yes]) http://git.mpich.org/mpich.git/commitdiff/7bfa2437bdccde8be3b8225c5727abdfb… commit 7bfa2437bdccde8be3b8225c5727abdfb0468f8b Author: Pavan Balaji <balaji(a)anl.gov> Date: Sat Apr 26 05:10:08 2014 -0500 Reenable --enable-f77 and --enable-fc options. The --enable-f77 and --enable-fc options are deprecated in favor of --enable-fortran. However, instead of just breaking existing scripts that use them, allow them to be used as well. In the next major release (3.2), we should remove these options and throw an error if someone uses them. Signed-off-by: Junchao Zhang <jczhang(a)mcs.anl.gov> diff --git a/configure.ac b/configure.ac index 8e1f4b5..501d2ad 100644 --- a/configure.ac +++ b/configure.ac @@ -421,11 +421,7 @@ AC_ARG_ENABLE(fortran, AC_ARG_ENABLE(f77, AC_HELP_STRING([--enable-f77], - [Obsolete option: Use --enable-fortran or --disable-fortran instead]), - [AC_MSG_ERROR([ ---enable-f77 and --disable-f77 are NO longer valid configure options, -use --enable-fortran or --disable-fortran instead])] -) + [DEPRECATED: Use --enable-fortran or --disable-fortran instead]),,[enable_f77=yes]) AC_ARG_ENABLE(f90, AC_HELP_STRING([--enable-f90], @@ -437,11 +433,7 @@ use --enable-fortran or --disable-fortran instead])] AC_ARG_ENABLE(fc, AC_HELP_STRING([--enable-fc], - [Obsolete option: Use --enable-fortran or --disable-fortran instead]), - [AC_MSG_ERROR([ ---enable-fc and --disable-fc are NO longer valid configure options, -use --enable-fortran or --disable-fortran instead])] -) + [DEPRECATED: Use --enable-fortran or --disable-fortran instead]),,[enable_fc=yes]) AC_ARG_ENABLE(cxx, AC_HELP_STRING([--enable-cxx], [Enable C++ bindings]),,enable_cxx=yes) ----------------------------------------------------------------------- Summary of changes: configure.ac | 20 ++------------------ 1 files changed, 2 insertions(+), 18 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-180-gf714d81
by noreply＠mpich.org 27 Apr '14

27 Apr '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 f714d81cfef5b7c5dde136a2306531fe57453d6c (commit) from 00d075e23a45f68b82a8b9dd64a1c522ee30db28 (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/f714d81cfef5b7c5dde136a2306531fe5… commit f714d81cfef5b7c5dde136a2306531fe57453d6c Author: Pavan Balaji <balaji(a)anl.gov> Date: Sat Apr 26 04:55:03 2014 -0500 Update version in preparation for the 3.1.1 release. No ABI changes. Just update the release count. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/maint/version.m4 b/maint/version.m4 index 3d8c0da..9692b70 100644 --- a/maint/version.m4 +++ b/maint/version.m4 @@ -14,7 +14,7 @@ # changing this by playing with diversions, but then we would probably be # playing with autotools-fire. -m4_define([MPICH_VERSION_m4],[3.1])dnl +m4_define([MPICH_VERSION_m4],[3.1.1])dnl m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl # For libtool ABI versioning rules see: @@ -35,6 +35,6 @@ m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl # libmpi so version only includes functionality defined in the MPI # standard, and does not include MPIX_ functions and C++ bindings. -m4_define([libmpi_so_version_m4],[12:0:0])dnl +m4_define([libmpi_so_version_m4],[12:1:0])dnl [#] end of __file__ ----------------------------------------------------------------------- Summary of changes: maint/version.m4 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-179-g00d075e
by noreply＠mpich.org 26 Apr '14

26 Apr '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 00d075e23a45f68b82a8b9dd64a1c522ee30db28 (commit) from d3f43b1fb1f2b22d8145213a52e83ad1baee40b3 (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/00d075e23a45f68b82a8b9dd64a1c522e… commit 00d075e23a45f68b82a8b9dd64a1c522ee30db28 Author: Wesley Bland <wbland(a)anl.gov> Date: Sat Apr 26 07:57:48 2014 -0500 Mark ft/isendalive as xfail This test is behaving badly now as well. Given the overhaul of the ft system that's coming, we're marking these tests as xfail now instead of putting a lot of work into fixing them. They'll get cleaned up when the ULFM changes go in. No reviewer diff --git a/test/mpi/ft/testlist b/test/mpi/ft/testlist index 8c00b02..275b1fc 100644 --- a/test/mpi/ft/testlist +++ b/test/mpi/ft/testlist @@ -1,11 +1,11 @@ -die 4 mpiexecarg=-disable-auto-cleanup timeLimit=10 strict=false resultTest=TestStatusNoErrors +die 4 mpiexecarg=-disable-auto-cleanup timeLimit=10 strict=false resultTest=TestStatusNoErrors xfail=ticket1945 abort 2 mpiexecarg=-disable-auto-cleanup timeLimit=10 strict=false xfail=ticket1537 -sendalive 4 mpiexecarg=-disable-auto-cleanup timeLimit=10 strict=false resultTest=TestStatusNoErrors -isendalive 3 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false +sendalive 4 mpiexecarg=-disable-auto-cleanup timeLimit=10 strict=false resultTest=TestStatusNoErrors xfail=ticket1945 +isendalive 3 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false xfail=ticket1945 senddead 2 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945 -recvdead 2 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 +recvdead 2 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945 isenddead 2 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945 -irecvdead 2 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 +irecvdead 2 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945 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 ----------------------------------------------------------------------- Summary of changes: test/mpi/ft/testlist | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- MPICH primary repository

1 0