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 c6c0d6f6e67fcf8fb213044f551c6a577ae05dd6 (commit) via d1f533e6e43cfeba50721aae89c0c6cede34b0bc (commit) from a5686ec3c42f0357119cab7f21df46389c7acec8 (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/c6c0d6f6e67fcf8fb213044f551c6a577a... commit c6c0d6f6e67fcf8fb213044f551c6a577ae05dd6 Author: Ken Raffenetti <[email protected]> Date: Thu Apr 2 16:11:40 2015 -0500 portals4: increase max_entries limit Increases the number of matching list entries we can append. The netmod would bump into this limit on the Get portal when doing many sends above the large threshold. No reviewer. 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 f8e714e..ae9099f 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c @@ -15,6 +15,7 @@ #define UNEXPECTED_HDR_COUNT 32768 #define EVENT_COUNT 32768 #define LIST_SIZE 32768 +#define ENTRY_COUNT 32768 #define NID_KEY "NID" #define PID_KEY "PID" #define PTI_KEY "PTI" @@ -181,6 +182,8 @@ static int ptl_init(MPIDI_PG_t *pg_p, int pg_rank, char **bc_val_p, int *val_max desired.max_unexpected_headers = UNEXPECTED_HDR_COUNT; if (desired.max_list_size < LIST_SIZE && getenv("PTL_LIM_MAX_LIST_SIZE") == NULL) desired.max_list_size = LIST_SIZE; + if (desired.max_entries < ENTRY_COUNT && getenv("PTL_LIM_MAX_ENTRIES") == NULL) + desired.max_entries = ENTRY_COUNT; /* do the real init */ ret = PtlNIInit(PTL_IFACE_DEFAULT, PTL_NI_MATCHING | PTL_NI_PHYSICAL, http://git.mpich.org/mpich.git/commitdiff/d1f533e6e43cfeba50721aae89c0c6cede... commit d1f533e6e43cfeba50721aae89c0c6cede34b0bc Author: Ken Raffenetti <[email protected]> Date: Thu Apr 2 16:05:54 2015 -0500 portals4: fixup for [7d1fd292] When cleaning up uses of the max_eqs limit, I missed where we were passing it to the Rportals layer. Use EVENT_COUNT instead, same as the PtlEQAlloc calls. No reviewer. 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 1a7f5da..f8e714e 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c @@ -242,7 +242,7 @@ static int ptl_init(MPIDI_PG_t *pg_p, int pg_rank, char **bc_val_p, int *val_max MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlmdbind", "**ptlmdbind %s", MPID_nem_ptl_strerror(ret)); /* currently, rportlas only works with a single NI and EQ */ - ret = MPID_nem_ptl_rptl_init(MPIDI_Process.my_pg->size, MPIDI_nem_ptl_ni_limits.max_eqs, get_target_info); + ret = MPID_nem_ptl_rptl_init(MPIDI_Process.my_pg->size, EVENT_COUNT, get_target_info); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlniinit", "**ptlniinit %s", MPID_nem_ptl_strerror(ret)); /* allow rportal to manage the primary portal and retransmit if needed */ ----------------------------------------------------------------------- Summary of changes: .../channels/nemesis/netmod/portals4/ptl_init.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository