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

r10689 - mpich2/trunk/test/mpi/comm
by balaji＠mcs.anl.gov 29 Nov '12

29 Nov '12

Author: balaji Date: 2012-11-29 10:20:03 -0600 (Thu, 29 Nov 2012) New Revision: 10689 Modified: mpich2/trunk/test/mpi/comm/cmsplit_type.c Log: Updated the comm_split_type test to respect MPI_UNDEFINED. Reviewed by goodell. Modified: mpich2/trunk/test/mpi/comm/cmsplit_type.c =================================================================== --- mpich2/trunk/test/mpi/comm/cmsplit_type.c 2012-11-29 16:20:02 UTC (rev 10688) +++ mpich2/trunk/test/mpi/comm/cmsplit_type.c 2012-11-29 16:20:03 UTC (rev 10689) @@ -24,16 +24,36 @@ verbose = 1; MPI_Comm_rank( MPI_COMM_WORLD, &wrank ); + + /* Check to see if MPI_COMM_TYPE_SHARED works correctly */ MPI_Comm_split_type(MPI_COMM_WORLD, MPI_COMM_TYPE_SHARED, 0, MPI_INFO_NULL, &comm); + if (comm == MPI_COMM_NULL) + printf("Expected a non-null communicator, but got MPI_COMM_NULL\n"); + else { + MPI_Comm_rank(comm, &rank); + MPI_Comm_size(comm, &size); + if (rank == 0 && verbose) + printf("Created subcommunicator of size %d\n", size); + MPI_Comm_free(&comm); + } - MPI_Comm_rank(comm, &rank); - MPI_Comm_size(comm, &size); + /* Check to see if MPI_UNDEFINED is respected */ + MPI_Comm_split_type(MPI_COMM_WORLD, (wrank % 2 == 0) ? MPI_COMM_TYPE_SHARED : MPI_UNDEFINED, + 0, MPI_INFO_NULL, &comm); + if ((wrank % 2) && (comm != MPI_COMM_NULL)) + printf("Expected MPI_COMM_NULL, but did not get one\n"); + if (wrank % 2 == 0) { + if (comm == MPI_COMM_NULL) + printf("Expected a non-null communicator, but got MPI_COMM_NULL\n"); + else { + MPI_Comm_rank(comm, &rank); + MPI_Comm_size(comm, &size); + if (rank == 0 && verbose) + printf("Created subcommunicator of size %d\n", size); + MPI_Comm_free(&comm); + } + } - if (rank == 0 && verbose) - printf("Created subcommunicator of size %d\n", size); - - MPI_Comm_free(&comm); - /* Use wrank because Comm_split_type may return more than one communicator across the job, and if so, each will have a rank 0 entry. Test output rules are for a single process to write the successful

1 0

r10688 - mpich2/trunk/test/mpi/comm
by balaji＠mcs.anl.gov 29 Nov '12

29 Nov '12

Author: balaji Date: 2012-11-29 10:20:02 -0600 (Thu, 29 Nov 2012) New Revision: 10688 Modified: mpich2/trunk/test/mpi/comm/cmsplit_type.c Log: MPI_Comm_split_type is a part of MPI-3. We don't need to protect it in non-strict MPI or MPICH-specific tests. No reviewer. Modified: mpich2/trunk/test/mpi/comm/cmsplit_type.c =================================================================== --- mpich2/trunk/test/mpi/comm/cmsplit_type.c 2012-11-29 16:20:01 UTC (rev 10687) +++ mpich2/trunk/test/mpi/comm/cmsplit_type.c 2012-11-29 16:20:02 UTC (rev 10688) @@ -24,11 +24,7 @@ verbose = 1; MPI_Comm_rank( MPI_COMM_WORLD, &wrank ); -#if !defined(USE_STRICT_MPI) && defined(MPICH) MPI_Comm_split_type(MPI_COMM_WORLD, MPI_COMM_TYPE_SHARED, 0, MPI_INFO_NULL, &comm); -#else - MPI_Comm_split(MPI_COMM_WORLD, 0, 0, &comm); -#endif /* USE_STRICT_MPI */ MPI_Comm_rank(comm, &rank); MPI_Comm_size(comm, &size);

1 0

r10687 - mpich2/trunk/src/mpi/comm
by balaji＠mcs.anl.gov 29 Nov '12

29 Nov '12

