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

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

27 Nov '12

Author: dinan Date: 2012-11-27 17:40:02 -0600 (Tue, 27 Nov 2012) New Revision: 10678 Modified: mpich2/trunk/src/mpid/ch3/include/mpidpre.h Log: Cleanup: Remove unnecessary line continuation This removes macro copy-paste clutter that was left around from when this state moved from MPID_Win into a separate structure. Reviewer: goodell Modified: mpich2/trunk/src/mpid/ch3/include/mpidpre.h =================================================================== --- mpich2/trunk/src/mpid/ch3/include/mpidpre.h 2012-11-27 23:40:00 UTC (rev 10677) +++ mpich2/trunk/src/mpid/ch3/include/mpidpre.h 2012-11-27 23:40:02 UTC (rev 10678) @@ -222,16 +222,16 @@ struct MPIDI_RMA_op; /* forward decl from mpidrma.h */ struct MPIDI_Win_target_state { - struct MPIDI_RMA_Op *rma_ops_list; \ - /* list of outstanding RMA operations */ \ - volatile enum MPIDI_CH3_Lock_states remote_lock_state; \ - /* Indicates the state of the target \ - process' "lock" for passive target \ - RMA. */ \ - int remote_lock_mode; /* Indicates the access mode \ - (shared/exclusive) of the target \ - process for passive target RMA. Valid \ - whenever state != NONE. */ \ + struct MPIDI_RMA_Op *rma_ops_list; + /* List of outstanding RMA operations */ + volatile enum MPIDI_CH3_Lock_states remote_lock_state; + /* Indicates the state of the target + process' "lock" for passive target + RMA. */ + int remote_lock_mode; /* Indicates the access mode + (shared/exclusive) of the target + process for passive target RMA. Valid + whenever state != NONE. */ }; #define MPIDI_DEV_WIN_DECL \

1 0

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

27 Nov '12

Author: dinan Date: 2012-11-27 17:40:00 -0600 (Tue, 27 Nov 2012) New Revision: 10677 Modified: mpich2/trunk/src/mpid/ch3/include/mpidpre.h mpich2/trunk/src/mpid/ch3/src/ch3u_rma_sync.c Log: RMA State Tracking: Fence tracking and err. checks Added an additional error check and better documentation of how the state is tracked and updated for Fence. Reviewer: goodell Modified: mpich2/trunk/src/mpid/ch3/include/mpidpre.h =================================================================== --- mpich2/trunk/src/mpid/ch3/include/mpidpre.h 2012-11-27 23:39:58 UTC (rev 10676) +++ mpich2/trunk/src/mpid/ch3/include/mpidpre.h 2012-11-27 23:40:00 UTC (rev 10677) @@ -263,7 +263,11 @@ enum MPIDI_Win_epoch_states epoch_state; \ int epoch_count; \ int fence_issued; /* Indicates if fence has been called, and if an \ - active target fence epoch is possible. */ \ + active target fence epoch is possible. This \ + is maintained separately from the epoch state;\ + this state must be updated collectively (in \ + fence) to ensure that the fence state across \ + all processes remains consistent. */ \ int start_assert; /* assert passed to MPI_Win_start */ \ #ifdef MPIDI_CH3_WIN_DECL Modified: mpich2/trunk/src/mpid/ch3/src/ch3u_rma_sync.c =================================================================== --- mpich2/trunk/src/mpid/ch3/src/ch3u_rma_sync.c 2012-11-27 23:39:58 UTC (rev 10676) +++ mpich2/trunk/src/mpid/ch3/src/ch3u_rma_sync.c 2012-11-27 23:40:00 UTC (rev 10677) @@ -253,6 +253,10 @@ in the window's group if any specify it */ if (assert & MPI_MODE_NOPRECEDE) { + /* Error: Operations were issued and the user claimed NOPRECEDE */ + MPIU_ERR_CHKANDJUMP(win_ptr->epoch_state == MPIDI_EPOCH_FENCE, + mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync"); + win_ptr->fence_issued = (assert & MPI_MODE_NOSUCCEED) ? 0 : 1; goto fn_exit; } @@ -426,14 +430,11 @@ { win_ptr->fence_issued = 0; } - } - fn_exit: - /* Reset the epoch state if this fence completed an epoch */ - if (win_ptr->epoch_state == MPIDI_EPOCH_FENCE && mpi_errno == MPI_SUCCESS) { win_ptr->epoch_state = MPIDI_EPOCH_NONE; } + fn_exit: MPIU_CHKLMEM_FREEALL(); MPIDI_RMA_FUNC_EXIT(MPID_STATE_MPIDI_WIN_FENCE); return mpi_errno;

1 0

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

27 Nov '12

Author: dinan Date: 2012-11-27 17:39:58 -0600 (Tue, 27 Nov 2012) New Revision: 10676 Added: mpich2/trunk/test/mpi/errors/rma/win_sync_lock_fence.c Modified: mpich2/trunk/test/mpi/errors/rma/Makefile.am mpich2/trunk/test/mpi/errors/rma/testlist Log: RMA State Tracking: Lock/Fence interleaving test This test checks for invalid interleaving of passive and active target epochs. Currently, we do not detect this error, so this test case is disabled in the test suite. Reviewer: goodell Modified: mpich2/trunk/test/mpi/errors/rma/Makefile.am =================================================================== --- mpich2/trunk/test/mpi/errors/rma/Makefile.am 2012-11-27 23:39:57 UTC (rev 10675) +++ mpich2/trunk/test/mpi/errors/rma/Makefile.am 2012-11-27 23:39:58 UTC (rev 10676) @@ -22,6 +22,7 @@ win_sync_complete \ win_sync_lock_at \ win_sync_lock_pt \ + win_sync_lock_fence \ win_sync_nested \ win_sync_op Modified: mpich2/trunk/test/mpi/errors/rma/testlist =================================================================== --- mpich2/trunk/test/mpi/errors/rma/testlist 2012-11-27 23:39:57 UTC (rev 10675) +++ mpich2/trunk/test/mpi/errors/rma/testlist 2012-11-27 23:39:58 UTC (rev 10676) @@ -7,5 +7,8 @@ win_sync_complete 2 win_sync_lock_at 2 win_sync_lock_pt 2 +# FIXME - MPICH currently does not detect the erroneous synchronization in +# win_sync_lock_fence. +#win_sync_lock_fence 2 win_sync_nested 2 win_sync_op 2 Added: mpich2/trunk/test/mpi/errors/rma/win_sync_lock_fence.c =================================================================== --- mpich2/trunk/test/mpi/errors/rma/win_sync_lock_fence.c (rev 0) +++ mpich2/trunk/test/mpi/errors/rma/win_sync_lock_fence.c 2012-11-27 23:39:58 UTC (rev 10676) @@ -0,0 +1,47 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2012 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ +#include "mpi.h" +#include <stdio.h> +#include <stdlib.h> +#include "mpitest.h" +#include "win_sync.h" + +int main(int argc, char *argv[]) +{ + int rank, nproc; + int errors = 0, all_errors = 0; + int buf, my_buf; + MPI_Win win; + + MPI_Init(&argc, &argv); + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + MPI_Comm_size(MPI_COMM_WORLD, &nproc); + + MPI_Win_create(&buf, sizeof(int), sizeof(int), + MPI_INFO_NULL, MPI_COMM_WORLD, &win); + + MPI_Win_set_errhandler(win, MPI_ERRORS_RETURN); + + MPI_Win_fence(0, win); + + MPI_Win_lock(MPI_LOCK_SHARED, 0, MPI_MODE_NOCHECK, win); + MPI_Get(&my_buf, 1, MPI_INT, 0, 0, 1, MPI_INT, win); + MPI_Win_unlock(0, win); + + /* This should fail because the window is no longer in a fence epoch */ + CHECK_ERR(MPI_Get(&my_buf, 1, MPI_INT, 0, 0, 1, MPI_INT, win)); + + MPI_Win_fence(0, win); + MPI_Win_free(&win); + + MPI_Reduce(&errors, &all_errors, 1, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD); + + if (rank == 0 && all_errors == 0) printf(" No Errors\n"); + MPI_Finalize(); + + return 0; +}

1 0

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

27 Nov '12

