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

[mpich] MPICH primary repository branch, master, updated. v3.2a2-10-g0a69a9d
by noreply＠mpich.org 20 Nov '14

20 Nov '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 0a69a9d0154b86b457ac991c44de58964c0b83b5 (commit) via ea9d14fbc5a413dd7df272846f0ab76077f039c2 (commit) from 722d85a45740371c88fe7f08471ee7aca504fd6d (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/0a69a9d0154b86b457ac991c44de58964… commit 0a69a9d0154b86b457ac991c44de58964c0b83b5 Author: Min Si <msi(a)il.is.s.u-tokyo.ac.jp> Date: Wed Nov 19 14:49:06 2014 -0600 Add tests for SHM detection in win_create. This program creates window with shm window buffer and checks the correctness of RMA operations issued through that window. It generates two tests with and without alloc_shm info, in which operations are issued out as SHM OP and as AM respectively. Signed-off-by: Xin Zhao <xinzhao3(a)illinois.edu> diff --git a/test/mpi/rma/Makefile.am b/test/mpi/rma/Makefile.am index 2a02b67..1312d11 100644 --- a/test/mpi/rma/Makefile.am +++ b/test/mpi/rma/Makefile.am @@ -92,6 +92,8 @@ noinst_PROGRAMS = \ win_shared_noncontig \ win_shared_noncontig_put \ win_shared_zerobyte \ + win_shared_create_allocshm \ + win_shared_create_no_allocshm \ win_zero \ win_large_shm \ win_dynamic_acc \ @@ -218,3 +220,7 @@ mutex_bench_shm_ordered_SOURCES = mutex_bench.c mcs-mutex.c mcs-mutex.h linked_list_bench_lock_shr_nocheck_SOURCES = linked_list_bench_lock_shr.c linked_list_bench_lock_shr_nocheck_CPPFLAGS = -DUSE_MODE_NOCHECK $(AM_CPPFLAGS) + +win_shared_create_allocshm_SOURCES = win_shared_create.c +win_shared_create_no_allocshm_SOURCES = win_shared_create.c +win_shared_create_allocshm_CPPFLAGS = -DUSE_INFO_ALLOC_SHM $(AM_CPPFLAGS) diff --git a/test/mpi/rma/testlist.in b/test/mpi/rma/testlist.in index f9bc0f2..32cd86b 100644 --- a/test/mpi/rma/testlist.in +++ b/test/mpi/rma/testlist.in @@ -75,6 +75,8 @@ manyrma2 2 timeLimit=500 manyrma2_shm 2 timeLimit=500 manyrma3 2 win_shared 4 mpiversion=3.0 +win_shared_create_allocshm 4 mpiversion=3.0 +win_shared_create_no_allocshm 4 mpiversion=3.0 win_shared_noncontig 4 mpiversion=3.0 win_shared_noncontig_put 4 mpiversion=3.0 win_zero 4 mpiversion=3.0 diff --git a/test/mpi/rma/win_shared_create.c b/test/mpi/rma/win_shared_create.c new file mode 100644 index 0000000..eec22d6 --- /dev/null +++ b/test/mpi/rma/win_shared_create.c @@ -0,0 +1,140 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2014 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <assert.h> +#include <mpi.h> +#include "mpitest.h" + +#define ELEM_PER_PROC 4 +int local_buf[ELEM_PER_PROC]; + +const int verbose = 0; + +int main(int argc, char **argv) +{ + int i, rank, nproc; + int shm_rank, shm_nproc; + MPI_Aint size; + int errors = 0, all_errors = 0; + int **bases = NULL, *my_base = NULL; + int disp_unit; + MPI_Win shm_win = MPI_WIN_NULL, win = MPI_WIN_NULL; + MPI_Comm shm_comm = MPI_COMM_NULL; + MPI_Group shm_group = MPI_GROUP_NULL, world_group = MPI_GROUP_NULL; + int dst_shm_rank, dst_world_rank; + MPI_Info create_info = MPI_INFO_NULL; + + MPI_Init(&argc, &argv); + + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + MPI_Comm_size(MPI_COMM_WORLD, &nproc); + + MPI_Comm_split_type(MPI_COMM_WORLD, MPI_COMM_TYPE_SHARED, rank, MPI_INFO_NULL, &shm_comm); + + MPI_Comm_rank(shm_comm, &shm_rank); + MPI_Comm_size(shm_comm, &shm_nproc); + + /* Platform does not support shared memory, just return. */ + if (shm_nproc < 2) { + goto exit; + } + + /* Specify the last process in the node as the target process */ + dst_shm_rank = shm_nproc - 1; + MPI_Comm_group(shm_comm, &shm_group); + MPI_Comm_group(MPI_COMM_WORLD, &world_group); + MPI_Group_translate_ranks(shm_group, 1, &dst_shm_rank, world_group, &dst_world_rank); + + bases = calloc(shm_nproc, sizeof(int *)); + + /* Allocate shm window among local processes, then create a global window with + * those shm window buffers */ + MPI_Win_allocate_shared(sizeof(int) * ELEM_PER_PROC, sizeof(int), MPI_INFO_NULL, + shm_comm, &my_base, &shm_win); + if (verbose) + printf("%d -- allocate shared: my_base = %p, absolute base\n", shm_rank, my_base); + + for (i = 0; i < shm_nproc; i++) { + MPI_Win_shared_query(shm_win, i, &size, &disp_unit, &bases[i]); + if (verbose) + printf("%d -- shared query: base[%d]=%p, size %ld, unit %d\n", + shm_rank, i, bases[i], size, disp_unit); + } + +#ifdef USE_INFO_ALLOC_SHM + MPI_Info_create(&create_info); + MPI_Info_set(create_info, "alloc_shm", "true"); +#else + create_info = MPI_INFO_NULL; +#endif + + MPI_Win_create(my_base, sizeof(int) * ELEM_PER_PROC, sizeof(int), create_info, MPI_COMM_WORLD, + &win); + + /* Reset data */ + for (i = 0; i < ELEM_PER_PROC; i++) { + my_base[i] = 0; + local_buf[i] = i + 1; + } + + /* Do RMA through global window, then check value through shared window */ + MPI_Win_lock_all(0, win); + MPI_Win_lock_all(0, shm_win); + + if (shm_rank == 0) { + MPI_Put(&local_buf[0], 1, MPI_INT, dst_world_rank, 0, 1, MPI_INT, win); + MPI_Put(&local_buf[ELEM_PER_PROC - 1], 1, MPI_INT, dst_world_rank, ELEM_PER_PROC - 1, 1, + MPI_INT, win); + MPI_Win_flush(dst_world_rank, win); + } + + MPI_Win_sync(shm_win); + MPI_Barrier(shm_comm); + MPI_Win_sync(shm_win); + + if (bases[dst_shm_rank][0] != local_buf[0]) { + errors++; + printf("%d -- Got %d at rank %d index %d, expected %d\n", rank, + bases[dst_shm_rank][0], dst_shm_rank, 0, local_buf[0]); + } + if (bases[dst_shm_rank][ELEM_PER_PROC - 1] != local_buf[ELEM_PER_PROC - 1]) { + errors++; + printf("%d -- Got %d at rank %d index %d, expected %d\n", rank, + bases[dst_shm_rank][ELEM_PER_PROC - 1], dst_shm_rank, + ELEM_PER_PROC - 1, local_buf[ELEM_PER_PROC - 1]); + } + + MPI_Win_unlock_all(shm_win); + MPI_Win_unlock_all(win); + + MPI_Reduce(&errors, &all_errors, 1, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD); + + MPI_Win_free(&win); + MPI_Win_free(&shm_win); + + exit: + if (rank == 0 && all_errors == 0) + printf(" No Errors\n"); + + if (create_info != MPI_INFO_NULL) + MPI_Info_free(&create_info); + if (shm_comm != MPI_COMM_NULL) + MPI_Comm_free(&shm_comm); + if (shm_group != MPI_GROUP_NULL) + MPI_Group_free(&shm_group); + if (world_group != MPI_GROUP_NULL) + MPI_Group_free(&world_group); + + MPI_Finalize(); + + if (bases) + free(bases); + + return 0; +} http://git.mpich.org/mpich.git/commitdiff/ea9d14fbc5a413dd7df272846f0ab7607… commit ea9d14fbc5a413dd7df272846f0ab76077f039c2 Author: Min Si <msi(a)il.is.s.u-tokyo.ac.jp> Date: Wed Nov 19 13:57:39 2014 -0600 Add info check to avoid unnecessary SHM detection. If user does not explicitly set alloc_shm to TRUE in win_create, we should never detect SHM windows because of expensive overhead. However, current code does not check this info flag. This patch fixed it. Closes #2161 Signed-off-by: Xin Zhao <xinzhao3(a)illinois.edu> diff --git a/src/mpid/ch3/src/ch3u_win_fns.c b/src/mpid/ch3/src/ch3u_win_fns.c index 534516e..5339c4f 100644 --- a/src/mpid/ch3/src/ch3u_win_fns.c +++ b/src/mpid/ch3/src/ch3u_win_fns.c @@ -127,7 +127,8 @@ int MPIDI_CH3U_Win_create(void *base, MPI_Aint size, int disp_unit, MPID_Info *i mpi_errno = MPIDI_CH3U_Win_create_gather(base, size, disp_unit, info, comm_ptr, win_ptr); if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } - if (MPIDI_CH3U_Win_fns.detect_shm != NULL) { + if ((*win_ptr)->info_args.alloc_shm == TRUE + && MPIDI_CH3U_Win_fns.detect_shm != NULL) { /* Detect if shared buffers are specified for the processes in the * current node. If so, enable shm RMA.*/ mpi_errno = MPIDI_CH3U_Win_fns.detect_shm(win_ptr); diff --git a/src/mpid/ch3/src/mpid_rma.c b/src/mpid/ch3/src/mpid_rma.c index 42b4521..f0a3ae4 100644 --- a/src/mpid/ch3/src/mpid_rma.c +++ b/src/mpid/ch3/src/mpid_rma.c @@ -104,6 +104,16 @@ int MPID_Win_create(void *base, MPI_Aint size, int disp_unit, MPID_Info * info, (*win_ptr)->base = base; + /* FOR CREATE, alloc_shm info is default to set to FALSE */ + (*win_ptr)->info_args.alloc_shm = FALSE; + if (info != NULL) { + int alloc_shm_flag = 0; + char shm_alloc_value[MPI_MAX_INFO_VAL+1]; + MPIR_Info_get_impl(info, "alloc_shm", MPI_MAX_INFO_VAL, shm_alloc_value, &alloc_shm_flag); + if ((alloc_shm_flag == 1) && (!strncmp(shm_alloc_value, "true", sizeof("true")))) + (*win_ptr)->info_args.alloc_shm = TRUE; + } + mpi_errno = MPIDI_CH3U_Win_fns.create(base, size, disp_unit, info, comm_ptr, win_ptr); if (mpi_errno) MPIU_ERR_POP(mpi_errno); ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/src/ch3u_win_fns.c | 3 +- src/mpid/ch3/src/mpid_rma.c | 10 +++ test/mpi/rma/Makefile.am | 6 ++ test/mpi/rma/testlist.in | 2 + test/mpi/rma/win_shared_create.c | 140 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 160 insertions(+), 1 deletions(-) create mode 100644 test/mpi/rma/win_shared_create.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-8-g722d85a
by noreply＠mpich.org 19 Nov '14

