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

[mpich] MPICH primary repository branch, master, updated. v3.1.3-53-g36d11a1
by noreply＠mpich.org 29 Oct '14

29 Oct '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 36d11a1383cfecd65bfbf429692aa1afd5395a12 (commit) via 993845eaa36b9c5ca55c5b1eb11502fc71b9234e (commit) from e2db1e48598bad1814876b2a222649ad1dec8bc6 (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/36d11a1383cfecd65bfbf429692aa1afd… commit 36d11a1383cfecd65bfbf429692aa1afd5395a12 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Tue Oct 28 14:00:43 2014 -0500 portals4: set reasonable interface limits Set reasonable limits for maximum unexpected headers and EQs at init time. We accomplish this with a pre-init stage where we fill in a limits struct with the system defaults, increase certain values (if they are not set already in the environment), then do the real init. If the "desired" limits structure had a way to allow default values for limits we don't care about, the pre-init stage could go away. Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c index 9535797..a6ef6e6 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c @@ -11,7 +11,8 @@ #error Checkpointing not implemented #endif -#define EQ_COUNT 1024 +#define UNEXPECTED_HDR_COUNT 32768 +#define EQ_COUNT 32768 #define NID_KEY "NID" #define PID_KEY "PID" #define PTI_KEY "PTI" @@ -81,6 +82,7 @@ static int ptl_init(MPIDI_PG_t *pg_p, int pg_rank, char **bc_val_p, int *val_max int mpi_errno = MPI_SUCCESS; int ret; ptl_md_t md; + ptl_ni_limits_t desired; MPIDI_STATE_DECL(MPID_STATE_PTL_INIT); MPIDI_FUNC_ENTER(MPID_STATE_PTL_INIT); @@ -101,19 +103,28 @@ static int ptl_init(MPIDI_PG_t *pg_p, int pg_rank, char **bc_val_p, int *val_max MPIDI_Anysource_improbe_fn = MPID_nem_ptl_anysource_improbe; - /* set the unexpected header limit before PtlInit, unless it is already set in the env */ - if (getenv("PTL_LIM_MAX_UNEXPECTED_HEADERS") == NULL) { - char *envstr = MPIU_Strdup("PTL_LIM_MAX_UNEXPECTED_HEADERS=2000000"); - MPL_putenv(envstr); - MPIU_Free(envstr); - } - /* init portals */ ret = PtlInit(); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlinit", "**ptlinit %s", MPID_nem_ptl_strerror(ret)); + /* do an interface pre-init to get the default limits struct */ + ret = PtlNIInit(PTL_IFACE_DEFAULT, PTL_NI_MATCHING | PTL_NI_PHYSICAL, + PTL_PID_ANY, NULL, &desired, &MPIDI_nem_ptl_ni); + MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlniinit", "**ptlniinit %s", MPID_nem_ptl_strerror(ret)); + + /* finalize the interface so we can re-init with our desired maximums */ + ret = PtlNIFini(MPIDI_nem_ptl_ni); + MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlnifini", "**ptlnifini %s", MPID_nem_ptl_strerror(ret)); + + /* set higher limits if they are determined to be too low */ + if (desired.max_unexpected_headers < UNEXPECTED_HDR_COUNT && getenv("PTL_LIM_MAX_UNEXPECTED_HEADERS") == NULL) + desired.max_unexpected_headers = UNEXPECTED_HDR_COUNT; + if (desired.max_eqs < EQ_COUNT && getenv("PTL_LIM_MAX_EQS") == NULL) + desired.max_eqs = EQ_COUNT; + + /* do the real init */ ret = PtlNIInit(PTL_IFACE_DEFAULT, PTL_NI_MATCHING | PTL_NI_PHYSICAL, - PTL_PID_ANY, NULL, &MPIDI_nem_ptl_ni_limits, &MPIDI_nem_ptl_ni); + PTL_PID_ANY, &desired, &MPIDI_nem_ptl_ni_limits, &MPIDI_nem_ptl_ni); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlniinit", "**ptlniinit %s", MPID_nem_ptl_strerror(ret)); ret = PtlEQAlloc(MPIDI_nem_ptl_ni, EQ_COUNT, &MPIDI_nem_ptl_eq); http://git.mpich.org/mpich.git/commitdiff/993845eaa36b9c5ca55c5b1eb11502fc7… commit 993845eaa36b9c5ca55c5b1eb11502fc71b9234e Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Tue Oct 28 13:37:58 2014 -0500 portals4: reduce unexpected buffer space Out previous increase consumed too much memory. 8MB should be enough given the maximum put size and number of headers. Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_poll.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_poll.c index 3394ff4..8104eaf 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_poll.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_poll.c @@ -7,7 +7,7 @@ #include "ptl_impl.h" #define OVERFLOW_LENGTH (1024*1024) -#define NUM_OVERFLOW_ME 512 +#define NUM_OVERFLOW_ME 8 static ptl_handle_me_t overflow_me_handle[NUM_OVERFLOW_ME]; static void *overflow_buf[NUM_OVERFLOW_ME]; ----------------------------------------------------------------------- Summary of changes: .../channels/nemesis/netmod/portals4/ptl_init.c | 29 +++++++++++++------ .../channels/nemesis/netmod/portals4/ptl_poll.c | 2 +- 2 files changed, 21 insertions(+), 10 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.3-51-ge2db1e4
by noreply＠mpich.org 28 Oct '14

28 Oct '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 e2db1e48598bad1814876b2a222649ad1dec8bc6 (commit) from c16466e33992d1f0bc05b9581f9727013ed9443c (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/e2db1e48598bad1814876b2a222649ad1… commit e2db1e48598bad1814876b2a222649ad1dec8bc6 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Tue Oct 28 21:50:09 2014 -0500 Revert "netmod/mxm: Avoid calling mxm send req handling from mxm send completion callback" This reverts commit 20f1f116f01d314fa3d6abf2be2a100b1a25d5de. diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h index 43070da..3b2bb12 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h @@ -69,8 +69,6 @@ void MPID_nem_mxm_get_adi_msg(mxm_conn_h conn, mxm_imm_t imm, void *data, void MPID_nem_mxm_anysource_posted(MPID_Request * req); int MPID_nem_mxm_anysource_matched(MPID_Request * req); -int _mxm_handle_sreq(MPID_Request * req); - /* List type as queue * Operations, initialization etc */ @@ -176,25 +174,6 @@ typedef struct { /* macro for mxm private in REQ */ #define REQ_BASE(reqp) ((reqp) ? (MPID_nem_mxm_req_area *)((reqp)->ch.netmod_area.padding) : NULL) -typedef GENERIC_Q_DECL(struct MPID_Request) MPID_nem_mxm_reqq_t; -#define MPID_nem_mxm_queue_empty(q) GENERIC_Q_EMPTY (q) -#define MPID_nem_mxm_queue_head(q) GENERIC_Q_HEAD (q) -#define MPID_nem_mxm_queue_enqueue(qp, ep) do { \ - /* add refcount so req doesn't get freed before it's dequeued */ \ - MPIR_Request_add_ref(ep); \ - MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, \ - "MPID_nem_mxm_queue_enqueue req=%p (handle=%#x), queue=%p", \ - ep, (ep)->handle, qp)); \ - GENERIC_Q_ENQUEUE (qp, ep, dev.next); \ - } while (0) -#define MPID_nem_mxm_queue_dequeue(qp, ep) do { \ - GENERIC_Q_DEQUEUE (qp, ep, dev.next); \ - MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, \ - "MPID_nem_mxm_queue_dequeuereq=%p (handle=%#x), queue=%p", \ - *(ep), *(ep) ? (*(ep))->handle : -1, qp)); \ - MPID_Request_release(*(ep)); \ - } while (0) - typedef struct MPID_nem_mxm_module_t { char *runtime_version; const char *compiletime_version; @@ -209,7 +188,6 @@ typedef struct MPID_nem_mxm_module_t { int mxm_np; MPID_nem_mxm_ep_t *endpoint; list_head_t free_queue; - MPID_nem_mxm_reqq_t sreq_queue; struct { int bulk_connect; /* use bulk connect */ int bulk_disconnect; /* use bulk disconnect */ diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c index f155b82..ec04d56 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c @@ -456,8 +456,6 @@ static int _mxm_init(int rank, int size) list_grow_mxm_req(&_mxm_obj.free_queue); MPIU_Assert(list_length(&_mxm_obj.free_queue) == MXM_MPICH_MAX_REQ); - _mxm_obj.sreq_queue.head = _mxm_obj.sreq_queue.tail = NULL; - mxm_obj = &_mxm_obj; fn_exit: diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c index e8bddc3..ba7686e 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c @@ -24,16 +24,10 @@ static int _mxm_process_rdtype(MPID_Request ** rreq_p, MPI_Datatype datatype, int MPID_nem_mxm_poll(int in_blocking_progress) { int mpi_errno = MPI_SUCCESS; - MPID_Request *req = NULL; MPIDI_STATE_DECL(MPID_STATE_MXM_POLL); MPIDI_FUNC_ENTER(MPID_STATE_MXM_POLL); - while (!MPID_nem_mxm_queue_empty(mxm_obj->sreq_queue)) { - MPID_nem_mxm_queue_dequeue(&mxm_obj->sreq_queue, &req); - _mxm_handle_sreq(req); - } - mpi_errno = _mxm_poll(); if (mpi_errno) MPIU_ERR_POP(mpi_errno); @@ -78,7 +72,6 @@ void MPID_nem_mxm_get_adi_msg(mxm_conn_h conn, mxm_imm_t imm, void *data, vc = mxm_conn_ctx_get(conn); _dbg_mxm_output(5, "========> Getting ADI msg (from=%d data_size %d) \n", vc->pg_rank, length); - _dbg_mxm_out_buf(data, (length > 16 ? 16 : length)); MPID_nem_handle_pkt(vc, data, (MPIDI_msg_sz_t) (length)); } @@ -151,10 +144,6 @@ int MPID_nem_mxm_anysource_matched(MPID_Request * req) int MPID_nem_mxm_recv(MPIDI_VC_t * vc, MPID_Request * rreq) { int mpi_errno = MPI_SUCCESS; - MPIDI_msg_sz_t data_sz; - int dt_contig; - MPI_Aint dt_true_lb; - MPID_Datatype *dt_ptr; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_MXM_RECV); MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_MXM_RECV); @@ -163,15 +152,18 @@ int MPID_nem_mxm_recv(MPIDI_VC_t * vc, MPID_Request * rreq) MPIU_Assert(((rreq->dev.match.parts.rank == MPI_ANY_SOURCE) && (vc == NULL)) || (vc && !vc->ch.is_local)); - MPIDI_Datatype_get_info(rreq->dev.user_count, rreq->dev.datatype, dt_contig, data_sz, - dt_ptr, dt_true_lb); - { MPIR_Context_id_t context_id = rreq->dev.match.parts.context_id; int tag = rreq->dev.match.parts.tag; + MPIDI_msg_sz_t data_sz; + int dt_contig; + MPI_Aint dt_true_lb; + MPID_Datatype *dt_ptr; MPID_nem_mxm_vc_area *vc_area = NULL; MPID_nem_mxm_req_area *req_area = NULL; + MPIDI_Datatype_get_info(rreq->dev.user_count, rreq->dev.datatype, dt_contig, data_sz, + dt_ptr, dt_true_lb); rreq->dev.OnDataAvail = NULL; rreq->dev.tmpbuf = NULL; rreq->ch.vc = vc; @@ -231,6 +223,7 @@ static int _mxm_handle_rreq(MPID_Request * req) MPIDI_msg_sz_t userbuf_sz; MPID_Datatype *dt_ptr; MPIDI_msg_sz_t data_sz; + MPIDI_VC_t *vc = NULL; MPID_nem_mxm_vc_area *vc_area ATTRIBUTE((unused)) = NULL; MPID_nem_mxm_req_area *req_area = NULL; void *tmp_buf = NULL; @@ -326,7 +319,7 @@ static int _mxm_handle_rreq(MPID_Request * req) } } - MPIDI_CH3U_Handle_recv_req(req->ch.vc, req, &complete); + MPIDI_CH3U_Handle_recv_req(vc, req, &complete); MPIU_Assert(complete == TRUE); if (tmp_buf) MPIU_Free(tmp_buf); diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c index 69f3adc..75003bf 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c @@ -15,6 +15,7 @@ enum { }; +static int _mxm_handle_sreq(MPID_Request * req); static void _mxm_send_completion_cb(void *context); static int _mxm_isend(MPID_nem_mxm_ep_t * ep, MPID_nem_mxm_req_area * req, int type, mxm_mq_h mxm_mq, int mxm_rank, int id, mxm_tag_t tag, int block); @@ -234,7 +235,6 @@ int MPID_nem_mxm_send(MPIDI_VC_t * vc, const void *buf, int count, MPI_Datatype MPIDI_Request_create_sreq(sreq, mpi_errno, goto fn_exit); MPIU_Assert(sreq != NULL); MPIDI_Request_set_type(sreq, MPIDI_REQUEST_TYPE_SEND); - MPIDI_VC_FAI_send_seqnum(vc, seqnum); MPIDI_Request_set_seqnum(sreq, seqnum); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { @@ -336,8 +336,7 @@ int MPID_nem_mxm_ssend(MPIDI_VC_t * vc, const void *buf, int count, MPI_Datatype /* create a request */ MPIDI_Request_create_sreq(sreq, mpi_errno, goto fn_exit); MPIU_Assert(sreq != NULL); - MPIDI_Request_set_type(sreq, MPIDI_REQUEST_TYPE_SSEND); - + MPIDI_Request_set_type(sreq, MPIDI_REQUEST_TYPE_SEND); MPIDI_VC_FAI_send_seqnum(vc, seqnum); MPIDI_Request_set_seqnum(sreq, seqnum); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { @@ -440,7 +439,6 @@ int MPID_nem_mxm_isend(MPIDI_VC_t * vc, const void *buf, int count, MPI_Datatype MPIDI_Request_create_sreq(sreq, mpi_errno, goto fn_exit); MPIU_Assert(sreq != NULL); MPIDI_Request_set_type(sreq, MPIDI_REQUEST_TYPE_SEND); - MPIDI_VC_FAI_send_seqnum(vc, seqnum); MPIDI_Request_set_seqnum(sreq, seqnum); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { @@ -543,8 +541,7 @@ int MPID_nem_mxm_issend(MPIDI_VC_t * vc, const void *buf, int count, MPI_Datatyp /* create a request */ MPIDI_Request_create_sreq(sreq, mpi_errno, goto fn_exit); MPIU_Assert(sreq != NULL); - MPIDI_Request_set_type(sreq, MPIDI_REQUEST_TYPE_SSEND); - + MPIDI_Request_set_type(sreq, MPIDI_REQUEST_TYPE_SEND); MPIDI_VC_FAI_send_seqnum(vc, seqnum); MPIDI_Request_set_seqnum(sreq, seqnum); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { @@ -622,9 +619,10 @@ int MPID_nem_mxm_issend(MPIDI_VC_t * vc, const void *buf, int count, MPI_Datatyp } -int _mxm_handle_sreq(MPID_Request * req) +static int _mxm_handle_sreq(MPID_Request * req) { int complete = FALSE; + int (*reqFn) (MPIDI_VC_t *, MPID_Request *, int *); MPID_nem_mxm_vc_area *vc_area = NULL; MPID_nem_mxm_req_area *req_area = NULL; @@ -636,10 +634,8 @@ int _mxm_handle_sreq(MPID_Request * req) 16 ? 16 : req_area->iov_buf[0].length)); vc_area->pending_sends -= 1; - if (req->dev.tmpbuf) { - if (req->dev.datatype_ptr || req->ch.noncontig) { - MPIU_Free(req->dev.tmpbuf); - } + if (((req->dev.datatype_ptr != NULL) && (req->dev.tmpbuf != NULL))) { + MPIU_Free(req->dev.tmpbuf); } if (req_area->iov_count > MXM_MPICH_MAX_IOV) { @@ -648,8 +644,19 @@ int _mxm_handle_sreq(MPID_Request * req) req_area->iov_count = 0; } - MPIDI_CH3U_Handle_send_req(req->ch.vc, req, &complete); - MPIU_Assert(complete == TRUE); + reqFn = req->dev.OnDataAvail; + if (!reqFn) { + MPIDI_CH3U_Request_complete(req); + MPIU_DBG_MSG(CH3_CHANNEL, VERBOSE, ".... complete"); + } + else { + MPIDI_VC_t *vc = req->ch.vc; + + reqFn(vc, req, &complete); + if (!complete) { + MPIU_Assert(complete == TRUE); + } + } return complete; } @@ -676,7 +683,7 @@ static void _mxm_send_completion_cb(void *context) req, req->status.MPI_ERROR); if (likely(!MPIR_STATUS_GET_CANCEL_BIT(req->status))) { - MPID_nem_mxm_queue_enqueue(&mxm_obj->sreq_queue, req); + _mxm_handle_sreq(req); } } ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/netmod/mxm/mxm_impl.h | 22 ------------ .../ch3/channels/nemesis/netmod/mxm/mxm_init.c | 2 - .../ch3/channels/nemesis/netmod/mxm/mxm_poll.c | 23 ++++-------- .../ch3/channels/nemesis/netmod/mxm/mxm_send.c | 35 ++++++++++++-------- 4 files changed, 29 insertions(+), 53 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.3-50-gc16466e
by noreply＠mpich.org 28 Oct '14