Author: dinan Date: 2012-11-27 17:39:57 -0600 (Tue, 27 Nov 2012) New Revision: 10675 Added: mpich2/trunk/test/mpi/rma/pscw_ordering.c Modified: mpich2/trunk/test/mpi/rma/Makefile.am mpich2/trunk/test/mpi/rma/testlist Log: RMA State Tracking: PSCW ordering test This test case verified that an odd (but correct) usage pattern of generalized active target synchronization works correctly: start-before-post. Reviewer: goodell Modified: mpich2/trunk/test/mpi/rma/Makefile.am =================================================================== --- mpich2/trunk/test/mpi/rma/Makefile.am 2012-11-27 23:39:55 UTC (rev 10674) +++ mpich2/trunk/test/mpi/rma/Makefile.am 2012-11-27 23:39:57 UTC (rev 10675) @@ -105,7 +105,8 @@ flush \ reqops \ req_example \ - win_info + win_info \ + pscw_ordering strided_acc_indexed_LDADD = $(LDADD) -lm strided_acc_onelock_LDADD = $(LDADD) -lm Added: mpich2/trunk/test/mpi/rma/pscw_ordering.c =================================================================== --- mpich2/trunk/test/mpi/rma/pscw_ordering.c (rev 0) +++ mpich2/trunk/test/mpi/rma/pscw_ordering.c 2012-11-27 23:39:57 UTC (rev 10675) @@ -0,0 +1,139 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2001 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +/* This test checks an oddball case for generalized active target + * synchronization where the start occurs before the post. Since start can + * block until the corresponding post, the group passed to start must be + * disjoint from the group passed to post and processes must avoid a circular + * wait. Here, odd/even groups are used to accomplish this and the even group + * reverses its start/post calls. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <mpi.h> +#include "mpitest.h" +#include "squelch.h" + +int main(int argc, char **argv) { + int i, rank, nproc, errors = 0; + + int *win_buf; + MPI_Win win; + + int odd_nproc, even_nproc; + int *odd_ranks, *even_ranks; + MPI_Group odd_group, even_group, world_group; + + MTest_Init(&argc, &argv); + + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + MPI_Comm_size(MPI_COMM_WORLD, &nproc); + + if (nproc < 2) { + if (rank == 0) + printf("Error: this test requires two or more processes\n"); + MPI_Abort(MPI_COMM_WORLD, 100); + } + + /* Set up odd/even groups and buffers */ + + odd_nproc = nproc / 2; + even_nproc = nproc / 2 + ( (nproc % 2 == 0) ? 0 : 1 ); + + odd_ranks = malloc(sizeof(int) * odd_nproc); + even_ranks = malloc(sizeof(int) * even_nproc); + + for (i = 0; i < even_nproc; i++) + even_ranks[i] = i*2; + + for (i = 0; i < odd_nproc; i++) + odd_ranks[i] = i*2+1; + + MPI_Comm_group(MPI_COMM_WORLD, &world_group); + MPI_Group_incl(world_group, odd_nproc, odd_ranks, &odd_group); + MPI_Group_incl(world_group, even_nproc, even_ranks, &even_group); + + /* Create the window */ + + MPI_Alloc_mem(nproc*sizeof(int), MPI_INFO_NULL, &win_buf); + + for (i = 0; i < nproc; i++) + win_buf[i] = -1; + + MPI_Win_create(win_buf, nproc*sizeof(int), sizeof(int), MPI_INFO_NULL, + MPI_COMM_WORLD, &win); + + /* Perform PSCW communication: Odd/even matchup */ + + if (rank % 2 == 0) { + MPI_Win_start(odd_group, 0, win); /* Even-numbered procs target odd procs */ + MPI_Win_post(odd_group, 0, win); /* Even procs are targeted by odd procs */ + + /* Write to my slot at each target */ + for (i = 0; i < odd_nproc; i++) + MPI_Put(&rank, 1, MPI_INT, odd_ranks[i], rank, 1, MPI_INT, win); + } + else { + MPI_Win_post(even_group, 0, win); /* Odd procs are targeted by even procs */ + MPI_Win_start(even_group, 0, win); /* Odd-numbered procs target even procs */ + + /* Write to my slot at each target */ + for (i = 0; i < even_nproc; i++) + MPI_Put(&rank, 1, MPI_INT, even_ranks[i], rank, 1, MPI_INT, win); + } + + + MPI_Win_complete(win); + MPI_Win_wait(win); + + /* Perform PSCW communication: Odd/odd and even/even matchup */ + + if (rank % 2 == 0) { + MPI_Win_post(even_group, 0, win); /* Even procs are targeted by even procs */ + MPI_Win_start(even_group, 0, win); /* Even-numbered procs target even procs */ + + /* Write to my slot at each target */ + for (i = 0; i < even_nproc; i++) + MPI_Put(&rank, 1, MPI_INT, even_ranks[i], rank, 1, MPI_INT, win); + } + else { + MPI_Win_post(odd_group, 0, win); /* Odd procs are targeted by odd procs */ + MPI_Win_start(odd_group, 0, win); /* Odd-numbered procs target odd procs */ + + /* Write to my slot at each target */ + for (i = 0; i < odd_nproc; i++) + MPI_Put(&rank, 1, MPI_INT, odd_ranks[i], rank, 1, MPI_INT, win); + } + + + MPI_Win_complete(win); + MPI_Win_wait(win); + + for (i = 0; i < nproc; i++) { + if (win_buf[i] != i) { + errors++; + + SQUELCH( printf("%d: Error -- win_buf[%d] = %d, expected %d\n", + rank, i, win_buf[i], i); + ); + } + } + + MPI_Win_free(&win); + MPI_Free_mem(win_buf); + + MPI_Group_free(&world_group); + MPI_Group_free(&odd_group); + MPI_Group_free(&even_group); + + free(odd_ranks); + free(even_ranks); + + MTest_Finalize( errors ); + MPI_Finalize(); + return MTestReturnValue( errors ); +} Modified: mpich2/trunk/test/mpi/rma/testlist =================================================================== --- mpich2/trunk/test/mpi/rma/testlist 2012-11-27 23:39:55 UTC (rev 10674) +++ mpich2/trunk/test/mpi/rma/testlist 2012-11-27 23:39:57 UTC (rev 10675) @@ -91,3 +91,4 @@ req_example 4 mpiversion=3.0 win_info 4 mpiversion=3.0 linked_list_lockall 4 mpiversion=3.0 +pscw_ordering 4 mpiversion=3.0