19 Nov '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 722d85a45740371c88fe7f08471ee7aca504fd6d (commit) via bc08655f788a7df838591609942b7c582ebdd92f (commit) via d459c025b795985ca4dcfa492f34e4e3f49b548d (commit) from b28801ec52a024429e6cf86de7cd9fe4a0b1f4f2 (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/722d85a45740371c88fe7f08471ee7aca… commit 722d85a45740371c88fe7f08471ee7aca504fd6d Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Fri Nov 14 15:48:08 2014 -0600 portals4: add macro for safe PtlMEAppend Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h index 8f39d73..4071f72 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h @@ -208,6 +208,26 @@ int MPID_nem_ptl_lmt_handle_cookie(MPIDI_VC_t *vc, MPID_Request *req, MPID_IOV s int MPID_nem_ptl_lmt_done_send(MPIDI_VC_t *vc, MPID_Request *req); int MPID_nem_ptl_lmt_done_recv(MPIDI_VC_t *vc, MPID_Request *req); +/* a safe PtlMEAppend for when there is no space available */ +static inline int MPID_nem_ptl_me_append(ptl_handle_ni_t ni_handle, + ptl_pt_index_t pt_index, + const ptl_me_t *me, + ptl_list_t ptl_list, + void *user_ptr, + ptl_handle_me_t *me_handle) +{ + int ret; + + while (1) { + ret = PtlMEAppend(ni_handle, pt_index, me, ptl_list, user_ptr, me_handle); + if (ret != PTL_NO_SPACE) + break; + MPID_nem_ptl_poll(1); + } + + return ret; +} + /* packet handlers */ int MPID_nem_ptl_pkt_cancel_send_req_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c index 02fcc0b..1780920 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c @@ -63,8 +63,8 @@ int MPID_nem_ptl_nm_init(void) mes[i].match_bits = CTL_TAG; mes[i].ignore_bits = 0; - ret = PtlMEAppend(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_control_pt, &mes[i], - PTL_PRIORITY_LIST, (void *)(uint64_t)i, &me_handles[i]); + ret = MPID_nem_ptl_me_append(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_control_pt, &mes[i], + PTL_PRIORITY_LIST, (void *)(uint64_t)i, &me_handles[i]); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlmeappend", "**ptlmeappend %s", MPID_nem_ptl_strerror(ret)); } @@ -134,15 +134,8 @@ static inline int meappend_large(ptl_process_t id, MPID_Request *req, ptl_match_ ++REQ_PTL(req)->num_gets; - /* if there is no space to append the entry, process outstanding events and try again */ - while (1) { - ret = PtlMEAppend(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_control_pt, &me, PTL_PRIORITY_LIST, req, - &foo_me_handle); - if (ret != PTL_NO_SPACE) - break; - MPID_nem_ptl_poll(1); - } - + ret = MPID_nem_ptl_me_append(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_control_pt, &me, PTL_PRIORITY_LIST, req, + &foo_me_handle); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlmeappend", "**ptlmeappend %s", MPID_nem_ptl_strerror(ret)); MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "PtlMEAppend(req=%p tag=%#lx)", req, tag)); @@ -450,14 +443,8 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) } /* Repost the recv buffer */ - /* if there is no space to append the entry, process outstanding events and try again */ - while (1) { - ret = PtlMEAppend(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_control_pt, &mes[buf_idx], - PTL_PRIORITY_LIST, e->user_ptr /* buf_idx */, &me_handles[buf_idx]); - if (ret != PTL_NO_SPACE) - break; - MPID_nem_ptl_poll(1); - } + ret = MPID_nem_ptl_me_append(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_control_pt, &mes[buf_idx], + PTL_PRIORITY_LIST, e->user_ptr /* buf_idx */, &me_handles[buf_idx]); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlmeappend", "**ptlmeappend %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 0a3bf10..3e22556 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_poll.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_poll.c @@ -106,13 +106,8 @@ static int append_overflow(int i) me.min_free = PTL_MAX_EAGER; /* if there is no space to append the entry, process outstanding events and try again */ - while (1) { - ret = PtlMEAppend(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_pt, &me, PTL_OVERFLOW_LIST, (void *)(size_t)i, - &overflow_me_handle[i]); - if (ret != PTL_NO_SPACE) - break; - MPID_nem_ptl_poll(1); - } + ret = MPID_nem_ptl_me_append(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_pt, &me, PTL_OVERFLOW_LIST, (void *)(size_t)i, + &overflow_me_handle[i]); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlmeappend", "**ptlmeappend %s", MPID_nem_ptl_strerror(ret)); fn_exit: diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c index 3633236..e69e9b1 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c @@ -543,13 +543,7 @@ int MPID_nem_ptl_recv_posted(MPIDI_VC_t *vc, MPID_Request *rreq) } - /* if there is no space to append the entry, process outstanding events and try again */ - while (1) { - ret = PtlMEAppend(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_pt, &me, PTL_PRIORITY_LIST, rreq, &REQ_PTL(rreq)->put_me); - if (ret != PTL_NO_SPACE) - break; - MPID_nem_ptl_poll(1); - } + ret = MPID_nem_ptl_me_append(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_pt, &me, PTL_PRIORITY_LIST, rreq, &REQ_PTL(rreq)->put_me); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlmeappend", "**ptlmeappend %s", MPID_nem_ptl_strerror(ret)); DBG_MSG_MEAPPEND("REG", vc ? vc->pg_rank : MPI_ANY_SOURCE, me, rreq); MPIU_DBG_MSG_P(CH3_CHANNEL, VERBOSE, " buf=%p", me.start); 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 f6402f9..e49546f 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c @@ -41,13 +41,8 @@ static void big_meappend(void *buf, ptl_size_t left_to_send, MPIDI_VC_t *vc, ptl else me.length = left_to_send; - /* if there is no space to append the entry, process outstanding events and try again */ - while (1) { - ret = PtlMEAppend(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_get_pt, &me, PTL_PRIORITY_LIST, sreq, &REQ_PTL(sreq)->get_me_p[i]); - if (ret != PTL_NO_SPACE) - break; - MPID_nem_ptl_poll(1); - } + ret = MPID_nem_ptl_me_append(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_get_pt, &me, PTL_PRIORITY_LIST, sreq, + &REQ_PTL(sreq)->get_me_p[i]); DBG_MSG_MEAPPEND("CTL", vc->pg_rank, me, sreq); MPIU_Assert(ret == 0); @@ -387,14 +382,8 @@ static int send_msg(ptl_hdr_data_t ssend_flag, struct MPIDI_VC *vc, const void * MPIU_CHKPMEM_MALLOC(REQ_PTL(sreq)->get_me_p, ptl_handle_me_t *, sizeof(ptl_handle_me_t), mpi_errno, "get_me_p"); REQ_PTL(sreq)->num_gets = 1; - /* if there is no space to append the entry, process outstanding events and try again */ - while (1) { - ret = PtlMEAppend(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_get_pt, &me, PTL_PRIORITY_LIST, sreq, - &REQ_PTL(sreq)->get_me_p[0]); - if (ret != PTL_NO_SPACE) - break; - MPID_nem_ptl_poll(1); - } + ret = MPID_nem_ptl_me_append(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_get_pt, &me, PTL_PRIORITY_LIST, sreq, + &REQ_PTL(sreq)->get_me_p[0]); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlmeappend", "**ptlmeappend %s", MPID_nem_ptl_strerror(ret)); DBG_MSG_MEAPPEND("CTL", vc->pg_rank, me, sreq); http://git.mpich.org/mpich.git/commitdiff/bc08655f788a7df838591609942b7c582… commit bc08655f788a7df838591609942b7c582ebdd92f Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Fri Nov 14 10:41:53 2014 -0600 portals4: raise list size limit 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 ffad963..3b0807d 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c @@ -14,6 +14,7 @@ #define UNEXPECTED_HDR_COUNT 32768 #define EQ_COUNT 32768 +#define LIST_SIZE 32768 #define NID_KEY "NID" #define PID_KEY "PID" #define PTI_KEY "PTI" @@ -180,6 +181,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_eqs < EQ_COUNT && getenv("PTL_LIM_MAX_EQS") == NULL) desired.max_eqs = EQ_COUNT; + if (desired.max_list_size < LIST_SIZE && getenv("PTL_LIM_MAX_LIST_SIZE") == NULL) + desired.max_list_size = LIST_SIZE; /* do the real init */ ret = PtlNIInit(PTL_IFACE_DEFAULT, PTL_NI_MATCHING | PTL_NI_PHYSICAL, http://git.mpich.org/mpich.git/commitdiff/d459c025b795985ca4dcfa492f34e4e3f… commit d459c025b795985ca4dcfa492f34e4e3f49b548d Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Thu Nov 13 13:10:20 2014 -0600 portals4: handle PTL_NO_SPACE It is possible that PtlMEAppend can return a PTL_NO_SPACE error, meaning there are too many outstanding operations already active. To avoid an abort we simply retry after processing events that have queued up locally. Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c index 9a1000e..02fcc0b 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c @@ -134,8 +134,15 @@ static inline int meappend_large(ptl_process_t id, MPID_Request *req, ptl_match_ ++REQ_PTL(req)->num_gets; - ret = PtlMEAppend(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_control_pt, &me, PTL_PRIORITY_LIST, req, - &foo_me_handle); + /* if there is no space to append the entry, process outstanding events and try again */ + while (1) { + ret = PtlMEAppend(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_control_pt, &me, PTL_PRIORITY_LIST, req, + &foo_me_handle); + if (ret != PTL_NO_SPACE) + break; + MPID_nem_ptl_poll(1); + } + MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlmeappend", "**ptlmeappend %s", MPID_nem_ptl_strerror(ret)); MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "PtlMEAppend(req=%p tag=%#lx)", req, tag)); @@ -443,8 +450,14 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) } /* Repost the recv buffer */ - ret = PtlMEAppend(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_control_pt, &mes[buf_idx], - PTL_PRIORITY_LIST, e->user_ptr /* buf_idx */, &me_handles[buf_idx]); + /* if there is no space to append the entry, process outstanding events and try again */ + while (1) { + ret = PtlMEAppend(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_control_pt, &mes[buf_idx], + PTL_PRIORITY_LIST, e->user_ptr /* buf_idx */, &me_handles[buf_idx]); + if (ret != PTL_NO_SPACE) + break; + MPID_nem_ptl_poll(1); + } MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlmeappend", "**ptlmeappend %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 c016952..0a3bf10 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_poll.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_poll.c @@ -105,8 +105,14 @@ static int append_overflow(int i) me.ignore_bits = ~((ptl_match_bits_t)0); me.min_free = PTL_MAX_EAGER; - ret = PtlMEAppend(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_pt, &me, PTL_OVERFLOW_LIST, (void *)(size_t)i, - &overflow_me_handle[i]); + /* if there is no space to append the entry, process outstanding events and try again */ + while (1) { + ret = PtlMEAppend(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_pt, &me, PTL_OVERFLOW_LIST, (void *)(size_t)i, + &overflow_me_handle[i]); + if (ret != PTL_NO_SPACE) + break; + MPID_nem_ptl_poll(1); + } MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlmeappend", "**ptlmeappend %s", MPID_nem_ptl_strerror(ret)); fn_exit: diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c index ec6d90a..3633236 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c @@ -543,7 +543,13 @@ int MPID_nem_ptl_recv_posted(MPIDI_VC_t *vc, MPID_Request *rreq) } - ret = PtlMEAppend(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_pt, &me, PTL_PRIORITY_LIST, rreq, &REQ_PTL(rreq)->put_me); + /* if there is no space to append the entry, process outstanding events and try again */ + while (1) { + ret = PtlMEAppend(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_pt, &me, PTL_PRIORITY_LIST, rreq, &REQ_PTL(rreq)->put_me); + if (ret != PTL_NO_SPACE) + break; + MPID_nem_ptl_poll(1); + } MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlmeappend", "**ptlmeappend %s", MPID_nem_ptl_strerror(ret)); DBG_MSG_MEAPPEND("REG", vc ? vc->pg_rank : MPI_ANY_SOURCE, me, rreq); MPIU_DBG_MSG_P(CH3_CHANNEL, VERBOSE, " buf=%p", me.start); 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 34a1b4f..f6402f9 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c @@ -41,7 +41,13 @@ static void big_meappend(void *buf, ptl_size_t left_to_send, MPIDI_VC_t *vc, ptl else me.length = left_to_send; - ret = PtlMEAppend(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_get_pt, &me, PTL_PRIORITY_LIST, sreq, &REQ_PTL(sreq)->get_me_p[i]); + /* if there is no space to append the entry, process outstanding events and try again */ + while (1) { + ret = PtlMEAppend(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_get_pt, &me, PTL_PRIORITY_LIST, sreq, &REQ_PTL(sreq)->get_me_p[i]); + if (ret != PTL_NO_SPACE) + break; + MPID_nem_ptl_poll(1); + } DBG_MSG_MEAPPEND("CTL", vc->pg_rank, me, sreq); MPIU_Assert(ret == 0); @@ -381,8 +387,14 @@ static int send_msg(ptl_hdr_data_t ssend_flag, struct MPIDI_VC *vc, const void * MPIU_CHKPMEM_MALLOC(REQ_PTL(sreq)->get_me_p, ptl_handle_me_t *, sizeof(ptl_handle_me_t), mpi_errno, "get_me_p"); REQ_PTL(sreq)->num_gets = 1; - ret = PtlMEAppend(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_get_pt, &me, PTL_PRIORITY_LIST, sreq, - &REQ_PTL(sreq)->get_me_p[0]); + /* if there is no space to append the entry, process outstanding events and try again */ + while (1) { + ret = PtlMEAppend(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_get_pt, &me, PTL_PRIORITY_LIST, sreq, + &REQ_PTL(sreq)->get_me_p[0]); + if (ret != PTL_NO_SPACE) + break; + MPID_nem_ptl_poll(1); + } MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlmeappend", "**ptlmeappend %s", MPID_nem_ptl_strerror(ret)); DBG_MSG_MEAPPEND("CTL", vc->pg_rank, me, sreq); diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/rptl_init.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/rptl_init.c index 9262c5e..ce6113d 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/rptl_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/rptl_init.c @@ -35,7 +35,11 @@ int rptli_post_control_buffer(ptl_handle_ni_t ni_handle, ptl_pt_index_t pt, me.ignore_bits = 0; me.min_free = 0; - ret = PtlMEAppend(ni_handle, pt, &me, PTL_PRIORITY_LIST, NULL, me_handle); + while (1) { + ret = PtlMEAppend(ni_handle, pt, &me, PTL_PRIORITY_LIST, NULL, me_handle); + if (ret != PTL_NO_SPACE) + break; + } RPTLU_ERR_POP(ret, "Error appending empty buffer to priority list\n"); fn_exit: ----------------------------------------------------------------------- Summary of changes: .../channels/nemesis/netmod/portals4/ptl_impl.h | 20 ++++++++++++++++++++ .../channels/nemesis/netmod/portals4/ptl_init.c | 3 +++ .../ch3/channels/nemesis/netmod/portals4/ptl_nm.c | 12 ++++++------ .../channels/nemesis/netmod/portals4/ptl_poll.c | 5 +++-- .../channels/nemesis/netmod/portals4/ptl_recv.c | 2 +- .../channels/nemesis/netmod/portals4/ptl_send.c | 7 ++++--- .../channels/nemesis/netmod/portals4/rptl_init.c | 6 +++++- 7 files changed, 42 insertions(+), 13 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-5-gb28801e
by noreply＠mpich.org 18 Nov '14