28 Oct '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 c16466e33992d1f0bc05b9581f9727013ed9443c (commit) via 976272a7eff02633bdc794a03cba7fa2742d068c (commit) from ee83ffb52e7d2f2c357078b3bbd25939fd009ac8 (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/c16466e33992d1f0bc05b9581f9727013… commit c16466e33992d1f0bc05b9581f9727013ed9443c Author: Paul Coffman <pkcoff(a)us.ibm.com> Date: Mon Oct 27 21:42:43 2014 -0500 Assign large blocks first in ADIOI_GPFS_Calc_file_domains For files that are less than the size of a gpfs block there seems to be an issue if successive MPI_File_write_at_all are called with proceeding offsets. Given the simple case of 2 aggs, the 2nd agg/fd will be utilized, however the initial offset into the 2nd agg is distorted on the 2nd call to MPI_File_write_at_all because of the negative size of the 1st agg/fd because the offset info the 2nd agg/fd is influenced by the size of the first. Simple solution is to reverse the default large block assignment so in the case where only 1 agg/fd will be used it will be the first. By chance in the 2 agg situation this is what the GPFSMPIO_BALANCECONTIG optimization does and it does not have this problem. Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_aggrs.c b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_aggrs.c index 0e67b54..e403d9b 100644 --- a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_aggrs.c +++ b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_aggrs.c @@ -367,10 +367,10 @@ void ADIOI_GPFS_Calc_file_domains(ADIO_File fd, /* BG/L- and BG/P-style distribution of file domains: simple allocation of * file domins to each aggregator */ for (i=0; i<naggs; i++) { - if (i < naggs_small) { - fd_size[i] = nb_cn_small * blksize; - } else { + if (i < naggs_large) { fd_size[i] = (nb_cn_small+1) * blksize; + } else { + fd_size[i] = nb_cn_small * blksize; } } } @@ -387,12 +387,12 @@ void ADIOI_GPFS_Calc_file_domains(ADIO_File fd, #else // not BGQ platform for (i=0; i<naggs; i++) { - if (i < naggs_small) { - fd_size[i] = nb_cn_small * blksize; - } else { + if (i < naggs_large) { fd_size[i] = (nb_cn_small+1) * blksize; + } else { + fd_size[i] = nb_cn_small * blksize; } - } + } #endif http://git.mpich.org/mpich.git/commitdiff/976272a7eff02633bdc794a03cba7fa27… commit 976272a7eff02633bdc794a03cba7fa2742d068c Author: Paul Coffman <pkcoff(a)us.ibm.com> Date: Mon Oct 27 13:57:22 2014 -0500 MP_IOTASKLIST error checking PE users may manually specify the MP_IOTASKLIST for explicit aggregator selection. Code needed to be added to verify that the user specification of aggregators were all valid. Do our best to maintain the old PE behavior of using as much of the correctly specified MP_IOTASKLIST as possible and issuing what it labeled error messages but were really warnings about the incorrect portions and functionally just ignoring it, unless none of it was usable in which case it fell back on the default. Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/mpi/romio/adio/ad_gpfs/pe/ad_pe_aggrs.c b/src/mpi/romio/adio/ad_gpfs/pe/ad_pe_aggrs.c index dfeeff5..8453238 100644 --- a/src/mpi/romio/adio/ad_gpfs/pe/ad_pe_aggrs.c +++ b/src/mpi/romio/adio/ad_gpfs/pe/ad_pe_aggrs.c @@ -60,50 +60,89 @@ ADIOI_PE_gen_agg_ranklist(ADIO_File fd) int i,j; int inTERcommFlag = 0; - int myRank; + int myRank,commSize; MPI_Comm_rank(fd->comm, &myRank); + MPI_Comm_size(fd->comm, &commSize); MPI_Comm_test_inter(fd->comm, &inTERcommFlag); if (inTERcommFlag) { - FPRINTF(stderr,"inTERcomms are not supported in MPI-IO - aborting....\n"); + FPRINTF(stderr,"ERROR: ATTENTION: inTERcomms are not supported in MPI-IO - aborting....\n"); perror("ADIOI_PE_gen_agg_ranklist:"); MPI_Abort(MPI_COMM_WORLD, 1); } if (ioTaskList) { + int ioTaskListLen = strlen(ioTaskList); + int ioTaskListPos = 0; char tmpBuf[8]; /* Big enough for 1M tasks (7 digits task ID). */ tmpBuf[7] = '\0'; for (i=0; i<7; i++) { tmpBuf[i] = *ioTaskList++; /* Maximum is 7 digits for 1 million. */ + ioTaskListPos++; if (*ioTaskList == ':') { /* If the next char is a ':' ends it. */ tmpBuf[i+1] = '\0'; break; } } numAggs = atoi(tmpBuf); + if (numAggs == 0) + FPRINTF(stderr,"ERROR: ATTENTION: Number of aggregators specified in MP_IOTASKLIST set at 0 - default aggregator selection will be used.\n"); + else if (!((numAggs > 0 ) && (numAggs <= commSize))) { + FPRINTF(stderr,"ERROR: ATTENTION: The number of aggregators (%s) specified in MP_IOTASKLIST is outside the communicator task range of %d.\n",tmpBuf,commSize); + numAggs = commSize; + } fd->hints->ranklist = (int *) ADIOI_Malloc (numAggs * sizeof(int)); - for (j=0; j<numAggs; j++) { + int aggIndex = 0; + while (aggIndex < numAggs) { ioTaskList++; /* Advance past the ':' */ + ioTaskListPos++; + int allDigits=1; for (i=0; i<7; i++) { + if (*ioTaskList < '0' || *ioTaskList > '9') + allDigits=0; tmpBuf[i] = *ioTaskList++; + ioTaskListPos++; if ( (*ioTaskList == ':') || (*ioTaskList == '\0') ) { tmpBuf[i+1] = '\0'; break; } } - fd->hints->ranklist[j] = atoi(tmpBuf); + if (allDigits) { + int newAggRank = atoi(tmpBuf); + if (!((newAggRank >= 0 ) && (newAggRank < commSize))) { + FPRINTF(stderr,"ERROR: ATTENTION: The aggregator '%s' specified in MP_IOTASKLIST is not within the communicator task range of 0 to %d - it will be ignored.\n",tmpBuf,commSize-1); + } + else { + int aggAlreadyAdded = 0; + for (i=0;i<aggIndex;i++) + if (fd->hints->ranklist[i] == newAggRank) { + aggAlreadyAdded = 1; + break; + } + if (!aggAlreadyAdded) + fd->hints->ranklist[aggIndex++] = newAggRank; + else + FPRINTF(stderr,"ERROR: ATTENTION: The aggregator '%d' is specified multiple times in MP_IOTASKLIST - duplicates are ignored.\n",newAggRank); + } + } + else { + FPRINTF(stderr,"ERROR: ATTENTION: The aggregator '%s' specified in MP_IOTASKLIST is not a valid integer task id - it will be ignored.\n",tmpBuf); + } /* At the end check whether the list is shorter than specified. */ - if (*ioTaskList == '\0') { - if (j < (numAggs-1)) { - numAggs = j; - } - break; + if (ioTaskListPos == ioTaskListLen) { + if (aggIndex == 0) { + FPRINTF(stderr,"ERROR: ATTENTION: No aggregators were correctly specified in MP_IOTASKLIST - default aggregator selection will be used.\n"); + ADIOI_Free(fd->hints->ranklist); + } + else if (aggIndex < numAggs) + FPRINTF(stderr,"ERROR: ATTENTION: %d aggregators were specified in MP_IOTASKLIST but only %d were correctly specified - setting the number of aggregators to %d.\n",numAggs, aggIndex,aggIndex); + numAggs = aggIndex; } } } - else { + if (numAggs == 0) { MPID_Comm *mpidCommData; MPID_Comm_get_ptr(fd->comm,mpidCommData); ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/ad_gpfs/ad_gpfs_aggrs.c | 14 +++--- src/mpi/romio/adio/ad_gpfs/pe/ad_pe_aggrs.c | 59 ++++++++++++++++++++++----- 2 files changed, 56 insertions(+), 17 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.3-48-gee83ffb
by noreply＠mpich.org 27 Oct '14