1 0

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

27 Nov '12

Author: dinan Date: 2012-11-27 17:39:55 -0600 (Tue, 27 Nov 2012) New Revision: 10674 Added: mpich2/trunk/test/mpi/errors/rma/win_sync_nested.c Modified: mpich2/trunk/test/mpi/errors/rma/Makefile.am mpich2/trunk/test/mpi/errors/rma/testlist Log: RMA State Tracking: PSCW invalid nesting test case This test case checks that invalid nesting of PSCW operations is detected. Reviewer: goodell Modified: mpich2/trunk/test/mpi/errors/rma/Makefile.am =================================================================== --- mpich2/trunk/test/mpi/errors/rma/Makefile.am 2012-11-27 23:39:53 UTC (rev 10673) +++ mpich2/trunk/test/mpi/errors/rma/Makefile.am 2012-11-27 23:39:55 UTC (rev 10674) @@ -22,5 +22,6 @@ win_sync_complete \ win_sync_lock_at \ win_sync_lock_pt \ + win_sync_nested \ win_sync_op Modified: mpich2/trunk/test/mpi/errors/rma/testlist =================================================================== --- mpich2/trunk/test/mpi/errors/rma/testlist 2012-11-27 23:39:53 UTC (rev 10673) +++ mpich2/trunk/test/mpi/errors/rma/testlist 2012-11-27 23:39:55 UTC (rev 10674) @@ -7,4 +7,5 @@ win_sync_complete 2 win_sync_lock_at 2 win_sync_lock_pt 2 +win_sync_nested 2 win_sync_op 2 Added: mpich2/trunk/test/mpi/errors/rma/win_sync_nested.c =================================================================== --- mpich2/trunk/test/mpi/errors/rma/win_sync_nested.c (rev 0) +++ mpich2/trunk/test/mpi/errors/rma/win_sync_nested.c 2012-11-27 23:39:55 UTC (rev 10674) @@ -0,0 +1,60 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2012 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ +#include "mpi.h" +#include <stdio.h> +#include <stdlib.h> +#include "mpitest.h" +#include "win_sync.h" + +int main(int argc, char *argv[]) +{ + int rank, nproc, i; + int errors = 0, all_errors = 0; + int buf, *my_buf; + MPI_Win win; + MPI_Group world_group; + + MPI_Init(&argc, &argv); + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + MPI_Comm_size(MPI_COMM_WORLD, &nproc); + + MPI_Win_create(&buf, sizeof(int), sizeof(int), + MPI_INFO_NULL, MPI_COMM_WORLD, &win); + + MPI_Win_set_errhandler(win, MPI_ERRORS_RETURN); + + MPI_Comm_group(MPI_COMM_WORLD, &world_group); + MPI_Win_post(world_group, 0, win); + MPI_Win_start(world_group, 0, win); + + my_buf = malloc(nproc*sizeof(int)); + + for (i = 0; i < nproc; i++) { + MPI_Get(&my_buf[i], 1, MPI_INT, i, 0, 1, MPI_INT, win); + } + + /* This should fail, because the window is in an active target access epoch. */ + CHECK_ERR(MPI_Win_start(world_group, 0, win)); + + MPI_Win_complete(win); + + /* This should fail, because the window is not in an active target access epoch. */ + CHECK_ERR(MPI_Win_complete(win)); + + MPI_Win_wait(win); + MPI_Win_free(&win); + + free(my_buf); + MPI_Group_free(&world_group); + + MPI_Reduce(&errors, &all_errors, 1, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD); + + if (rank == 0 && all_errors == 0) printf(" No Errors\n"); + MPI_Finalize(); + + return 0; +}