18 Nov '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 b28801ec52a024429e6cf86de7cd9fe4a0b1f4f2 (commit) via 68113ff6eeb44c5b05de996942058582bad063cb (commit) via 960a9c8a09b4e4e20e874e812a538ad64ff81fc9 (commit) from 23c3ed3a1ab18a95006889ddd33cf1441e4f8ce5 (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/b28801ec52a024429e6cf86de7cd9fe4a… commit b28801ec52a024429e6cf86de7cd9fe4a0b1f4f2 Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Mon Nov 17 20:23:57 2014 -0600 Add MPI_Status_f2f08 & MPI_Status_f082f No reviewer diff --git a/src/binding/fortran/use_mpi_f08/mpi_f08_types.F90 b/src/binding/fortran/use_mpi_f08/mpi_f08_types.F90 index f87e1d4..f669123 100644 --- a/src/binding/fortran/use_mpi_f08/mpi_f08_types.F90 +++ b/src/binding/fortran/use_mpi_f08/mpi_f08_types.F90 @@ -385,6 +385,30 @@ subroutine MPI_Sizeof_xcomplex128 (x, size, ierror) ierror = 0 end subroutine MPI_Sizeof_xcomplex128 +subroutine MPI_Status_f2f08(f_status, f08_status, ierror) + integer, intent(in) :: f_status(MPI_STATUS_SIZE) + type(MPI_Status), intent(out) :: f08_status + integer, optional, intent(out) :: ierror + f08_status%count_lo = f_status(1) + f08_status%count_hi_and_cancelled = f_status(2) + f08_status%MPI_SOURCE = f_status(MPI_SOURCE) + f08_status%MPI_TAG = f_status(MPI_TAG) + f08_status%MPI_ERROR = f_status(MPI_ERROR) + if (present(ierror)) ierror = 0 +end subroutine + +subroutine MPI_Status_f082f(f08_status, f_status, ierror) + type(MPI_Status), intent(in) :: f08_status + integer, intent(out) :: f_status(MPI_STATUS_SIZE) + integer, optional, intent(out) :: ierror + f_status(1) = f08_status%count_lo + f_status(2) = f08_status%count_hi_and_cancelled + f_status(MPI_SOURCE) = f08_status%MPI_SOURCE + f_status(MPI_TAG) = f08_status%MPI_TAG + f_status(MPI_ERROR) = f08_status%MPI_ERROR + if (present(ierror)) ierror = 0 +end subroutine + elemental subroutine MPI_Status_f08_assgn_c (status_f08, status_c) ! Defined status_f08 = status_c type(MPI_Status),intent(out) :: status_f08 http://git.mpich.org/mpich.git/commitdiff/68113ff6eeb44c5b05de996942058582b… commit 68113ff6eeb44c5b05de996942058582bad063cb Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Mon Nov 17 20:23:34 2014 -0600 Fix an arg name in MPI_TYPE_NULL_DELETE_FN No reviewer diff --git a/src/binding/fortran/use_mpi_f08/mpi_f08_callbacks.F90 b/src/binding/fortran/use_mpi_f08/mpi_f08_callbacks.F90 index 4a596dd..9de14e9 100644 --- a/src/binding/fortran/use_mpi_f08/mpi_f08_callbacks.F90 +++ b/src/binding/fortran/use_mpi_f08/mpi_f08_callbacks.F90 @@ -237,12 +237,12 @@ subroutine MPI_TYPE_NULL_COPY_FN(oldtype,type_keyval,extra_state, & ierror = MPI_SUCCESS end subroutine -subroutine MPI_TYPE_NULL_DELETE_FN(type,type_keyval, & +subroutine MPI_TYPE_NULL_DELETE_FN(datatype,type_keyval, & attribute_val, extra_state, ierror) use mpi_f08_types, only : MPI_Datatype use mpi_f08_compile_constants, only : MPI_ADDRESS_KIND, MPI_SUCCESS implicit none - type(MPI_Datatype) :: type + type(MPI_Datatype) :: datatype integer :: type_keyval, ierror integer(kind=MPI_ADDRESS_KIND) :: attribute_val, extra_state http://git.mpich.org/mpich.git/commitdiff/960a9c8a09b4e4e20e874e812a538ad64… commit 960a9c8a09b4e4e20e874e812a538ad64ff81fc9 Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Mon Nov 17 20:22:56 2014 -0600 Fix an arg name in MPI_Comm_set_info No reviewer diff --git a/src/binding/fortran/use_mpi_f08/mpi_f08.F90 b/src/binding/fortran/use_mpi_f08/mpi_f08.F90 index d1ba398..de11fb2 100644 --- a/src/binding/fortran/use_mpi_f08/mpi_f08.F90 +++ b/src/binding/fortran/use_mpi_f08/mpi_f08.F90 @@ -1557,11 +1557,11 @@ interface MPI_Comm_set_attr end interface MPI_Comm_set_attr interface MPI_Comm_set_info - subroutine MPI_Comm_set_info_f08(comm, info_used, ierror) + subroutine MPI_Comm_set_info_f08(comm, info, ierror) use :: mpi_f08_types, only : MPI_Comm, MPI_Info implicit none type(MPI_Comm), intent(in) :: comm - type(MPI_Info), intent(in) :: info_used + type(MPI_Info), intent(in) :: info integer, optional, intent(out) :: ierror end subroutine MPI_Comm_set_info_f08 end interface MPI_Comm_set_info ----------------------------------------------------------------------- Summary of changes: src/binding/fortran/use_mpi_f08/mpi_f08.F90 | 4 +- .../fortran/use_mpi_f08/mpi_f08_callbacks.F90 | 4 +- src/binding/fortran/use_mpi_f08/mpi_f08_types.F90 | 24 ++++++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-2-g23c3ed3
by noreply＠mpich.org 18 Nov '14