Author: balaji Date: 2012-11-29 10:20:01 -0600 (Thu, 29 Nov 2012) New Revision: 10687 Modified: mpich2/trunk/src/mpi/comm/comm_split_type.c Log: White space cleanup. No reviewer. Modified: mpich2/trunk/src/mpi/comm/comm_split_type.c =================================================================== --- mpich2/trunk/src/mpi/comm/comm_split_type.c 2012-11-29 16:19:33 UTC (rev 10686) +++ mpich2/trunk/src/mpi/comm/comm_split_type.c 2012-11-29 16:20:01 UTC (rev 10687) @@ -91,7 +91,7 @@ .seealso: MPI_Comm_free @*/ int MPI_Comm_split_type(MPI_Comm comm, int split_type, int key, MPI_Info info, - MPI_Comm * newcomm) + MPI_Comm * newcomm) { int mpi_errno = MPI_SUCCESS; MPID_Comm *comm_ptr = NULL, *newcomm_ptr;

1 0

r10686 - in mpich2/trunk/src: mpi/comm mpid/ch3/src
by balaji＠mcs.anl.gov 29 Nov '12

29 Nov '12

Author: balaji Date: 2012-11-29 10:19:33 -0600 (Thu, 29 Nov 2012) New Revision: 10686 Modified: mpich2/trunk/src/mpi/comm/comm_split_type.c mpich2/trunk/src/mpid/ch3/src/mpid_init.c Log: Added support for MPI_UNDEFINED in MPI_Comm_split_type. Fixes tt#1753. Reviewed by goodell. Modified: mpich2/trunk/src/mpi/comm/comm_split_type.c =================================================================== --- mpich2/trunk/src/mpi/comm/comm_split_type.c 2012-11-28 19:56:15 UTC (rev 10685) +++ mpich2/trunk/src/mpi/comm/comm_split_type.c 2012-11-29 16:19:33 UTC (rev 10686) @@ -34,11 +34,16 @@ { int mpi_errno = MPI_SUCCESS; - MPIU_Assert(split_type == MPI_COMM_TYPE_SHARED); + /* Only MPI_COMM_TYPE_SHARED and MPI_UNDEFINED are supported */ + MPIU_Assert(split_type == MPI_COMM_TYPE_SHARED || split_type == MPI_UNDEFINED); if (MPID_Comm_fns == NULL || MPID_Comm_fns->split_type == NULL) { - /* Default implementation is to just return MPI_COMM_SELF */ - mpi_errno = MPIR_Comm_split_impl(comm_ptr, comm_ptr->rank, key, newcomm_ptr); + int color = (split_type == MPI_COMM_TYPE_SHARED) ? comm_ptr->rank : MPI_UNDEFINED; + + /* The default implementation is to either pass MPI_UNDEFINED + * or the local rank as the color (in which case a dup of + * MPI_COMM_SELF is returned) */ + mpi_errno = MPIR_Comm_split_impl(comm_ptr, color, key, newcomm_ptr); } else { mpi_errno = Modified: mpich2/trunk/src/mpid/ch3/src/mpid_init.c =================================================================== --- mpich2/trunk/src/mpid/ch3/src/mpid_init.c 2012-11-28 19:56:15 UTC (rev 10685) +++ mpich2/trunk/src/mpid/ch3/src/mpid_init.c 2012-11-29 16:19:33 UTC (rev 10686) @@ -55,7 +55,7 @@ mpi_errno = MPID_Get_node_id(comm_ptr, comm_ptr->rank, &id); if (mpi_errno) MPIU_ERR_POP(mpi_errno); - nid = id; + nid = (stype == MPI_COMM_TYPE_SHARED) ? id : MPI_UNDEFINED; mpi_errno = MPIR_Comm_split_impl(comm_ptr, nid, key, newcomm_ptr); if (mpi_errno) MPIU_ERR_POP(mpi_errno);

1 0

r10684 - mpich2/trunk/test/mpi/rma
by dinan＠mcs.anl.gov 27 Nov '12

27 Nov '12

Author: dinan Date: 2012-11-27 17:40:13 -0600 (Tue, 27 Nov 2012) New Revision: 10684 Modified: mpich2/trunk/test/mpi/rma/reqops.c Log: RMA Req-ops: Test to check handling of PROC_NULL Updated existing request-generating RMA ops test to verify that communication with PROC_NULL is handled correctly. Reviewer: goodell Modified: mpich2/trunk/test/mpi/rma/reqops.c =================================================================== --- mpich2/trunk/test/mpi/rma/reqops.c 2012-11-27 23:40:11 UTC (rev 10683) +++ mpich2/trunk/test/mpi/rma/reqops.c 2012-11-27 23:40:13 UTC (rev 10684) @@ -6,6 +6,7 @@ */ #include <mpi.h> #include <stdio.h> +#include <assert.h> #include "mpitest.h" #define ITER 100 @@ -29,13 +30,37 @@ /** Create using MPI_Win_create() **/ if (rank == 0) { - MPI_Alloc_mem(sizeof(int), MPI_INFO_NULL, &buf); + MPI_Alloc_mem(4*sizeof(int), MPI_INFO_NULL, &buf); *buf = nproc-1; } else buf = NULL; - MPI_Win_create(buf, sizeof(int)*(rank == 0), 1, MPI_INFO_NULL, MPI_COMM_WORLD, &window); + MPI_Win_create(buf, 4*sizeof(int)*(rank == 0), 1, MPI_INFO_NULL, MPI_COMM_WORLD, &window); + /* PROC_NULL Communication */ + { + MPI_Request pn_req[4]; + int val[4], res; + + MPI_Win_lock_all(0, window); + + MPI_Rget_accumulate(&val[0], 1, MPI_INT, &res, 1, MPI_INT, MPI_PROC_NULL, 0, 1, MPI_INT, MPI_REPLACE, window, &pn_req[0]); + MPI_Rget(&val[1], 1, MPI_INT, MPI_PROC_NULL, 1, 1, MPI_INT, window, &pn_req[1]); + MPI_Rput(&val[2], 1, MPI_INT, MPI_PROC_NULL, 2, 1, MPI_INT, window, &pn_req[2]); + MPI_Raccumulate(&val[3], 1, MPI_INT, MPI_PROC_NULL, 3, 1, MPI_INT, MPI_REPLACE, window, &pn_req[3]); + + assert(pn_req[0] != MPI_REQUEST_NULL); + assert(pn_req[1] != MPI_REQUEST_NULL); + assert(pn_req[2] != MPI_REQUEST_NULL); + assert(pn_req[3] != MPI_REQUEST_NULL); + + MPI_Win_unlock_all(window); + + MPI_Waitall(4, pn_req, MPI_STATUSES_IGNORE); + } + + MPI_Barrier(MPI_COMM_WORLD); + MPI_Win_lock(MPI_LOCK_SHARED, 0, 0, window); /* GET-ACC: Test third-party communication, through rank 0. */ @@ -51,6 +76,7 @@ } MPI_Rget_accumulate(&rank, 1, MPI_INT, &val, 1, MPI_INT, 0, 0, 1, MPI_INT, MPI_REPLACE, window, &gacc_req); + assert(gacc_req != MPI_REQUEST_NULL); MPI_Wait(&gacc_req, MPI_STATUS_IGNORE); exp = (rank + nproc-1) % nproc; @@ -85,9 +111,11 @@ } MPI_Rget(&val, 1, MPI_INT, 0, 0, 1, MPI_INT, window, &req); + assert(req != MPI_REQUEST_NULL); MPI_Wait(&req, MPI_STATUS_IGNORE); MPI_Rput(&rank, 1, MPI_INT, 0, 0, 1, MPI_INT, window, &req); + assert(req != MPI_REQUEST_NULL); MPI_Wait(&req, MPI_STATUS_IGNORE); exp = (rank + nproc-1) % nproc; @@ -122,9 +150,11 @@ } MPI_Rget(&val, 1, MPI_INT, 0, 0, 1, MPI_INT, window, &req); + assert(req != MPI_REQUEST_NULL); MPI_Wait(&req, MPI_STATUS_IGNORE); MPI_Raccumulate(&rank, 1, MPI_INT, 0, 0, 1, MPI_INT, MPI_REPLACE, window, &req); + assert(req != MPI_REQUEST_NULL); MPI_Wait(&req, MPI_STATUS_IGNORE); exp = (rank + nproc-1) % nproc;

1 0

r10683 - mpich2/trunk/src/mpid/ch3/src
by dinan＠mcs.anl.gov 27 Nov '12

27 Nov '12

Author: dinan Date: 2012-11-27 17:40:11 -0600 (Tue, 27 Nov 2012) New Revision: 10683 Modified: mpich2/trunk/src/mpid/ch3/src/ch3u_rma_reqops.c Log: RMA Req-ops: Improved self and PROC_NULL handling This patch more efficiently handles request-generating operations that target the local process and MPI_PROC_NULL. These special cases return completed generalized requests, which cost less overhead. This also makes space for a more efficient implementation when direct, shared memory operations are implemented. Reviewer: goodell Modified: mpich2/trunk/src/mpid/ch3/src/ch3u_rma_reqops.c =================================================================== --- mpich2/trunk/src/mpid/ch3/src/ch3u_rma_reqops.c 2012-11-27 23:40:10 UTC (rev 10682) +++ mpich2/trunk/src/mpid/ch3/src/ch3u_rma_reqops.c 2012-11-27 23:40:11 UTC (rev 10683) @@ -30,19 +30,12 @@ MPIU_UNREFERENCED_ARG(status); - /* If this is a local operation, it's already complete. Otherwise, call - * flush to complete the operation */ - /* FIXME: We still may need to flush or sync for shared memory windows */ - if (req_state->target_rank != req_state->win_ptr->comm_ptr->rank && - req_state->target_rank != MPI_PROC_NULL) - { - mpi_errno = req_state->win_ptr->RMAFns.Win_flush(req_state->target_rank, - req_state->win_ptr); + /* Call flush to complete the operation */ + /* FIXME: We need per-operation completion to make this more efficient. */ + mpi_errno = req_state->win_ptr->RMAFns.Win_flush(req_state->target_rank, + req_state->win_ptr); - if (mpi_errno != MPI_SUCCESS) { - MPIU_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**rmareqop"); - } - } + if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } MPIR_Grequest_complete_impl(req_state->request); @@ -161,23 +154,39 @@ req_state->win_ptr = win_ptr; req_state->target_rank = target_rank; - /* Enqueue the RMA operation */ - mpi_errno = win_ptr->RMAFns.Put(origin_addr, origin_count, - origin_datatype, target_rank, - target_disp, target_count, - target_datatype, win_ptr); + /* Enqueue or perform the RMA operation */ + if (target_rank != MPI_PROC_NULL) { + mpi_errno = win_ptr->RMAFns.Put(origin_addr, origin_count, + origin_datatype, target_rank, + target_disp, target_count, + target_datatype, win_ptr); - if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } + if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } + } - mpi_errno = MPIX_Grequest_start_impl(MPIDI_CH3I_Rma_req_query, - MPIDI_CH3I_Rma_req_free, - MPIDI_CH3I_Rma_req_cancel, - MPIDI_CH3I_Rma_req_poll, - MPIDI_CH3I_Rma_req_wait, - req_state, &req_state->request); + /* If the operation is already complete, return a completed request. + * Otherwise, generate a grequest. */ + /* FIXME: We still may need to flush or sync for shared memory windows */ + if (target_rank == MPI_PROC_NULL || target_rank == win_ptr->myrank) { + mpi_errno = MPIR_Grequest_start_impl(MPIDI_CH3I_Rma_req_query, + MPIDI_CH3I_Rma_req_free, + MPIDI_CH3I_Rma_req_cancel, + req_state, &req_state->request); + if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } - if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } + MPIR_Grequest_complete_impl(req_state->request); + } + else { + mpi_errno = MPIX_Grequest_start_impl(MPIDI_CH3I_Rma_req_query, + MPIDI_CH3I_Rma_req_free, + MPIDI_CH3I_Rma_req_cancel, + MPIDI_CH3I_Rma_req_poll, + MPIDI_CH3I_Rma_req_wait, + req_state, &req_state->request); + if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } + } + *request = req_state->request; fn_exit: @@ -216,23 +225,39 @@ req_state->win_ptr = win_ptr; req_state->target_rank = target_rank; - /* Enqueue the RMA operation */ - mpi_errno = win_ptr->RMAFns.Get(origin_addr, origin_count, - origin_datatype, target_rank, - target_disp, target_count, - target_datatype, win_ptr); + /* Enqueue or perform the RMA operation */ + if (target_rank != MPI_PROC_NULL) { + mpi_errno = win_ptr->RMAFns.Get(origin_addr, origin_count, + origin_datatype, target_rank, + target_disp, target_count, + target_datatype, win_ptr); - if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } + if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } + } - mpi_errno = MPIX_Grequest_start_impl(MPIDI_CH3I_Rma_req_query, - MPIDI_CH3I_Rma_req_free, - MPIDI_CH3I_Rma_req_cancel, - MPIDI_CH3I_Rma_req_poll, - MPIDI_CH3I_Rma_req_wait, - req_state, &req_state->request); + /* If the operation is already complete, return a completed request. + * Otherwise, generate a grequest. */ + /* FIXME: We still may need to flush or sync for shared memory windows */ + if (target_rank == MPI_PROC_NULL || target_rank == win_ptr->myrank) { + mpi_errno = MPIR_Grequest_start_impl(MPIDI_CH3I_Rma_req_query, + MPIDI_CH3I_Rma_req_free, + MPIDI_CH3I_Rma_req_cancel, + req_state, &req_state->request); + if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } - if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } + MPIR_Grequest_complete_impl(req_state->request); + } + else { + mpi_errno = MPIX_Grequest_start_impl(MPIDI_CH3I_Rma_req_query, + MPIDI_CH3I_Rma_req_free, + MPIDI_CH3I_Rma_req_cancel, + MPIDI_CH3I_Rma_req_poll, + MPIDI_CH3I_Rma_req_wait, + req_state, &req_state->request); + if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } + } + *request = req_state->request; fn_exit: @@ -271,22 +296,37 @@ req_state->win_ptr = win_ptr; req_state->target_rank = target_rank; - /* Enqueue the RMA operation */ - mpi_errno = win_ptr->RMAFns.Accumulate(origin_addr, origin_count, - origin_datatype, target_rank, - target_disp, target_count, - target_datatype, op, win_ptr); + /* Enqueue or perform the RMA operation */ + if (target_rank != MPI_PROC_NULL) { + mpi_errno = win_ptr->RMAFns.Accumulate(origin_addr, origin_count, + origin_datatype, target_rank, + target_disp, target_count, + target_datatype, op, win_ptr); + if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } + } - if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } + /* If the operation is already complete, return a completed request. + * Otherwise, generate a grequest. */ + /* FIXME: We still may need to flush or sync for shared memory windows */ + if (target_rank == MPI_PROC_NULL || target_rank == win_ptr->myrank) { + mpi_errno = MPIR_Grequest_start_impl(MPIDI_CH3I_Rma_req_query, + MPIDI_CH3I_Rma_req_free, + MPIDI_CH3I_Rma_req_cancel, + req_state, &req_state->request); + if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } - mpi_errno = MPIX_Grequest_start_impl(MPIDI_CH3I_Rma_req_query, - MPIDI_CH3I_Rma_req_free, - MPIDI_CH3I_Rma_req_cancel, - MPIDI_CH3I_Rma_req_poll, - MPIDI_CH3I_Rma_req_wait, - req_state, &req_state->request); + MPIR_Grequest_complete_impl(req_state->request); + } + else { + mpi_errno = MPIX_Grequest_start_impl(MPIDI_CH3I_Rma_req_query, + MPIDI_CH3I_Rma_req_free, + MPIDI_CH3I_Rma_req_cancel, + MPIDI_CH3I_Rma_req_poll, + MPIDI_CH3I_Rma_req_wait, + req_state, &req_state->request); - if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } + if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } + } *request = req_state->request; @@ -327,24 +367,39 @@ req_state->win_ptr = win_ptr; req_state->target_rank = target_rank; - /* Enqueue the RMA operation */ - mpi_errno = win_ptr->RMAFns.Get_accumulate(origin_addr, origin_count, - origin_datatype, result_addr, - result_count, result_datatype, - target_rank, target_disp, - target_count, target_datatype, - op, win_ptr); + /* Enqueue or perform the RMA operation */ + if (target_rank != MPI_PROC_NULL) { + mpi_errno = win_ptr->RMAFns.Get_accumulate(origin_addr, origin_count, + origin_datatype, result_addr, + result_count, result_datatype, + target_rank, target_disp, + target_count, target_datatype, + op, win_ptr); + if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } + } - if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } + /* If the operation is already complete, return a completed request. + * Otherwise, generate a grequest. */ + /* FIXME: We still may need to flush or sync for shared memory windows */ + if (target_rank == MPI_PROC_NULL || target_rank == win_ptr->myrank) { + mpi_errno = MPIR_Grequest_start_impl(MPIDI_CH3I_Rma_req_query, + MPIDI_CH3I_Rma_req_free, + MPIDI_CH3I_Rma_req_cancel, + req_state, &req_state->request); + if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } - mpi_errno = MPIX_Grequest_start_impl(MPIDI_CH3I_Rma_req_query, - MPIDI_CH3I_Rma_req_free, - MPIDI_CH3I_Rma_req_cancel, - MPIDI_CH3I_Rma_req_poll, - MPIDI_CH3I_Rma_req_wait, - req_state, &req_state->request); + MPIR_Grequest_complete_impl(req_state->request); + } + else { + mpi_errno = MPIX_Grequest_start_impl(MPIDI_CH3I_Rma_req_query, + MPIDI_CH3I_Rma_req_free, + MPIDI_CH3I_Rma_req_cancel, + MPIDI_CH3I_Rma_req_poll, + MPIDI_CH3I_Rma_req_wait, + req_state, &req_state->request); - if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } + if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } + } *request = req_state->request;

1 0

r10682 - mpich2/trunk/src/mpid/ch3/src
by dinan＠mcs.anl.gov 27 Nov '12

27 Nov '12

Author: dinan Date: 2012-11-27 17:40:10 -0600 (Tue, 27 Nov 2012) New Revision: 10682 Modified: mpich2/trunk/src/mpid/ch3/src/ch3u_rma_reqops.c Log: RMA Req-ops: Added state tracking and error checks Note: Request-generating operations can only be called within a passive target epoch. Reviewer: goodell Modified: mpich2/trunk/src/mpid/ch3/src/ch3u_rma_reqops.c =================================================================== --- mpich2/trunk/src/mpid/ch3/src/ch3u_rma_reqops.c 2012-11-27 23:40:08 UTC (rev 10681) +++ mpich2/trunk/src/mpid/ch3/src/ch3u_rma_reqops.c 2012-11-27 23:40:10 UTC (rev 10682) @@ -150,6 +150,10 @@ MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_RPUT); + MPIU_ERR_CHKANDJUMP(win_ptr->epoch_state != MPIDI_EPOCH_LOCK && + win_ptr->epoch_state != MPIDI_EPOCH_LOCK_ALL, + mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync"); + MPIU_CHKPMEM_MALLOC(req_state, MPIDI_CH3I_Rma_req_state_t*, sizeof(MPIDI_CH3I_Rma_req_state_t), mpi_errno, "req-based RMA state"); @@ -176,9 +180,8 @@ *request = req_state->request; + fn_exit: MPIDI_FUNC_EXIT(MPID_STATE_MPIDI_RPUT); - - fn_exit: return mpi_errno; fn_fail: MPIU_CHKPMEM_REAP(); @@ -202,6 +205,10 @@ MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_RGET); + MPIU_ERR_CHKANDJUMP(win_ptr->epoch_state != MPIDI_EPOCH_LOCK && + win_ptr->epoch_state != MPIDI_EPOCH_LOCK_ALL, + mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync"); + MPIU_CHKPMEM_MALLOC(req_state, MPIDI_CH3I_Rma_req_state_t*, sizeof(MPIDI_CH3I_Rma_req_state_t), mpi_errno, "req-based RMA state"); @@ -228,9 +235,8 @@ *request = req_state->request; + fn_exit: MPIDI_FUNC_EXIT(MPID_STATE_MPIDI_RGET); - - fn_exit: return mpi_errno; fn_fail: MPIU_CHKPMEM_REAP(); @@ -254,6 +260,10 @@ MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_RACCUMULATE); + MPIU_ERR_CHKANDJUMP(win_ptr->epoch_state != MPIDI_EPOCH_LOCK && + win_ptr->epoch_state != MPIDI_EPOCH_LOCK_ALL, + mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync"); + MPIU_CHKPMEM_MALLOC(req_state, MPIDI_CH3I_Rma_req_state_t*, sizeof(MPIDI_CH3I_Rma_req_state_t), mpi_errno, "req-based RMA state"); @@ -280,9 +290,8 @@ *request = req_state->request; + fn_exit: MPIDI_FUNC_EXIT(MPID_STATE_MPIDI_RACCUMULATE); - - fn_exit: return mpi_errno; fn_fail: MPIU_CHKPMEM_REAP(); @@ -307,6 +316,10 @@ MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_RGET_ACCUMULATE); + MPIU_ERR_CHKANDJUMP(win_ptr->epoch_state != MPIDI_EPOCH_LOCK && + win_ptr->epoch_state != MPIDI_EPOCH_LOCK_ALL, + mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync"); + MPIU_CHKPMEM_MALLOC(req_state, MPIDI_CH3I_Rma_req_state_t*, sizeof(MPIDI_CH3I_Rma_req_state_t), mpi_errno, "req-based RMA state"); @@ -335,9 +348,8 @@ *request = req_state->request; + fn_exit: MPIDI_FUNC_EXIT(MPID_STATE_MPIDI_RGET_ACCUMULATE); - - fn_exit: return mpi_errno; fn_fail: MPIU_CHKPMEM_REAP();

1 0

r10681 - in mpich2/trunk/src: mpi/rma mpid/ch3/src
by dinan＠mcs.anl.gov 27 Nov '12

27 Nov '12

Author: dinan Date: 2012-11-27 17:40:08 -0600 (Tue, 27 Nov 2012) New Revision: 10681 Modified: mpich2/trunk/src/mpi/rma/raccumulate.c mpich2/trunk/src/mpi/rma/rget.c mpich2/trunk/src/mpi/rma/rget_accumulate.c mpich2/trunk/src/mpi/rma/rput.c mpich2/trunk/src/mpid/ch3/src/ch3u_rma_reqops.c Log: RMA Req-ops: Fixed PROC_NULL handling When called with a target process of PROC_NULL, RMA request-generating operations did not return a valid request handle. Reviewer: goodell Modified: mpich2/trunk/src/mpi/rma/raccumulate.c =================================================================== --- mpich2/trunk/src/mpi/rma/raccumulate.c 2012-11-27 23:40:06 UTC (rev 10680) +++ mpich2/trunk/src/mpi/rma/raccumulate.c 2012-11-27 23:40:08 UTC (rev 10681) @@ -153,8 +153,6 @@ /* ... body of routine ... */ - if (target_rank == MPI_PROC_NULL) goto fn_exit; - mpi_errno = MPIU_RMA_CALL(win_ptr,Raccumulate(origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, Modified: mpich2/trunk/src/mpi/rma/rget.c =================================================================== --- mpich2/trunk/src/mpi/rma/rget.c 2012-11-27 23:40:06 UTC (rev 10680) +++ mpich2/trunk/src/mpi/rma/rget.c 2012-11-27 23:40:08 UTC (rev 10681) @@ -147,8 +147,6 @@ /* ... body of routine ... */ - if (target_rank == MPI_PROC_NULL) goto fn_exit; - mpi_errno = MPIU_RMA_CALL(win_ptr, Rget(origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, Modified: mpich2/trunk/src/mpi/rma/rget_accumulate.c =================================================================== --- mpich2/trunk/src/mpi/rma/rget_accumulate.c 2012-11-27 23:40:06 UTC (rev 10680) +++ mpich2/trunk/src/mpi/rma/rget_accumulate.c 2012-11-27 23:40:08 UTC (rev 10681) @@ -179,8 +179,6 @@ /* ... body of routine ... */ - if (target_rank == MPI_PROC_NULL) goto fn_exit; - mpi_errno = MPIU_RMA_CALL(win_ptr,Rget_accumulate(origin_addr, origin_count, origin_datatype, result_addr, result_count, Modified: mpich2/trunk/src/mpi/rma/rput.c =================================================================== --- mpich2/trunk/src/mpi/rma/rput.c 2012-11-27 23:40:06 UTC (rev 10680) +++ mpich2/trunk/src/mpi/rma/rput.c 2012-11-27 23:40:08 UTC (rev 10681) @@ -149,8 +149,6 @@ /* ... body of routine ... */ - if (target_rank == MPI_PROC_NULL) goto fn_exit; - mpi_errno = MPIU_RMA_CALL(win_ptr, Rput(origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, Modified: mpich2/trunk/src/mpid/ch3/src/ch3u_rma_reqops.c =================================================================== --- mpich2/trunk/src/mpid/ch3/src/ch3u_rma_reqops.c 2012-11-27 23:40:06 UTC (rev 10680) +++ mpich2/trunk/src/mpid/ch3/src/ch3u_rma_reqops.c 2012-11-27 23:40:08 UTC (rev 10681) @@ -33,7 +33,9 @@ /* If this is a local operation, it's already complete. Otherwise, call * flush to complete the operation */ /* FIXME: We still may need to flush or sync for shared memory windows */ - if (req_state->target_rank != req_state->win_ptr->comm_ptr->rank) { + if (req_state->target_rank != req_state->win_ptr->comm_ptr->rank && + req_state->target_rank != MPI_PROC_NULL) + { mpi_errno = req_state->win_ptr->RMAFns.Win_flush(req_state->target_rank, req_state->win_ptr);

1 0

r10680 - mpich2/trunk/test/mpi/rma
by dinan＠mcs.anl.gov 27 Nov '12

27 Nov '12

Author: dinan Date: 2012-11-27 17:40:06 -0600 (Tue, 27 Nov 2012) New Revision: 10680 Modified: mpich2/trunk/test/mpi/rma/compare_and_swap.c mpich2/trunk/test/mpi/rma/fetch_and_op.c mpich2/trunk/test/mpi/rma/get_accumulate.c mpich2/trunk/test/mpi/rma/put_base.c mpich2/trunk/test/mpi/rma/put_bottom.c mpich2/trunk/test/mpi/rma/strided_acc_indexed.c mpich2/trunk/test/mpi/rma/strided_acc_onelock.c mpich2/trunk/test/mpi/rma/strided_acc_subarray.c mpich2/trunk/test/mpi/rma/strided_get_indexed.c mpich2/trunk/test/mpi/rma/strided_getacc_indexed.c mpich2/trunk/test/mpi/rma/strided_getacc_indexed_shared.c mpich2/trunk/test/mpi/rma/strided_putget_indexed.c mpich2/trunk/test/mpi/rma/strided_putget_indexed_shared.c Log: Updated RMA tests to use shared squelch code Reviewer: goodell Modified: mpich2/trunk/test/mpi/rma/compare_and_swap.c =================================================================== --- mpich2/trunk/test/mpi/rma/compare_and_swap.c 2012-11-27 23:40:04 UTC (rev 10679) +++ mpich2/trunk/test/mpi/rma/compare_and_swap.c 2012-11-27 23:40:06 UTC (rev 10680) @@ -10,22 +10,10 @@ #include <assert.h> #include <mpi.h> #include "mpitest.h" +#include "squelch.h" -static const int SQ_LIMIT = 10; -static int SQ_COUNT = 0; - -#define SQUELCH(X) \ - do { \ - if (SQ_COUNT < SQ_LIMIT) { \ - SQ_COUNT++; \ - X \ - } \ - } while (0) - #define ITER 100 -const int verbose = 0; - int main(int argc, char **argv) { int i, j, rank, nproc; int errors = 0, all_errors = 0; Modified: mpich2/trunk/test/mpi/rma/fetch_and_op.c =================================================================== --- mpich2/trunk/test/mpi/rma/fetch_and_op.c 2012-11-27 23:40:04 UTC (rev 10679) +++ mpich2/trunk/test/mpi/rma/fetch_and_op.c 2012-11-27 23:40:06 UTC (rev 10680) @@ -10,22 +10,10 @@ #include <assert.h> #include <mpi.h> #include "mpitest.h" +#include "squelch.h" -static const int SQ_LIMIT = 10; -static int SQ_COUNT = 0; - -#define SQUELCH(X) \ - do { \ - if (SQ_COUNT < SQ_LIMIT || verbose) { \ - SQ_COUNT++; \ - X \ - } \ - } while (0) - #define ITER 100 -const int verbose = 0; - #if defined (FOP_TYPE_CHAR) # define TYPE_C char # define TYPE_MPI MPI_CHAR Modified: mpich2/trunk/test/mpi/rma/get_accumulate.c =================================================================== --- mpich2/trunk/test/mpi/rma/get_accumulate.c 2012-11-27 23:40:04 UTC (rev 10679) +++ mpich2/trunk/test/mpi/rma/get_accumulate.c 2012-11-27 23:40:06 UTC (rev 10680) @@ -10,18 +10,8 @@ #include <string.h> #include <mpi.h> #include "mpitest.h" +#include "squelch.h" -static const int SQ_LIMIT = 10; -static int SQ_COUNT = 0; - -#define SQUELCH(X) \ - do { \ - if (SQ_COUNT < SQ_LIMIT || verbose) { \ - SQ_COUNT++; \ - X \ - } \ - } while (0) - #define ITER 100 #define COUNT 5 @@ -49,8 +39,6 @@ # define TYPE_MPI TYPE_MPI_BASE #endif -const int verbose = 0; - void reset_bufs(TYPE_C *win_ptr, TYPE_C *res_ptr, TYPE_C *val_ptr, TYPE_C value, MPI_Win win) { int rank, nproc, i; Modified: mpich2/trunk/test/mpi/rma/put_base.c =================================================================== --- mpich2/trunk/test/mpi/rma/put_base.c 2012-11-27 23:40:04 UTC (rev 10679) +++ mpich2/trunk/test/mpi/rma/put_base.c 2012-11-27 23:40:06 UTC (rev 10680) @@ -24,6 +24,7 @@ #include <stdint.h> #include <mpi.h> #include "mpitest.h" +#include "squelch.h" #define XDIM 1024 #define YDIM 1024 @@ -31,19 +32,6 @@ #define SUB_YDIM 1024 #define ITERATIONS 10 -static const int SQ_LIMIT = 10; -static int SQ_COUNT = 0; - -#define SQUELCH(X) \ - do { \ - if (SQ_COUNT < SQ_LIMIT) { \ - SQ_COUNT++; \ - X \ - } \ - } while (0) - -static int verbose = 0; - int main(int argc, char **argv) { int i, j, rank, nranks, peer, bufsize, errors; double *win_buf, *src_buf, *dst_buf; @@ -61,9 +49,6 @@ MPI_Alloc_mem(bufsize, MPI_INFO_NULL, &src_buf); MPI_Alloc_mem(bufsize, MPI_INFO_NULL, &dst_buf); - if (rank == 0) - if (verbose) printf("MPI RMA Strided Put Test:\n"); - for (i = 0; i < XDIM*YDIM; i++) { *(win_buf + i) = 1.0 + rank; *(src_buf + i) = 1.0 + rank; @@ -86,9 +71,6 @@ MPI_Get_address(base_ptr, &base_int); - if (rank == 0) - if (verbose) printf(" + iteration %d\n", i); - for (j = 0; j < SUB_YDIM; j++) { MPI_Get_address(&src_buf[j*XDIM], &idx_loc[j]); idx_loc[j] = idx_loc[j] - base_int; Modified: mpich2/trunk/test/mpi/rma/put_bottom.c =================================================================== --- mpich2/trunk/test/mpi/rma/put_bottom.c 2012-11-27 23:40:04 UTC (rev 10679) +++ mpich2/trunk/test/mpi/rma/put_bottom.c 2012-11-27 23:40:06 UTC (rev 10680) @@ -22,6 +22,7 @@ #include <stdlib.h> #include <mpi.h> #include "mpitest.h" +#include "squelch.h" #define XDIM 1024 #define YDIM 1024 @@ -29,19 +30,6 @@ #define SUB_YDIM 1024 #define ITERATIONS 10 -static const int SQ_LIMIT = 10; -static int SQ_COUNT = 0; - -#define SQUELCH(X) \ - do { \ - if (SQ_COUNT < SQ_LIMIT) { \ - SQ_COUNT++; \ - X \ - } \ - } while (0) - -static int verbose = 0; - int main(int argc, char **argv) { int i, j, rank, nranks, peer, bufsize, errors; double *win_buf, *src_buf, *dst_buf; @@ -57,9 +45,6 @@ MPI_Alloc_mem(bufsize, MPI_INFO_NULL, &src_buf); MPI_Alloc_mem(bufsize, MPI_INFO_NULL, &dst_buf); - if (rank == 0) - if (verbose) printf("MPI RMA Strided Put Test:\n"); - for (i = 0; i < XDIM*YDIM; i++) { *(win_buf + i) = 1.0 + rank; *(src_buf + i) = 1.0 + rank; @@ -77,9 +62,6 @@ int blk_len[SUB_YDIM]; MPI_Datatype src_type, dst_type; - if (rank == 0) - if (verbose) printf(" + iteration %d\n", i); - for (j = 0; j < SUB_YDIM; j++) { MPI_Get_address(&src_buf[j*XDIM], &idx_loc[j]); idx_rem[j] = j*XDIM*sizeof(double); Modified: mpich2/trunk/test/mpi/rma/strided_acc_indexed.c =================================================================== --- mpich2/trunk/test/mpi/rma/strided_acc_indexed.c 2012-11-27 23:40:04 UTC (rev 10679) +++ mpich2/trunk/test/mpi/rma/strided_acc_indexed.c 2012-11-27 23:40:06 UTC (rev 10680) @@ -20,6 +20,7 @@ #include <math.h> #include <mpi.h> #include "mpitest.h" +#include "squelch.h" #define XDIM 16 #define YDIM 16 @@ -27,21 +28,6 @@ #define SUB_YDIM 8 #define ITERATIONS 1 -static const int SQ_LIMIT = 10; -static int SQ_COUNT = 0; - -#define SQUELCH(X) \ - do { \ - if (SQ_COUNT < SQ_LIMIT) { \ - SQ_COUNT++; \ - X \ - } \ - } while (0) - -/* -static int verbose = 0; -*/ - int main(int argc, char **argv) { int itr, i, j, rank, nranks, peer, bufsize, errors; double *win_buf, *src_buf; @@ -56,12 +42,6 @@ MPI_Alloc_mem(bufsize, MPI_INFO_NULL, &win_buf); MPI_Alloc_mem(bufsize, MPI_INFO_NULL, &src_buf); - /* - Commment this out to avoid gcc --enable-stricttest warning. - if (rank == 0) - if (verbose) ("MPI RMA Strided Accumulate Test:\n"); - */ - for (i = 0; i < XDIM*YDIM; i++) { *(win_buf + i) = -1.0; *(src_buf + i) = 1.0 + rank; Modified: mpich2/trunk/test/mpi/rma/strided_acc_onelock.c =================================================================== --- mpich2/trunk/test/mpi/rma/strided_acc_onelock.c 2012-11-27 23:40:04 UTC (rev 10679) +++ mpich2/trunk/test/mpi/rma/strided_acc_onelock.c 2012-11-27 23:40:06 UTC (rev 10680) @@ -17,24 +17,12 @@ #include <math.h> #include <mpi.h> #include "mpitest.h" +#include "squelch.h" #define XDIM 1024 #define YDIM 1024 #define ITERATIONS 10 -static const int SQ_LIMIT = 10; -static int SQ_COUNT = 0; - -#define SQUELCH(X) \ - do { \ - if (SQ_COUNT < SQ_LIMIT) { \ - SQ_COUNT++; \ - X \ - } \ - } while (0) - -static int verbose = 0; - int main(int argc, char **argv) { int i, j, rank, nranks, peer, bufsize, errors; double *buffer, *src_buf; @@ -49,9 +37,6 @@ MPI_Alloc_mem(bufsize, MPI_INFO_NULL, &buffer); MPI_Alloc_mem(bufsize, MPI_INFO_NULL, &src_buf); - if (rank == 0) - if (verbose) printf("MPI RMA Strided Accumulate Test:\n"); - for (i = 0; i < XDIM*YDIM; i++) { *(buffer + i) = 1.0 + rank; *(src_buf + i) = 1.0 + rank; Modified: mpich2/trunk/test/mpi/rma/strided_acc_subarray.c =================================================================== --- mpich2/trunk/test/mpi/rma/strided_acc_subarray.c 2012-11-27 23:40:04 UTC (rev 10679) +++ mpich2/trunk/test/mpi/rma/strided_acc_subarray.c 2012-11-27 23:40:06 UTC (rev 10680) @@ -20,6 +20,7 @@ #include <math.h> #include <mpi.h> #include "mpitest.h" +#include "squelch.h" #define XDIM 1024 #define YDIM 1024 @@ -27,19 +28,6 @@ #define SUB_YDIM 512 #define ITERATIONS 10 -static const int SQ_LIMIT = 10; -static int SQ_COUNT = 0; - -#define SQUELCH(X) \ - do { \ - if (SQ_COUNT < SQ_LIMIT) { \ - SQ_COUNT++; \ - X \ - } \ - } while (0) - -static int verbose = 0; - int main(int argc, char **argv) { int i, j, rank, nranks, peer, bufsize, errors; double *win_buf, *src_buf; @@ -54,9 +42,6 @@ MPI_Alloc_mem(bufsize, MPI_INFO_NULL, &win_buf); MPI_Alloc_mem(bufsize, MPI_INFO_NULL, &src_buf); - if (rank == 0) - if (verbose) printf("MPI RMA Strided Accumulate Test:\n"); - for (i = 0; i < XDIM*YDIM; i++) { *(win_buf + i) = -1.0; *(src_buf + i) = 1.0 + rank; Modified: mpich2/trunk/test/mpi/rma/strided_get_indexed.c =================================================================== --- mpich2/trunk/test/mpi/rma/strided_get_indexed.c 2012-11-27 23:40:04 UTC (rev 10679) +++ mpich2/trunk/test/mpi/rma/strided_get_indexed.c 2012-11-27 23:40:06 UTC (rev 10680) @@ -20,25 +20,13 @@ #include <math.h> #include <mpi.h> #include "mpitest.h" +#include "squelch.h" #define XDIM 8 #define YDIM 1024 #define SUB_XDIM 8 #define SUB_YDIM 256 -static const int SQ_LIMIT = 10; -static int SQ_COUNT = 0; - -#define SQUELCH(X) \ - do { \ - if (SQ_COUNT < SQ_LIMIT) { \ - SQ_COUNT++; \ - X \ - } \ - } while (0) - -static int verbose = 0; - int main(int argc, char **argv) { int i, j, rank, nranks, peer, bufsize, errors; double *win_buf, *loc_buf; @@ -57,9 +45,6 @@ MPI_Alloc_mem(bufsize, MPI_INFO_NULL, &win_buf); MPI_Alloc_mem(bufsize, MPI_INFO_NULL, &loc_buf); - if (rank == 0) - if (verbose) printf("MPI RMA Strided Get Test:\n"); - for (i = 0; i < XDIM*YDIM; i++) { *(win_buf + i) = 1.0 + rank; *(loc_buf + i) = -1.0; Modified: mpich2/trunk/test/mpi/rma/strided_getacc_indexed.c =================================================================== --- mpich2/trunk/test/mpi/rma/strided_getacc_indexed.c 2012-11-27 23:40:04 UTC (rev 10679) +++ mpich2/trunk/test/mpi/rma/strided_getacc_indexed.c 2012-11-27 23:40:06 UTC (rev 10680) @@ -20,6 +20,7 @@ #include <math.h> #include <mpi.h> #include "mpitest.h" +#include "squelch.h" #define XDIM 8 #define YDIM 1024 @@ -27,19 +28,6 @@ #define SUB_YDIM 2 #define ITERATIONS 10 -static const int SQ_LIMIT = 10; -static int SQ_COUNT = 0; - -#define SQUELCH(X) \ - do { \ - if (SQ_COUNT < SQ_LIMIT) { \ - SQ_COUNT++; \ - X \ - } \ - } while (0) - -static int verbose = 0; - int main(int argc, char **argv) { int i, j, rank, nranks, peer, bufsize, errors; double *win_buf, *src_buf, *dst_buf; @@ -55,9 +43,6 @@ MPI_Alloc_mem(bufsize, MPI_INFO_NULL, &src_buf); MPI_Alloc_mem(bufsize, MPI_INFO_NULL, &dst_buf); - if (rank == 0) - if (verbose) printf("MPI RMA Strided Accumulate Test:\n"); - for (i = 0; i < XDIM*YDIM; i++) { *(win_buf + i) = -1.0; *(src_buf + i) = 1.0 + rank; Modified: mpich2/trunk/test/mpi/rma/strided_getacc_indexed_shared.c =================================================================== --- mpich2/trunk/test/mpi/rma/strided_getacc_indexed_shared.c 2012-11-27 23:40:04 UTC (rev 10679) +++ mpich2/trunk/test/mpi/rma/strided_getacc_indexed_shared.c 2012-11-27 23:40:06 UTC (rev 10680) @@ -20,6 +20,7 @@ #include <math.h> #include <mpi.h> #include "mpitest.h" +#include "squelch.h" #define XDIM 8 #define YDIM 1024 @@ -27,19 +28,6 @@ #define SUB_YDIM 2 #define ITERATIONS 10 -static const int SQ_LIMIT = 10; -static int SQ_COUNT = 0; - -#define SQUELCH(X) \ - do { \ - if (SQ_COUNT < SQ_LIMIT) { \ - SQ_COUNT++; \ - X \ - } \ - } while (0) - -static int verbose = 0; - int main(int argc, char **argv) { int rank, nranks, rank_world, nranks_world; int i, j, peer, bufsize, errors; @@ -61,9 +49,6 @@ MPI_Alloc_mem(bufsize, MPI_INFO_NULL, &src_buf); MPI_Alloc_mem(bufsize, MPI_INFO_NULL, &dst_buf); - if (rank == 0) - if (verbose) printf("MPI RMA Strided Accumulate Test (shared memory window):\n"); - MPI_Win_allocate_shared(bufsize, 1, MPI_INFO_NULL, shr_comm, &win_buf, &buf_win); MPI_Win_fence(0, buf_win); Modified: mpich2/trunk/test/mpi/rma/strided_putget_indexed.c =================================================================== --- mpich2/trunk/test/mpi/rma/strided_putget_indexed.c 2012-11-27 23:40:04 UTC (rev 10679) +++ mpich2/trunk/test/mpi/rma/strided_putget_indexed.c 2012-11-27 23:40:06 UTC (rev 10680) @@ -20,6 +20,7 @@ #include <math.h> #include <mpi.h> #include "mpitest.h" +#include "squelch.h" #define XDIM 8 #define YDIM 1024 @@ -27,19 +28,6 @@ #define SUB_YDIM 255 #define ITERATIONS 10 -static const int SQ_LIMIT = 10; -static int SQ_COUNT = 0; - -#define SQUELCH(X) \ - do { \ - if (SQ_COUNT < SQ_LIMIT) { \ - SQ_COUNT++; \ - X \ - } \ - } while (0) - -static int verbose = 0; - int main(int argc, char **argv) { int i, j, rank, nranks, peer, bufsize, errors; double *win_buf, *src_buf, *dst_buf; @@ -55,9 +43,6 @@ MPI_Alloc_mem(bufsize, MPI_INFO_NULL, &src_buf); MPI_Alloc_mem(bufsize, MPI_INFO_NULL, &dst_buf); - if (rank == 0) - if (verbose) printf("MPI RMA Strided Accumulate Test:\n"); - for (i = 0; i < XDIM*YDIM; i++) { *(win_buf + i) = -1.0; *(src_buf + i) = 1.0 + rank; Modified: mpich2/trunk/test/mpi/rma/strided_putget_indexed_shared.c =================================================================== --- mpich2/trunk/test/mpi/rma/strided_putget_indexed_shared.c 2012-11-27 23:40:04 UTC (rev 10679) +++ mpich2/trunk/test/mpi/rma/strided_putget_indexed_shared.c 2012-11-27 23:40:06 UTC (rev 10680) @@ -20,6 +20,7 @@ #include <math.h> #include <mpi.h> #include "mpitest.h" +#include "squelch.h" #define XDIM 8 #define YDIM 1024 @@ -27,19 +28,6 @@ #define SUB_YDIM 255 #define ITERATIONS 10 -static const int SQ_LIMIT = 10; -static int SQ_COUNT = 0; - -#define SQUELCH(X) \ - do { \ - if (SQ_COUNT < SQ_LIMIT) { \ - SQ_COUNT++; \ - X \ - } \ - } while (0) - -static int verbose = 0; - int main(int argc, char **argv) { int rank, nranks, rank_world, nranks_world; int i, j, peer, bufsize, errors; @@ -61,9 +49,6 @@ MPI_Alloc_mem(bufsize, MPI_INFO_NULL, &src_buf); MPI_Alloc_mem(bufsize, MPI_INFO_NULL, &dst_buf); - if (rank == 0) - if (verbose) printf("MPI RMA Strided Accumulate Test (shared memory window):\n"); - MPI_Win_allocate_shared(bufsize, 1, MPI_INFO_NULL, shr_comm, &win_buf, &buf_win); MPI_Win_fence(0, buf_win);

1 0

r10679 - mpich2/trunk/test/mpi/rma
by dinan＠mcs.anl.gov 27 Nov '12

27 Nov '12

Author: dinan Date: 2012-11-27 17:40:04 -0600 (Tue, 27 Nov 2012) New Revision: 10679 Added: mpich2/trunk/test/mpi/rma/squelch.h Modified: mpich2/trunk/test/mpi/rma/test1.c mpich2/trunk/test/mpi/rma/test1_am.c mpich2/trunk/test/mpi/rma/test1_dt.c mpich2/trunk/test/mpi/rma/test2.c mpich2/trunk/test/mpi/rma/test2_am.c mpich2/trunk/test/mpi/rma/test3.c mpich2/trunk/test/mpi/rma/test3_am.c mpich2/trunk/test/mpi/rma/test4.c mpich2/trunk/test/mpi/rma/test4_am.c mpich2/trunk/test/mpi/rma/test5.c mpich2/trunk/test/mpi/rma/test5_am.c mpich2/trunk/test/mpi/rma/transpose3.c Log: Updated RMA tests to squelch error messages Many RMA tests did not limit their output when an error occurred. This adds the simple SQUELCH() macro to these tests to limit per-process error messages. Reviewer: goodell Added: mpich2/trunk/test/mpi/rma/squelch.h =================================================================== --- mpich2/trunk/test/mpi/rma/squelch.h (rev 0) +++ mpich2/trunk/test/mpi/rma/squelch.h 2012-11-27 23:40:04 UTC (rev 10679) @@ -0,0 +1,16 @@ +#ifndef SQUELCH_H_INCLUDED +#define SQUELCH_H_INCLUDED + +static const int SQ_LIMIT = 10; +static int SQ_COUNT = 0; +static int SQ_VERBOSE = 0; + +#define SQUELCH(X) \ + do { \ + if (SQ_COUNT < SQ_LIMIT || SQ_VERBOSE) { \ + SQ_COUNT++; \ + X \ + } \ + } while (0) + +#endif Modified: mpich2/trunk/test/mpi/rma/test1.c =================================================================== --- mpich2/trunk/test/mpi/rma/test1.c 2012-11-27 23:40:02 UTC (rev 10678) +++ mpich2/trunk/test/mpi/rma/test1.c 2012-11-27 23:40:04 UTC (rev 10679) @@ -6,6 +6,7 @@ #include "mpi.h" #include "stdio.h" #include "mpitest.h" +#include "squelch.h" /* tests a series of puts, gets, and accumulate on 2 processes using fence */ @@ -60,14 +61,14 @@ if (rank == 1) { for (i=0; i<SIZE-1; i++) { if (A[i] != B[i]) { - printf("Put/Get Error: A[i]=%d, B[i]=%d\n", A[i], B[i]); + SQUELCH( printf("Put/Get Error: A[i]=%d, B[i]=%d\n", A[i], B[i]); ); errs++; } } } else { if (B[SIZE-1] != SIZE - 1 - 3*(SIZE-1)) { - printf("Accumulate Error: B[SIZE-1] is %d, should be %d\n", B[SIZE-1], SIZE - 1 - 3*(SIZE-1)); + SQUELCH( printf("Accumulate Error: B[SIZE-1] is %d, should be %d\n", B[SIZE-1], SIZE - 1 - 3*(SIZE-1)); ); errs++; } } Modified: mpich2/trunk/test/mpi/rma/test1_am.c =================================================================== --- mpich2/trunk/test/mpi/rma/test1_am.c 2012-11-27 23:40:02 UTC (rev 10678) +++ mpich2/trunk/test/mpi/rma/test1_am.c 2012-11-27 23:40:04 UTC (rev 10679) @@ -6,6 +6,7 @@ #include "mpi.h" #include "stdio.h" #include "mpitest.h" +#include "squelch.h" /* tests a series of puts, gets, and accumulate on 2 processes using fence */ @@ -75,14 +76,14 @@ if (rank == 1) { for (i=0; i<SIZE-1; i++) { if (A[i] != B[i]) { - printf("Put/Get Error: A[i]=%d, B[i]=%d\n", A[i], B[i]); + SQUELCH( printf("Put/Get Error: A[i]=%d, B[i]=%d\n", A[i], B[i]); ); errs++; } } } else { if (B[SIZE-1] != SIZE - 1 - 3*(SIZE-1)) { - printf("Accumulate Error: B[SIZE-1] is %d, should be %d\n", B[SIZE-1], SIZE - 1 - 3*(SIZE-1)); + SQUELCH( printf("Accumulate Error: B[SIZE-1] is %d, should be %d\n", B[SIZE-1], SIZE - 1 - 3*(SIZE-1)); ); errs++; } } Modified: mpich2/trunk/test/mpi/rma/test1_dt.c =================================================================== --- mpich2/trunk/test/mpi/rma/test1_dt.c 2012-11-27 23:40:02 UTC (rev 10678) +++ mpich2/trunk/test/mpi/rma/test1_dt.c 2012-11-27 23:40:04 UTC (rev 10679) @@ -6,6 +6,7 @@ #include "mpi.h" #include "stdio.h" #include "mpitest.h" +#include "squelch.h" /* tests a series of puts, gets, and accumulate on 2 processes using fence */ /* Same as test1.c but uses derived datatypes to receive data */ @@ -66,14 +67,14 @@ if (rank == 1) { for (i=0; i<SIZE-2; i++) { if (A[i] != B[i]) { - printf("Put/Get Error: A[i]=%d, B[i]=%d\n", A[i], B[i]); + SQUELCH( printf("Put/Get Error: A[i]=%d, B[i]=%d\n", A[i], B[i]); ); errs++; } } } else { if (B[SIZE-1] != SIZE - 1 - 3*(SIZE-1)) { - printf("Accumulate Error: B[SIZE-1] is %d, should be %d\n", B[SIZE-1], SIZE - 1 - 3*(SIZE-1)); + SQUELCH( printf("Accumulate Error: B[SIZE-1] is %d, should be %d\n", B[SIZE-1], SIZE - 1 - 3*(SIZE-1)); ); errs++; } } Modified: mpich2/trunk/test/mpi/rma/test2.c =================================================================== --- mpich2/trunk/test/mpi/rma/test2.c 2012-11-27 23:40:02 UTC (rev 10678) +++ mpich2/trunk/test/mpi/rma/test2.c 2012-11-27 23:40:04 UTC (rev 10679) @@ -6,6 +6,7 @@ #include "mpi.h" #include "stdio.h" #include "mpitest.h" +#include "squelch.h" /* tests put and get with post/start/complete/wait on 2 processes */ @@ -50,7 +51,7 @@ for (i=0; i<SIZE1; i++) if (B[i] != (-4)*(i+SIZE1)) { - printf("Get Error: B[i] is %d, should be %d\n", B[i], (-4)*(i+SIZE1)); + SQUELCH( printf("Get Error: B[i] is %d, should be %d\n", B[i], (-4)*(i+SIZE1)); ); errs++; } } @@ -64,7 +65,7 @@ for (i=0; i<SIZE1; i++) { if (B[i] != i) { - printf("Put Error: B[i] is %d, should be %d\n", B[i], i); + SQUELCH( printf("Put Error: B[i] is %d, should be %d\n", B[i], i); ); errs++; } } Modified: mpich2/trunk/test/mpi/rma/test2_am.c =================================================================== --- mpich2/trunk/test/mpi/rma/test2_am.c 2012-11-27 23:40:02 UTC (rev 10678) +++ mpich2/trunk/test/mpi/rma/test2_am.c 2012-11-27 23:40:04 UTC (rev 10679) @@ -6,6 +6,7 @@ #include "mpi.h" #include "stdio.h" #include "mpitest.h" +#include "squelch.h" /* tests put and get with post/start/complete/wait on 2 processes */ @@ -64,7 +65,7 @@ for (i=0; i<SIZE1; i++) if (B[i] != (-4)*(i+SIZE1)) { - printf("Get Error: B[i] is %d, should be %d\n", B[i], (-4)*(i+SIZE1)); + SQUELCH( printf("Get Error: B[i] is %d, should be %d\n", B[i], (-4)*(i+SIZE1)); ); errs++; } } @@ -78,7 +79,7 @@ for (i=0; i<SIZE1; i++) { if (B[i] != i) { - printf("Put Error: B[i] is %d, should be %d\n", B[i], i); + SQUELCH( printf("Put Error: B[i] is %d, should be %d\n", B[i], i); ); errs++; } } Modified: mpich2/trunk/test/mpi/rma/test3.c =================================================================== --- mpich2/trunk/test/mpi/rma/test3.c 2012-11-27 23:40:02 UTC (rev 10678) +++ mpich2/trunk/test/mpi/rma/test3.c 2012-11-27 23:40:04 UTC (rev 10679) @@ -7,6 +7,7 @@ #include "stdio.h" #include "stdlib.h" #include "mpitest.h" +#include "squelch.h" /* Tests the example in Fig 6.8, pg 142, MPI-2 standard. Process 1 has a blocking MPI_Recv between the Post and Wait. Therefore, this @@ -76,11 +77,11 @@ for (i=0; i<SIZE; i++) { if (B[i] != i) { - printf("Rank 1: Put Error: B[i] is %d, should be %d\n", B[i], i); + SQUELCH( printf("Rank 1: Put Error: B[i] is %d, should be %d\n", B[i], i); ); errs++; } if (A[i] != SIZE + i) { - printf("Rank 1: Send/Recv Error: A[i] is %d, should be %d\n", A[i], SIZE+i); + SQUELCH( printf("Rank 1: Send/Recv Error: A[i] is %d, should be %d\n", A[i], SIZE+i); ); errs++; } } Modified: mpich2/trunk/test/mpi/rma/test3_am.c =================================================================== --- mpich2/trunk/test/mpi/rma/test3_am.c 2012-11-27 23:40:02 UTC (rev 10678) +++ mpich2/trunk/test/mpi/rma/test3_am.c 2012-11-27 23:40:04 UTC (rev 10679) @@ -7,6 +7,7 @@ #include "stdio.h" #include "stdlib.h" #include "mpitest.h" +#include "squelch.h" /* Tests the example in Fig 6.8, pg 142, MPI-2 standard. Process 1 has a blocking MPI_Recv between the Post and Wait. Therefore, this @@ -76,11 +77,11 @@ for (i=0; i<SIZE; i++) { if (B[i] != i) { - printf("Rank 1: Put Error: B[i] is %d, should be %d\n", B[i], i); + SQUELCH( printf("Rank 1: Put Error: B[i] is %d, should be %d\n", B[i], i); ); errs++; } if (A[i] != SIZE + i) { - printf("Rank 1: Send/Recv Error: A[i] is %d, should be %d\n", A[i], SIZE+i); + SQUELCH( printf("Rank 1: Send/Recv Error: A[i] is %d, should be %d\n", A[i], SIZE+i); ); errs++; } } Modified: mpich2/trunk/test/mpi/rma/test4.c =================================================================== --- mpich2/trunk/test/mpi/rma/test4.c 2012-11-27 23:40:02 UTC (rev 10678) +++ mpich2/trunk/test/mpi/rma/test4.c 2012-11-27 23:40:04 UTC (rev 10679) @@ -7,6 +7,7 @@ #include "stdio.h" #include "stdlib.h" #include "mpitest.h" +#include "squelch.h" /* tests passive target RMA on 2 processes. tests the lock-single_op-unlock optimization. */ @@ -55,7 +56,7 @@ for (i=0; i<SIZE1; i++) if (B[i] != (-4)*(i+SIZE1)) { - printf("Get Error: B[%d] is %d, should be %d\n", i, B[i], (-4)*(i+SIZE1)); + SQUELCH( printf("Get Error: B[%d] is %d, should be %d\n", i, B[i], (-4)*(i+SIZE1)); ); errs++; } } @@ -67,7 +68,7 @@ for (i=0; i<SIZE1; i++) { if (B[i] != i) { - printf("Put Error: B[%d] is %d, should be %d\n", i, B[i], i); + SQUELCH( printf("Put Error: B[%d] is %d, should be %d\n", i, B[i], i); ); errs++; } } Modified: mpich2/trunk/test/mpi/rma/test4_am.c =================================================================== --- mpich2/trunk/test/mpi/rma/test4_am.c 2012-11-27 23:40:02 UTC (rev 10678) +++ mpich2/trunk/test/mpi/rma/test4_am.c 2012-11-27 23:40:04 UTC (rev 10679) @@ -7,6 +7,7 @@ #include "stdio.h" #include "stdlib.h" #include "mpitest.h" +#include "squelch.h" /* tests passive target RMA on 2 processes. tests the lock-single_op-unlock optimization. */ @@ -66,7 +67,7 @@ for (i=0; i<SIZE1; i++) if (B[i] != (-4)*(i+SIZE1)) { - printf("Get Error: B[%d] is %d, should be %d\n", i, B[i], (-4)*(i+SIZE1)); + SQUELCH( printf("Get Error: B[%d] is %d, should be %d\n", i, B[i], (-4)*(i+SIZE1)); ); errs++; } } @@ -78,7 +79,7 @@ for (i=0; i<SIZE1; i++) { if (B[i] != i) { - printf("Put Error: B[%d] is %d, should be %d\n", i, B[i], i); + SQUELCH( printf("Put Error: B[%d] is %d, should be %d\n", i, B[i], i); ); errs++; } } Modified: mpich2/trunk/test/mpi/rma/test5.c =================================================================== --- mpich2/trunk/test/mpi/rma/test5.c 2012-11-27 23:40:02 UTC (rev 10678) +++ mpich2/trunk/test/mpi/rma/test5.c 2012-11-27 23:40:04 UTC (rev 10679) @@ -6,6 +6,7 @@ #include "mpi.h" #include "stdio.h" #include "mpitest.h" +#include "squelch.h" /* tests a series of Gets. Run on 2 processes. */ @@ -43,7 +44,7 @@ MPI_Win_fence(0, win); for (i=0; i<SIZE; i++) if (A[i] != 1000 + i) { - printf("Rank 0: A[%d] is %d, should be %d\n", i, A[i], 1000+i); + SQUELCH( printf("Rank 0: A[%d] is %d, should be %d\n", i, A[i], 1000+i); ); errs++; } } @@ -59,7 +60,7 @@ MPI_Win_fence(0, win); for (i=0; i<SIZE; i++) if (B[i] != 500 + i) { - printf("Rank 1: B[%d] is %d, should be %d\n", i, B[i], 500+i); + SQUELCH( printf("Rank 1: B[%d] is %d, should be %d\n", i, B[i], 500+i); ); errs++; } } Modified: mpich2/trunk/test/mpi/rma/test5_am.c =================================================================== --- mpich2/trunk/test/mpi/rma/test5_am.c 2012-11-27 23:40:02 UTC (rev 10678) +++ mpich2/trunk/test/mpi/rma/test5_am.c 2012-11-27 23:40:04 UTC (rev 10679) @@ -6,6 +6,7 @@ #include "mpi.h" #include "stdio.h" #include "mpitest.h" +#include "squelch.h" /* tests a series of Gets. Run on 2 processes. */ @@ -56,7 +57,7 @@ MPI_Win_fence(0, win); for (i=0; i<SIZE; i++) if (A[i] != 1000 + i) { - printf("Rank 0: A[%d] is %d, should be %d\n", i, A[i], 1000+i); + SQUELCH( printf("Rank 0: A[%d] is %d, should be %d\n", i, A[i], 1000+i); ); errs++; } } @@ -72,7 +73,7 @@ MPI_Win_fence(0, win); for (i=0; i<SIZE; i++) if (B[i] != 500 + i) { - printf("Rank 1: B[%d] is %d, should be %d\n", i, B[i], 500+i); + SQUELCH( printf("Rank 1: B[%d] is %d, should be %d\n", i, B[i], 500+i); ); errs++; } } Modified: mpich2/trunk/test/mpi/rma/transpose3.c =================================================================== --- mpich2/trunk/test/mpi/rma/transpose3.c 2012-11-27 23:40:02 UTC (rev 10678) +++ mpich2/trunk/test/mpi/rma/transpose3.c 2012-11-27 23:40:04 UTC (rev 10679) @@ -6,6 +6,7 @@ #include "mpi.h" #include "stdio.h" #include "mpitest.h" +#include "squelch.h" /* transposes a matrix using post/start/complete/wait and derived datatypes. Uses vector and hvector (Example 3.32 from MPI 1.1 @@ -82,8 +83,8 @@ { if (errs < 50) { - printf("Error: A[%d][%d]=%d should be %d\n", j, i, - A[j][i], i*NCOLS + j); + SQUELCH( printf("Error: A[%d][%d]=%d should be %d\n", j, i, + A[j][i], i*NCOLS + j); ); } errs++; }

1 0