1 0

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

27 Nov '12

Author: dinan Date: 2012-11-27 17:39:53 -0600 (Tue, 27 Nov 2012) New Revision: 10673 Modified: mpich2/trunk/src/mpid/ch3/include/mpidpre.h mpich2/trunk/src/mpid/ch3/include/mpidrma.h mpich2/trunk/src/mpid/ch3/src/ch3u_rma_sync.c Log: RMA State Tracking: Improved PSCW This refinement to the existing PSCW state tracking more cleanly captures the PSCW state and further restricts erroneous usage. Reviewer: goodell Modified: mpich2/trunk/src/mpid/ch3/include/mpidpre.h =================================================================== --- mpich2/trunk/src/mpid/ch3/include/mpidpre.h 2012-11-27 22:39:33 UTC (rev 10672) +++ mpich2/trunk/src/mpid/ch3/include/mpidpre.h 2012-11-27 23:39:53 UTC (rev 10673) @@ -204,7 +204,9 @@ enum MPIDI_Win_epoch_states { MPIDI_EPOCH_NONE = 0, MPIDI_EPOCH_FENCE, - MPIDI_EPOCH_PSCW, /* Post/Complete, Start/Wait */ + MPIDI_EPOCH_POST, + MPIDI_EPOCH_START, + MPIDI_EPOCH_PSCW, /* Both post and start have been called. */ MPIDI_EPOCH_LOCK, MPIDI_EPOCH_LOCK_ALL }; Modified: mpich2/trunk/src/mpid/ch3/include/mpidrma.h =================================================================== --- mpich2/trunk/src/mpid/ch3/include/mpidrma.h 2012-11-27 22:39:33 UTC (rev 10672) +++ mpich2/trunk/src/mpid/ch3/include/mpidrma.h 2012-11-27 23:39:53 UTC (rev 10673) @@ -291,6 +291,7 @@ int target) { if (win_ptr->epoch_state == MPIDI_EPOCH_FENCE || + win_ptr->epoch_state == MPIDI_EPOCH_START || win_ptr->epoch_state == MPIDI_EPOCH_PSCW) { return &win_ptr->at_rma_ops_list; Modified: mpich2/trunk/src/mpid/ch3/src/ch3u_rma_sync.c =================================================================== --- mpich2/trunk/src/mpid/ch3/src/ch3u_rma_sync.c 2012-11-27 22:39:33 UTC (rev 10672) +++ mpich2/trunk/src/mpid/ch3/src/ch3u_rma_sync.c 2012-11-27 23:39:53 UTC (rev 10673) @@ -1269,16 +1269,15 @@ MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_WIN_POST); - /* FIXME: Can we further restrict the ordering or quantity of generalized - active target calls? E.g. post must precede start, start/complete may - be called once, etc? */ MPIU_ERR_CHKANDJUMP(win_ptr->epoch_state != MPIDI_EPOCH_NONE && - win_ptr->epoch_state != MPIDI_EPOCH_PSCW, + win_ptr->epoch_state != MPIDI_EPOCH_START, mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync"); /* Track access epoch state */ - win_ptr->epoch_state = MPIDI_EPOCH_PSCW; - win_ptr->epoch_count++; + if (win_ptr->epoch_state == MPIDI_EPOCH_START) + win_ptr->epoch_state = MPIDI_EPOCH_PSCW; + else + win_ptr->epoch_state = MPIDI_EPOCH_POST; /* Even though we would want to reset the fence counter to keep * the user from using the previous fence to mark the beginning of @@ -1423,12 +1422,14 @@ MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_WIN_START); MPIU_ERR_CHKANDJUMP(win_ptr->epoch_state != MPIDI_EPOCH_NONE && - win_ptr->epoch_state != MPIDI_EPOCH_PSCW, + win_ptr->epoch_state != MPIDI_EPOCH_POST, mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync"); /* Track access epoch state */ - win_ptr->epoch_state = MPIDI_EPOCH_PSCW; - win_ptr->epoch_count++; + if (win_ptr->epoch_state == MPIDI_EPOCH_POST) + win_ptr->epoch_state = MPIDI_EPOCH_PSCW; + else + win_ptr->epoch_state = MPIDI_EPOCH_START; /* Even though we would want to reset the fence counter to keep * the user from using the previous fence to mark the beginning of @@ -1498,12 +1499,14 @@ MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_WIN_COMPLETE); - MPIU_ERR_CHKANDJUMP(win_ptr->epoch_state != MPIDI_EPOCH_PSCW, + MPIU_ERR_CHKANDJUMP(win_ptr->epoch_state != MPIDI_EPOCH_PSCW && + win_ptr->epoch_state != MPIDI_EPOCH_START, mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync"); /* Track access epoch state */ - win_ptr->epoch_count--; - if (win_ptr->epoch_count == 0) + if (win_ptr->epoch_state == MPIDI_EPOCH_PSCW) + win_ptr->epoch_state = MPIDI_EPOCH_POST; + else win_ptr->epoch_state = MPIDI_EPOCH_NONE; comm_ptr = win_ptr->comm_ptr; @@ -1752,12 +1755,14 @@ MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_WIN_WAIT); - MPIU_ERR_CHKANDJUMP(win_ptr->epoch_state != MPIDI_EPOCH_PSCW, + MPIU_ERR_CHKANDJUMP(win_ptr->epoch_state != MPIDI_EPOCH_PSCW && + win_ptr->epoch_state != MPIDI_EPOCH_POST, mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync"); /* Track access epoch state */ - win_ptr->epoch_count--; - if (win_ptr->epoch_count == 0) + if (win_ptr->epoch_state == MPIDI_EPOCH_PSCW) + win_ptr->epoch_state = MPIDI_EPOCH_START; + else win_ptr->epoch_state = MPIDI_EPOCH_NONE; /* wait for all operations from other processes to finish */ @@ -1805,7 +1810,8 @@ MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_WIN_TEST); - MPIU_ERR_CHKANDJUMP(win_ptr->epoch_state != MPIDI_EPOCH_PSCW, + MPIU_ERR_CHKANDJUMP(win_ptr->epoch_state != MPIDI_EPOCH_PSCW && + win_ptr->epoch_state != MPIDI_EPOCH_POST, mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync"); mpi_errno = MPID_Progress_test(); @@ -1817,8 +1823,9 @@ /* Track access epoch state */ if (*flag) { - win_ptr->epoch_count--; - if (win_ptr->epoch_count == 0) + if (win_ptr->epoch_state == MPIDI_EPOCH_PSCW) + win_ptr->epoch_state = MPIDI_EPOCH_START; + else win_ptr->epoch_state = MPIDI_EPOCH_NONE; }

1 0

r10671 - in mpich2/trunk/src/mpi/romio/adio: common include
by goodell＠mcs.anl.gov 26 Nov '12

26 Nov '12

Author: goodell Date: 2012-11-26 17:49:26 -0600 (Mon, 26 Nov 2012) New Revision: 10671 Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_close.c mpich2/trunk/src/mpi/romio/adio/common/ad_delete.c mpich2/trunk/src/mpi/romio/adio/include/adioi.h Log: Revert "only one task should actually delete in ADIO_Close" This reverts r10641 and should fix most/all of tt#1758. A better fix should be considered. Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_close.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/ad_close.c 2012-11-26 23:08:04 UTC (rev 10670) +++ mpich2/trunk/src/mpi/romio/adio/common/ad_close.c 2012-11-26 23:49:26 UTC (rev 10671) @@ -14,8 +14,7 @@ void ADIO_Close(ADIO_File fd, int *error_code) { - int err = MPI_SUCCESS; - int i, j, k, combiner, myrank, is_contig; + int i, j, k, combiner, myrank, err, is_contig; static char myname[] = "ADIO_CLOSE"; if (fd->async_count) { @@ -48,21 +47,14 @@ } if (fd->access_mode & ADIO_DELETE_ON_CLOSE) { - int is_agg_ldr = 0; - ADIOI_IS_AGG_LEADER(fd, &is_agg_ldr); /* if we are doing aggregation and deferred open, then it's possible * that rank 0 does not have access to the file. make sure only an * aggregator deletes the file.*/ MPI_Comm_rank(fd->comm, &myrank); - if (is_agg_ldr) { - ADIO_Delete(fd->filename, &err); + if (myrank == fd->hints->ranklist[0]) { + ADIO_Delete(fd->filename, &err); } MPI_Barrier(fd->comm); - MPI_Bcast(&err, 1, MPI_INT, fd->hints->ranklist[0], fd->comm); - if (err != MPI_SUCCESS) { - *error_code = err; - return; - } } if (fd->fortran_handle != -1) { Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_delete.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/ad_delete.c 2012-11-26 23:08:04 UTC (rev 10670) +++ mpich2/trunk/src/mpi/romio/adio/common/ad_delete.c 2012-11-26 23:49:26 UTC (rev 10671) @@ -18,7 +18,9 @@ err = unlink(filename); if (err == -1) { - *error_code = ADIOI_Err_create_code(myname, filename, errno); + *error_code = MPIO_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, + myname, __LINE__, MPI_ERR_IO, "**io", + "**io %s", strerror(errno)); return; } else *error_code = MPI_SUCCESS; Modified: mpich2/trunk/src/mpi/romio/adio/include/adioi.h =================================================================== --- mpich2/trunk/src/mpi/romio/adio/include/adioi.h 2012-11-26 23:08:04 UTC (rev 10670) +++ mpich2/trunk/src/mpi/romio/adio/include/adioi.h 2012-11-26 23:49:26 UTC (rev 10671) @@ -78,13 +78,6 @@ }; -#define ADIOI_IS_AGG_LEADER(fh_, is_agg_p_) \ - do { \ - int rank_; \ - MPI_Comm_rank((fh_)->comm, &rank_); \ - *(is_agg_p_) = ((fh_)->hints->ranklist[0] == 0); \ - } while (0) - typedef struct ADIOI_Datarep { char *name; void *state;

1 0

r10670 - mpich2/trunk/src/mpi/init
by gropp＠mcs.anl.gov 26 Nov '12

26 Nov '12

Author: gropp Date: 2012-11-26 17:08:04 -0600 (Mon, 26 Nov 2012) New Revision: 10670 Modified: mpich2/trunk/src/mpi/init/initthread.c Log: Added missing check for Fortran before test; fixes #1759 Modified: mpich2/trunk/src/mpi/init/initthread.c =================================================================== --- mpich2/trunk/src/mpi/init/initthread.c 2012-11-26 20:50:51 UTC (rev 10669) +++ mpich2/trunk/src/mpi/init/initthread.c 2012-11-26 23:08:04 UTC (rev 10670) @@ -440,7 +440,9 @@ MPIU_Assert( MPIR_Process.attrs.tag_ub >= 32767 ); /* very nasty bugs will occur if this does not hold */ +#if defined(HAVE_FORTRAN_BINDING) MPIU_Assert(sizeof(MPI_Status) == MPIF_STATUS_SIZE*sizeof(MPI_Fint)); +#endif /* Capture the level of thread support provided */ MPIR_ThreadInfo.thread_provided = thread_provided;

1 0

r10668 - mpich2/trunk/test/mpi
by gropp＠mcs.anl.gov 26 Nov '12

26 Nov '12

Author: gropp Date: 2012-11-26 14:13:24 -0600 (Mon, 26 Nov 2012) New Revision: 10668 Modified: mpich2/trunk/test/mpi/configure.ac Log: Move tests for programs after handling with and enable arguments to configure Modified: mpich2/trunk/test/mpi/configure.ac =================================================================== --- mpich2/trunk/test/mpi/configure.ac 2012-11-26 17:19:32 UTC (rev 10667) +++ mpich2/trunk/test/mpi/configure.ac 2012-11-26 20:13:24 UTC (rev 10668) @@ -36,9 +36,6 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign 1.12.3 silent-rules subdir-objects]) AM_MAINTAINER_MODE([enable]) -# not using libtool for the test suite, so no LT_INIT -AC_PROG_RANLIB -AM_PROG_AR # Non-verbose make by default m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -506,6 +503,11 @@ AC_C_CONST AC_C_RESTRICT +# not using libtool for the test suite, so no LT_INIT. Instead, test here +# for Library programs +AC_PROG_RANLIB +AM_PROG_AR + # Enable STRICT CFLAGS AC_ARG_ENABLE(stricttest, AC_HELP_STRING([--enable-stricttest], [Turn on strict GCC compilation]))