18 Nov '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 23c3ed3a1ab18a95006889ddd33cf1441e4f8ce5 (commit) from 1beada6b2ef4f6b1db7bdd380d57e471fd4d03e4 (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/23c3ed3a1ab18a95006889ddd33cf1441… commit 23c3ed3a1ab18a95006889ddd33cf1441e4f8ce5 Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Mon Nov 17 20:41:17 2014 -0600 Fix a typo for MPI_TYPE_NULL It should be MPI_DATATYPE_NULL. MPI does not have MPI_TYPE_NULL. Signed-off-by: Huiwei Lu <huiweilu(a)mcs.anl.gov> diff --git a/src/mpid/common/sched/mpid_sched.c b/src/mpid/common/sched/mpid_sched.c index 2fab4d6..21082d1 100644 --- a/src/mpid/common/sched/mpid_sched.c +++ b/src/mpid/common/sched/mpid_sched.c @@ -19,7 +19,7 @@ #endif /* helper macros to improve code readability */ -/* we pessimistically assume that MPI_TYPE_NULL may be passed as a "valid" type +/* we pessimistically assume that MPI_DATATYPE_NULL may be passed as a "valid" type * for send/recv when MPI_PROC_NULL is the destination/src */ #define dtype_add_ref_if_not_builtin(datatype_) \ do { \ diff --git a/test/mpi/f08/ext/ctypesinf90.f90 b/test/mpi/f08/ext/ctypesinf90.f90 index 815d9b0..131761f 100644 --- a/test/mpi/f08/ext/ctypesinf90.f90 +++ b/test/mpi/f08/ext/ctypesinf90.f90 @@ -31,11 +31,11 @@ errs = errs + f2ctype( MPI_LONG_INT, 14 ) errs = errs + f2ctype( MPI_SHORT_INT, 15 ) errs = errs + f2ctype( MPI_2INT, 16 ) - if (MPI_LONG_DOUBLE .ne. MPI_TYPE_NULL) then + if (MPI_LONG_DOUBLE .ne. MPI_DATATYPE_NULL) then errs = errs + f2ctype( MPI_LONG_DOUBLE, 17 ) errs = errs + f2ctype( MPI_LONG_DOUBLE_INT, 21 ) endif - if (MPI_LONG_LONG .ne. MPI_TYPE_NULL) then + if (MPI_LONG_LONG .ne. MPI_DATATYPE_NULL) then errs = errs + f2ctype( MPI_LONG_LONG_INT, 18 ) errs = errs + f2ctype( MPI_LONG_LONG, 19 ) errs = errs + f2ctype( MPI_UNSIGNED_LONG_LONG, 20 ) diff --git a/test/mpi/f77/ext/ctypesinf.f b/test/mpi/f77/ext/ctypesinf.f index f4d8ccb..5ee8d8c 100644 --- a/test/mpi/f77/ext/ctypesinf.f +++ b/test/mpi/f77/ext/ctypesinf.f @@ -31,11 +31,11 @@ C errs = errs + f2ctype( MPI_LONG_INT, 14 ) errs = errs + f2ctype( MPI_SHORT_INT, 15 ) errs = errs + f2ctype( MPI_2INT, 16 ) - if (MPI_LONG_DOUBLE .ne. MPI_TYPE_NULL) then + if (MPI_LONG_DOUBLE .ne. MPI_DATATYPE_NULL) then errs = errs + f2ctype( MPI_LONG_DOUBLE, 17 ) errs = errs + f2ctype( MPI_LONG_DOUBLE_INT, 21 ) endif - if (MPI_LONG_LONG .ne. MPI_TYPE_NULL) then + if (MPI_LONG_LONG .ne. MPI_DATATYPE_NULL) then errs = errs + f2ctype( MPI_LONG_LONG_INT, 18 ) errs = errs + f2ctype( MPI_LONG_LONG, 19 ) errs = errs + f2ctype( MPI_UNSIGNED_LONG_LONG, 20 ) ----------------------------------------------------------------------- Summary of changes: src/mpid/common/sched/mpid_sched.c | 2 +- test/mpi/f08/ext/ctypesinf90.f90 | 4 ++-- test/mpi/f77/ext/ctypesinf.f | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-1-g1beada6
by noreply＠mpich.org 17 Nov '14