27 Oct '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 ee83ffb52e7d2f2c357078b3bbd25939fd009ac8 (commit) from 1555ef7be24e3c83e7e04adbf98f111d7d139637 (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/ee83ffb52e7d2f2c357078b3bbd25939f… commit ee83ffb52e7d2f2c357078b3bbd25939fd009ac8 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Thu Oct 23 17:02:59 2014 -0500 portals4: fix get buffer location for packed sends This code did not account for the fact that the first part of the message is already sent in a PtlPut. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c index 0ab2bc7..72d64b3 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c @@ -379,8 +379,8 @@ static int send_msg(ptl_hdr_data_t ssend_flag, struct MPIDI_VC *vc, const void * MPI_nem_ptl_pack_byte(sreq->dev.segment_ptr, 0, data_sz, REQ_PTL(sreq)->chunk_buffer[0], &REQ_PTL(sreq)->overflow[0]); /* create ME for buffer so receiver can issue a GET for the data */ - me.start = REQ_PTL(sreq)->chunk_buffer[0]; - me.length = data_sz; + me.start = (char *)REQ_PTL(sreq)->chunk_buffer[0] + PTL_LARGE_THRESHOLD; + me.length = data_sz - PTL_LARGE_THRESHOLD; me.ct_handle = PTL_CT_NONE; me.uid = PTL_UID_ANY; me.options = ( PTL_ME_OP_PUT | PTL_ME_OP_GET | PTL_ME_USE_ONCE | PTL_ME_IS_ACCESSIBLE | PTL_ME_EVENT_LINK_DISABLE | ----------------------------------------------------------------------- Summary of changes: .../channels/nemesis/netmod/portals4/ptl_send.c | 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.3-47-g1555ef7
by noreply＠mpich.org 26 Oct '14