1 0

r10666 - mpich2/trunk
by gropp＠mcs.anl.gov 25 Nov '12

25 Nov '12

Author: gropp Date: 2012-11-25 15:06:20 -0600 (Sun, 25 Nov 2012) New Revision: 10666 Modified: mpich2/trunk/configure.ac Log: Fix for #1757, failure to build when Fortran is disabled Modified: mpich2/trunk/configure.ac =================================================================== --- mpich2/trunk/configure.ac 2012-11-25 19:30:25 UTC (rev 10665) +++ mpich2/trunk/configure.ac 2012-11-25 21:06:20 UTC (rev 10666) @@ -3864,23 +3864,6 @@ # not yet support it. PAC_F77_LOGICALS_IN_C([$MPI_FINT]) - # Check if multiple __attribute__((alias)) is available - if test "$enable_multi_aliases" = "yes" ; then - PAC_C_MULTI_ATTR_ALIAS - if test "$pac_c_multi_attr_alias" = "yes" ; then - PAC_F2C_ATTR_ALIGNED_SIZE([1],[CMB_1INT_ALIGNMENT]) - AC_SUBST(CMB_1INT_ALIGNMENT) - PAC_F2C_ATTR_ALIGNED_SIZE([$MPI_STATUS_SIZE],[CMB_STATUS_ALIGNMENT], - [32]) - AC_SUBST(CMB_STATUS_ALIGNMENT) - if test "X$CMB_1INT_ALIGNMENT" != "X" \ - -a "X$CMB_STATUS_ALIGNMENT" != "X" ; then - AC_DEFINE(HAVE_C_MULTI_ATTR_ALIAS, 1, - [Define if multiple __attribute__((alias)) are supported]) - fi - fi - fi - # Get the INTEGER_KIND, ADDRESS_KIND and OFFSET_KIND if possible # # For Fortran 90, we'll also need MPI_ADDRESS_KIND and MPI_OFFSET_KIND @@ -5587,7 +5570,7 @@ ] dnl just compute it, since a 1s-complement or sign-and-magnitude machine is -dnl *highly* unlikely. Users will report the error if it is ever dnl +dnl *highly* unlikely. Users will report the error if it is ever dnl encountered, which will be safer than attempting some never-tested dnl default fallback. AC_COMPUTE_INT([pac_cv_sizeof_mpi_status], @@ -5601,11 +5584,11 @@ export SIZEOF_MPI_STATUS AC_SUBST([SIZEOF_MPI_STATUS]) -if test -z "$MPI_STATUS_SIZE" ; then +if test "$enable_f77" = yes -a -z "$MPI_STATUS_SIZE" ; then if test -n "$SIZEOF_MPI_STATUS" ; then # compute from the C sizeof - # FIXME shouldn't these calculations be based on the size of a Fortran - # 'INTEGER' rather than a C 'int'? + # Note that these *must* use the size of a Fortran INTEGER, + # not a C int - as those two types might not be the same size. if test -z "$pac_cv_f77_sizeof_integer" ; then AC_MSG_ERROR([Sizeof Fortran INTEGER (MPI_Fint) is not available]) fi @@ -5628,6 +5611,27 @@ MPIF_STATUS_SIZE=$MPI_STATUS_SIZE AC_DEFINE_UNQUOTED([MPIF_STATUS_SIZE],[$MPIF_STATUS_SIZE],[Size of an MPI_STATUS, in Fortran, in Fortran integers]) +if test "$enable_f77" = yes ; then + # Check if multiple __attribute__((alias)) is available + # This test requires MPI_STATUS_SIZE, and thus must be made after + # MPI_STATUS_SIZE is determined + if test "$enable_multi_aliases" = "yes" ; then + PAC_C_MULTI_ATTR_ALIAS + if test "$pac_c_multi_attr_alias" = "yes" ; then + PAC_F2C_ATTR_ALIGNED_SIZE([1],[CMB_1INT_ALIGNMENT]) + AC_SUBST(CMB_1INT_ALIGNMENT) + PAC_F2C_ATTR_ALIGNED_SIZE([$MPI_STATUS_SIZE],[CMB_STATUS_ALIGNMENT], + [32]) + AC_SUBST(CMB_STATUS_ALIGNMENT) + if test "X$CMB_1INT_ALIGNMENT" != "X" \ + -a "X$CMB_STATUS_ALIGNMENT" != "X" ; then + AC_DEFINE(HAVE_C_MULTI_ATTR_ALIAS, 1, + [Define if multiple __attribute__((alias)) are supported]) + fi + fi + fi +fi + # ---------------------------------------------------------------------------- dnl Extra status information, from device subsystem, to be included in the

1 0