17 Nov '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 1beada6b2ef4f6b1db7bdd380d57e471fd4d03e4 (commit) from e9a2470032936b4c083506ae5d25f798a8cd56db (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/1beada6b2ef4f6b1db7bdd380d57e471f… commit 1beada6b2ef4f6b1db7bdd380d57e471fd4d03e4 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Mon Nov 17 22:06:21 2014 -0600 use 0 to indicate false in while expression diff --git a/src/mpid/ch3/src/ch3u_recvq.c b/src/mpid/ch3/src/ch3u_recvq.c index 48ba649..ff769f7 100644 --- a/src/mpid/ch3/src/ch3u_recvq.c +++ b/src/mpid/ch3/src/ch3u_recvq.c @@ -595,7 +595,7 @@ MPID_Request * MPIDI_CH3U_Recvq_FDU_or_AEP(int source, int tag, prev_rreq = rreq; rreq = rreq->dev.next; } while (rreq); - } while (false); + } while (0); } } MPIR_T_PVAR_TIMER_END(RECVQ, time_matching_unexpectedq); ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/src/ch3u_recvq.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository annotated tag, v3.2a2, created. v3.2a2
by noreply＠mpich.org 16 Nov '14

16 Nov '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 annotated tag, v3.2a2 has been created at ade06be8d549f79112d31e8c3a98e7969215a586 (tag) tagging e9a2470032936b4c083506ae5d25f798a8cd56db (commit) replaces v3.1.3 tagged by Pavan Balaji on Sun Nov 16 11:24:47 2014 -0600 - Log ----------------------------------------------------------------- tagging v3.2a2 Antonio J. Pena (1): Fix Portals4 RMA Antonio Pena Monferrer (8): portals4: consider MPI_STATUS_IGNORE in Probe Added support for large-count datatype tests Added large message cases to getfence1/putfence1 Added internal control portal for the get portal Code cleanup to fix compiler warnings in rportals Remove unnecessary soft ACKs from portals RMA code Use SEND instead of ACK events in Portals4 Fix strict-aliasing rules break in Portals netmod Devendar Bureddy (2): Fix for threaded_sr Fix hcoll setup issues Huiwei Lu (11): Mark two MPI_Comm_idup related tests as xfail Simplify revoke_nofail test Fixes one missing case in MPIDI_CH3U_Clean_recvq Fixes configure.ac when no fortran is found Improves RTS queue to be dynamic and VC specific Adds a CVAR to enable/disable fault tolerance Fixes env in runtest Adds checking VC state in MPID_Send Adds checking VC state in MPID_Recv Enable all ft tests Cleans the debugging print of bcast Igor Ivanov (5): netmode/mxm: Add mprobe/imrecv support mpi/coll: Fix incorrect parameter check mpid: Fix REQUEST memory leak for Irsend netmod/mxm: Avoid calling mxm send req handling from mxm send completion callback netmod/mxm: Avoid calling mxm send req handling from mxm send completion callback Joe Ratterman (1): When decrementing a ref-count to 0, do not bother with atomics. Junchao Zhang (20): Add the missing value attribute to intent(in) arguments Revise F08 MPI_Wtime/Wtick to make buildiface simpler Make F08 buildiface also support MPIX_ subroutines Code clean up for enum MPIR_MPI_State_t Make MPI_Initialized and friends thread-safe Rename enum MPICH_WITHIN_MPI to MPICH_IN_INIT Uncomment some code in F08 since the cce bug is fixed Add MPI_Aint arithmetic MPI_Aint_add/diff Add F77/90 bindings for MPI_Aint_add/diff Add F08 bindings for MPI_Aint_add/diff Add C/Fortran tests for MPI_Aint_add/diff Remove unused AM_CONDITIONAL vars in testsuite configure.ac Add support for skipping individual MPIX tests Fix: be able to skip MPIX tests for Aint_add/diff Fix: Explicitly add the OPA header file to mpiimpl.h Add support for MPIX_ subroutines in cdesc buildiface Fix: skip #ifdef/#endif lines in input headers Add F08 bindings for nonblocking collective I/O Add Fortran tests for nonblocking collective I/O Support spaces after @whatever@ in testlist Ken Raffenetti (26): portals4: PTL_EVENT_PUT is only valid at the target portals4: remove pointer update from unmatched improbe portals4: large threshold comparison disable interlibrary dependencies on BGQ portals4: increase unexpected message limits portals4: fix get buffer location for packed sends portals4: reduce unexpected buffer space portals4: set reasonable interface limits tsuite: disable threads/rma tests when RMA disabled portals4: create EQ using limit from NI init portals4: create separate EQ for origin events portals4: support for large contiguous messages portals4: add support for large non-contig portals4: use helper function for big sends add test for large non-contiguous datatype portals4: handle out-of-order reply events portals4: prevent early request free portals4: set max origin events in rptl_init portals4: temporarily buf counts in ptl_nm.c portals4: fixup for noncontig recvs portals4: implement cancel send portals4: use a separate EQ per PT portals4: better dtype mismatch detection update .gitignore in testsuite portals4: change variable name put_acked -> put_done fix typo in function argument Min Si (17): Bug-fix: trigger final req handler for receiving derived datatype. Bug-fix: use normal PUT/ACC + FLUSH in req ops test. Implement true request-based RMA operations. Bug-fix: trigger OnFinal at end when receiving multiple segments. Add req RMA op tests checking local completion. Separate and rewrite mtest datatype. Use general free func for all datatype. Move datatype reset to mtest_datatype.c Add new datatypes in mtest_datatype. Use unified loop of mtest datatype in mpi tests. Change count of mtest datatype in bcast3 mpi test. Add min version of mtest datatype generator. Increase timelimit to 10mins for bcast2 and bcast3. Revert RMA ADI change for req-based RMA operations. Increase time limit of bcast2 and bcast3 to 12mins. Increase bcast2,bcast3 timelimit to 13 mins. Increase bcast2 and bcast3 timelimit to 20mins. Norio Yamaguchi (3): Fix compile error Fix the implementation of RMA in netmod-IB Fix malloc functions in netmod-IB Paul Coffman (7): Remove Blue Gene/Q specific MPID_VCR_GET_LPIDS Disable MPIDI_Init_collsel_extension call on BGQ MPIDO_Ibarrier optimized pami code incorrect MPIDI_Coll_comm_create unsetting default collops for inTERcomms fix failure to update status in p2pcontig case MP_IOTASKLIST error checking Assign large blocks first in ADIOI_GPFS_Calc_file_domains Pavan Balaji (25): Added a note in the README about MXM_LOG_LEVEL. MPICH-specific initialization of hcoll. Test MPI_IN_PLACE variants of NBCs. Fixes to the man and www page builds. Allow ROMIO to propagate library dependencies to MPICH. Function state cleanup. Change macros to use standard format Remove unnecessary arbitrary code. Delete the unsupported mx and wintcp netmods. Bug-fix: free all created portals. MPICH-specific initialization of mxm. MPICH-specific initialization of mxm. Disable hugepage support by default. Initial draft of flow-control in the portals4 netmod. Remove namespacing for static functions and types. Several updates to the rportals code. Do not expose the flowcontrol parameter to the user. Change "flow_control" to data/control portal type. Fix rportals bug when ACK not requested rportals code refactoring. Additional comments to explain what we are doing. On an error drop all existing events for that op. Clean up event stashing. Update version information for 3.2a2. Added CHANGES for 3.2a2. Rob Latham (2): romio: small formatting fix for compiler warnings guard against null file data representation Sangmin Seo (5): Change mpich-discuss(a)mcs.anl.gov to discuss(a)mpich.org. Add nonblocking collective I/O functions. Add tests for nonblocking collective I/O. Add more nonblocking collective I/O tests. Fix incorrect sendbufs used in MPI_Iallgather. Wesley Bland (35): Revert "Test MPI_IN_PLACE variants of NBCs." Test MPI_IN_PLACE variants of NBCs. Remove MPIR_CVAR_ENABLE_COLL_FT_RET Fix FUNC_ENTER macros for some ft functions Don't test tags when unnecessary Add a test for combining agree and shrink Copy tag checking proceedure to all MPIC funcs Fix typo in bcast macro Don't try to destroy a request if it doesn't exist Unmark ft tests: die, barrier, reduce Remove _FT from state names Fix typo in 72513b14 Unmark more FT tests Fix configure related to --enable-error-checking Improve the senddead test Add a queue for shm RTS messages Add a warning if the RTS queue is overflowed Add CVAR for initial size of RTS queue Add MPID_Request_is_pending_failure Check for any source reqs that should be pending Check for pending any source ops Return request from IRECV even if failure Improve the anysource test Mark anysource as not failing anymore Clean up revoke function Correctly match requests when revoking Enable revoke_nofail in test Remove unused variable Take a bit in the tag space for proc failure Change errflag to be an enum Correctly handle errflag in MPI collectives Mark collective FT tests as passing Fix null pointer deref in pending check Cleanup FT tests Add test for revoke+shrink Xin Zhao (59): Revert "MPICH-specific initialization of mxm." Revert "netmod/mxm: Avoid calling mxm send req handling from mxm send completion callback" Clean up white-space and code format in RMA code. Bug-fix: always waiting for remote completion in Win_unlock. Bug-fix: avoid free NULL pointer in RMA. Temporarily remove all RMA PVARs. Code refactoring to clean up the RMA code. Inline static functions to remove compiler warnings. Avoid using VC in RMA lock queue structure. Rename ACK packets in RMA. Embedding packet structure into RMA operation structure. Add global / local pools of RMA ops and related APIs. Add target element and global / local pools and related APIs. Add RMA slots and related APIs. Add routine to enqueue op to RMA slots. Add global window list. Add a flag in op struct to indicate derived datatype. Add new RMA states on window / target and modify state checking. Keep track of no. of non-empty slots on window. Add nonblocking ops / targets GC functions. Add nonblocking progress making functions. Add blocking ops / targets aggressively cleanup functions. Free incomplete ops when FLUSH ordering is provided. Implement GET_OP routine which guarantees to return an OP. Enable making progress in operation routines. Control no. of active RMA requests in the runtime. Rewrite all synchronization routines. Separate pkt handler of ACC and GACC into two handlers. Split shared RMA packet structures. Separate request handler of PUT, ACC, GACC and rename them. Detect remote completion by FLUSH / FLUSH_ACK messages. Decrement Active Target counter at target side. code refactoring in operation routines. Add useful pkt wrappers. Add IMMED area in packet header. Simplify issuing functions at origin side. Simplify PktHandler_FOP and PktHandler_FOPResp. Rearrange enum of pkt types. Reset the start of the enum to 0. Rewrite code of passive lock control messages. Delete no longer needed code. add original RMA PVARs back. Move ircpi.c from test/mpi/rma to examples. Remove unused variable in examples/ircpi.c. Move definition of global window counters to nemesis / sock. Bug-fix: unset progress flag in branch that does not make progress. Bug-fix: add CVAR category CH3 back. Bug-fix: initialize sync_flag to MPIDI_RMA_SYNC_NONE. Set the initial value of enum in RMA code to different values. Delete redundant enum values for lock types. Bug-fixing: set window state to MPIDI_RMA_NONE when UNLOCK finishes. Delete no longer used epoch states. Delete no longer needed file. Delete unused variable. Perf-tuning: issue FLUSH, FLUSH ACK, UNLOCK ACK messages only when needed. Initialize flag in pkt when creating RMA operation. Modify do_accumulate_op() to accept better arguments. Code-refactoring: wrapping up action of finishing op on target. Split shared request handler. ----------------------------------------------------------------------- hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.3-227-ge9a2470
by noreply＠mpich.org 14 Nov '14