26 Oct '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 1555ef7be24e3c83e7e04adbf98f111d7d139637 (commit) from 0d4fc04f5263eca49f55d46441c44c5e8c0303c8 (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/1555ef7be24e3c83e7e04adbf98f111d7… commit 1555ef7be24e3c83e7e04adbf98f111d7d139637 Author: Pavan Balaji <balaji(a)anl.gov> Date: Tue Oct 7 22:11:10 2014 -0500 MPICH-specific initialization of mxm. The defaults used by MXM might not be fully appropriate for mpich. So we automatically initialize it to our preferred defaults unless the user is trying to override it. Signed-off-by: Xin Zhao <xinzhao3(a)illinois.edu> diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c index 37e0558..f155b82 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c @@ -107,6 +107,7 @@ static int _mxm_conf(void); #define FCNAME MPIDI_QUOTE(FUNCNAME) int MPID_nem_mxm_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_max_sz_p) { + int r; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MXM_INIT); @@ -116,6 +117,15 @@ int MPID_nem_mxm_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_ MPIU_Assert(sizeof(MPID_nem_mxm_vc_area) <= MPID_NEM_VC_NETMOD_AREA_LEN); MPIU_Assert(sizeof(MPID_nem_mxm_req_area) <= MPID_NEM_REQ_NETMOD_AREA_LEN); + + /* mpich-specific initialization of mxm */ + /* check if the user is not trying to override the tls setting + * before resetting it */ + if (getenv("MXM_TLS") == NULL) { + r = MPL_putenv("MXM_TLS=rc,dc,ud"); + MPIU_ERR_CHKANDJUMP(r, mpi_errno, MPI_ERR_OTHER, "**putenv"); + } + mpi_errno = _mxm_init(pg_rank, pg_p->size); if (mpi_errno) MPIU_ERR_POP(mpi_errno); ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/netmod/mxm/mxm_init.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.3-46-g0d4fc04
by noreply＠mpich.org 25 Oct '14

25 Oct '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 0d4fc04f5263eca49f55d46441c44c5e8c0303c8 (commit) from 3b330831cf996926482c4fe7f7941d3c8d0686b8 (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/0d4fc04f5263eca49f55d46441c44c5e8… commit 0d4fc04f5263eca49f55d46441c44c5e8c0303c8 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Sat Oct 25 16:15:59 2014 -0500 Revert "MPICH-specific initialization of mxm." This reverts commit 4ce4103ae1ee924c8d27dc5202f669e6bb5e8a35. diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c index f155b82..37e0558 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c @@ -107,7 +107,6 @@ static int _mxm_conf(void); #define FCNAME MPIDI_QUOTE(FUNCNAME) int MPID_nem_mxm_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_max_sz_p) { - int r; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MXM_INIT); @@ -117,15 +116,6 @@ int MPID_nem_mxm_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_ MPIU_Assert(sizeof(MPID_nem_mxm_vc_area) <= MPID_NEM_VC_NETMOD_AREA_LEN); MPIU_Assert(sizeof(MPID_nem_mxm_req_area) <= MPID_NEM_REQ_NETMOD_AREA_LEN); - - /* mpich-specific initialization of mxm */ - /* check if the user is not trying to override the tls setting - * before resetting it */ - if (getenv("MXM_TLS") == NULL) { - r = MPL_putenv("MXM_TLS=rc,dc,ud"); - MPIU_ERR_CHKANDJUMP(r, mpi_errno, MPI_ERR_OTHER, "**putenv"); - } - mpi_errno = _mxm_init(pg_rank, pg_p->size); if (mpi_errno) MPIU_ERR_POP(mpi_errno); ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/netmod/mxm/mxm_init.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.3-45-g3b33083
by noreply＠mpich.org 25 Oct '14

25 Oct '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 3b330831cf996926482c4fe7f7941d3c8d0686b8 (commit) from a8b9a0716215260e9b08b1c0cba89c613fffe918 (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/3b330831cf996926482c4fe7f7941d3c8… commit 3b330831cf996926482c4fe7f7941d3c8d0686b8 Author: Devendar Bureddy <devendar(a)mellanox.com> Date: Sat Oct 25 03:04:00 2014 +0300 Fix for threaded_sr Do not block in mxm for blocking sends. Instead , set req pointer let MPICH mpi layer to block on it. This will allow progress go to through MPIDI_CH3I_Progress(), which can release the global mutex in thread multiple case. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c index 7e490b3..69f3adc 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c @@ -297,7 +297,7 @@ int MPID_nem_mxm_send(MPIDI_VC_t * vc, const void *buf, int count, MPI_Datatype comm->context_id + context_offset), - 1); + 0); if (mpi_errno) MPIU_ERR_POP(mpi_errno); @@ -400,7 +400,7 @@ int MPID_nem_mxm_ssend(MPIDI_VC_t * vc, const void *buf, int count, MPI_Datatype comm->context_id + context_offset), - 1); + 0); if (mpi_errno) MPIU_ERR_POP(mpi_errno); ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/netmod/mxm/mxm_send.c | 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.3-44-ga8b9a07
by noreply＠mpich.org 24 Oct '14