14 Nov '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 e9a2470032936b4c083506ae5d25f798a8cd56db (commit) from e6c82f0942da9972a45138730fffb016ed4729c9 (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/e9a2470032936b4c083506ae5d25f798a… commit e9a2470032936b4c083506ae5d25f798a8cd56db Author: Min Si <msi(a)il.is.s.u-tokyo.ac.jp> Date: Fri Nov 14 16:37:18 2014 -0600 Increase bcast2 and bcast3 timelimit to 20mins. Some overloaded nightly test nodes use almost 20 minutes for running these tests. We increase their time limit for now to easily figure out other bugs reported by nightly test. diff --git a/test/mpi/coll/testlist b/test/mpi/coll/testlist index 36686e7..1a10ae1 100644 --- a/test/mpi/coll/testlist +++ b/test/mpi/coll/testlist @@ -35,8 +35,8 @@ bcasttest 10 bcast2 4 # More that 8 processes are required to get bcast to switch to the long # msg algorithm (see coll definitions in mpiimpl.h) -bcast2 10 timeLimit=780 -bcast3 10 timeLimit=780 +bcast2 10 timeLimit=1200 +bcast3 10 timeLimit=1200 bcastzerotype 1 bcastzerotype 4 bcastzerotype 5 ----------------------------------------------------------------------- Summary of changes: test/mpi/coll/testlist | 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-226-ge6c82f0
by noreply＠mpich.org 14 Nov '14

14 Nov '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 e6c82f0942da9972a45138730fffb016ed4729c9 (commit) from 7e0f71687406f82d0fa40dcf145dcb68c4fa9dbf (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/e6c82f0942da9972a45138730fffb016e… commit e6c82f0942da9972a45138730fffb016ed4729c9 Author: Pavan Balaji <balaji(a)anl.gov> Date: Fri Nov 14 14:30:44 2014 -0600 Added CHANGES for 3.2a2. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/CHANGES b/CHANGES index 9145ab0..a609301 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,40 @@ =============================================================================== + Changes in 3.2 +=============================================================================== + + # Added support for proposed MPI-3.1 features including nonblocking + collective I/O, address manipulation routines, thread-safety for + MPI initialization and pre-init functionality. Proposed MPI-3.1 + features are implemented as MPIX_ functions and the MPI version + number is still set to 3.0. + + # Fortran 2008 bindings are enabled by default and fully supported. + + # Added support for the Mellanox MXM InfiniBand interface. (thanks + to Mellanox for the code contribution). + + # Added support for the Mellanox HCOLL interface for collectives. + (thanks to Mellanox for the code contribution). + + # Added support for OFED IB on Xeon and Xeon Phi. (thanks to RIKEN + and University of Tokyo for the contribution). + + # Significant stability improvements to the MPICH/portals4 + implementation. + + # Several other minor bug fixes, memory leak fixes, and code cleanup. + + A full list of changes is available at the following link: + + http://git.mpich.org/mpich.git/shortlog/v3.1.2..v3.2a2 + + A full list of bugs that have been fixed is available at the + following link: + + https://trac.mpich.org/projects/mpich/query?status=closed&group=resolution&… + + +=============================================================================== Changes in 3.1.3 =============================================================================== ----------------------------------------------------------------------- Summary of changes: CHANGES | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.3-225-g7e0f716
by noreply＠mpich.org 14 Nov '14