24 Oct '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 a8b9a0716215260e9b08b1c0cba89c613fffe918 (commit) from 4ce4103ae1ee924c8d27dc5202f669e6bb5e8a35 (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/a8b9a0716215260e9b08b1c0cba89c613… commit a8b9a0716215260e9b08b1c0cba89c613fffe918 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Fri Oct 24 09:31:28 2014 -0500 guard against null file data representation "native", "internal", and "external32" are the only valid values for datarep, but if a user passes null (http://stackoverflow.com/questions/26548398/segmentation-fault-while-using-…) then strcmp will segfault. Signed-off-by: Wesley Bland <wbland(a)anl.gov> diff --git a/src/mpi/romio/mpi-io/set_view.c b/src/mpi/romio/mpi-io/set_view.c index 7f871c7..4a820a8 100644 --- a/src/mpi/romio/mpi-io/set_view.c +++ b/src/mpi/romio/mpi-io/set_view.c @@ -126,12 +126,12 @@ int MPI_File_set_view(MPI_File fh, MPI_Offset disp, MPI_Datatype etype, goto fn_exit; } - if (strcmp(datarep, "native") && + if ((datarep == NULL) || (strcmp(datarep, "native") && strcmp(datarep, "NATIVE") && strcmp(datarep, "external32") && strcmp(datarep, "EXTERNAL32") && strcmp(datarep, "internal") && - strcmp(datarep, "INTERNAL")) + strcmp(datarep, "INTERNAL")) ) { error_code = MPIO_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, myname, __LINE__, ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/mpi-io/set_view.c | 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.3-43-g4ce4103
by noreply＠mpich.org 24 Oct '14

24 Oct '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 4ce4103ae1ee924c8d27dc5202f669e6bb5e8a35 (commit) from b32ce89218e29ded4544b1ffe350e4cbc70bdcf9 (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/4ce4103ae1ee924c8d27dc5202f669e6b… commit 4ce4103ae1ee924c8d27dc5202f669e6bb5e8a35 Author: Pavan Balaji <balaji(a)anl.gov> Date: Tue Oct 7 22:11:10 2014 -0500 MPICH-specific initialization of mxm. The defaults used by MXM might not be fully appropriate for mpich. So we automatically initialize it to our preferred defaults unless the user is trying to override it. Signed-off-by: Xin Zhao <xinzhao3(a)illinois.edu> diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c index 37e0558..f155b82 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c @@ -107,6 +107,7 @@ static int _mxm_conf(void); #define FCNAME MPIDI_QUOTE(FUNCNAME) int MPID_nem_mxm_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_max_sz_p) { + int r; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MXM_INIT); @@ -116,6 +117,15 @@ int MPID_nem_mxm_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_ MPIU_Assert(sizeof(MPID_nem_mxm_vc_area) <= MPID_NEM_VC_NETMOD_AREA_LEN); MPIU_Assert(sizeof(MPID_nem_mxm_req_area) <= MPID_NEM_REQ_NETMOD_AREA_LEN); + + /* mpich-specific initialization of mxm */ + /* check if the user is not trying to override the tls setting + * before resetting it */ + if (getenv("MXM_TLS") == NULL) { + r = MPL_putenv("MXM_TLS=rc,dc,ud"); + MPIU_ERR_CHKANDJUMP(r, mpi_errno, MPI_ERR_OTHER, "**putenv"); + } + mpi_errno = _mxm_init(pg_rank, pg_p->size); if (mpi_errno) MPIU_ERR_POP(mpi_errno); ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/netmod/mxm/mxm_init.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.3-42-gb32ce89
by noreply＠mpich.org 23 Oct '14

23 Oct '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 b32ce89218e29ded4544b1ffe350e4cbc70bdcf9 (commit) from 21450e3956421293cda1ffb699bc70c14d517b87 (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/b32ce89218e29ded4544b1ffe350e4cbc… commit b32ce89218e29ded4544b1ffe350e4cbc70bdcf9 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Thu Oct 23 10:14:08 2014 -0500 portals4: increase unexpected message limits Set the unpexected message header limit to 2 million and allocate 512MB of buffer space. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c index 09d84f7..9535797 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c @@ -101,6 +101,13 @@ static int ptl_init(MPIDI_PG_t *pg_p, int pg_rank, char **bc_val_p, int *val_max MPIDI_Anysource_improbe_fn = MPID_nem_ptl_anysource_improbe; + /* set the unexpected header limit before PtlInit, unless it is already set in the env */ + if (getenv("PTL_LIM_MAX_UNEXPECTED_HEADERS") == NULL) { + char *envstr = MPIU_Strdup("PTL_LIM_MAX_UNEXPECTED_HEADERS=2000000"); + MPL_putenv(envstr); + MPIU_Free(envstr); + } + /* init portals */ ret = PtlInit(); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlinit", "**ptlinit %s", MPID_nem_ptl_strerror(ret)); diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_poll.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_poll.c index 2167e18..3394ff4 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_poll.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_poll.c @@ -7,7 +7,7 @@ #include "ptl_impl.h" #define OVERFLOW_LENGTH (1024*1024) -#define NUM_OVERFLOW_ME 50 +#define NUM_OVERFLOW_ME 512 static ptl_handle_me_t overflow_me_handle[NUM_OVERFLOW_ME]; static void *overflow_buf[NUM_OVERFLOW_ME]; ----------------------------------------------------------------------- Summary of changes: .../channels/nemesis/netmod/portals4/ptl_init.c | 7 +++++++ .../channels/nemesis/netmod/portals4/ptl_poll.c | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0