14 Nov '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 7e0f71687406f82d0fa40dcf145dcb68c4fa9dbf (commit) from 6b41df96f4d42f6cbc8e9152f5a8700d4ce883ec (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/7e0f71687406f82d0fa40dcf145dcb68c… commit 7e0f71687406f82d0fa40dcf145dcb68c4fa9dbf Author: Pavan Balaji <balaji(a)anl.gov> Date: Fri Nov 14 14:18:18 2014 -0600 Update version information for 3.2a2. The ABI string is set to 0:0:0 since it's a pre-release. No guarantees on ABI compatibility. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/maint/version.m4 b/maint/version.m4 index 68b7b1b..e124023 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.3])dnl +m4_define([MPICH_VERSION_m4],[3.2a2])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:4:0])dnl +m4_define([libmpi_so_version_m4],[0:0: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.3-224-g6b41df9
by noreply＠mpich.org 14 Nov '14

14 Nov '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 6b41df96f4d42f6cbc8e9152f5a8700d4ce883ec (commit) from 8d26112786e9314c21716ede6bdb6633e7da7620 (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/6b41df96f4d42f6cbc8e9152f5a8700d4… commit 6b41df96f4d42f6cbc8e9152f5a8700d4ce883ec Author: Antonio Pena Monferrer <apenya(a)mcs.anl.gov> Date: Thu Nov 13 19:50:07 2014 -0600 Fix strict-aliasing rules break in Portals netmod Going from a macro to a function fixes the issue because of creating a copy of the pointer. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h index 5ab1eef..8f39d73 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h @@ -58,7 +58,9 @@ typedef struct { } MPID_nem_ptl_req_area; /* macro for ptl private in req */ -#define REQ_PTL(req) ((MPID_nem_ptl_req_area *)((req)->ch.netmod_area.padding)) +static inline MPID_nem_ptl_req_area * REQ_PTL(MPID_Request *req) { + return (MPID_nem_ptl_req_area *)req->ch.netmod_area.padding; +} #define MPID_nem_ptl_init_req(req_) do { \ int i; \ ----------------------------------------------------------------------- Summary of changes: .../channels/nemesis/netmod/portals4/ptl_impl.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0