April 2015 - commits - mailman3.cels.anl.gov

[mpich] MPICH primary repository branch, master, updated. v3.2b2-5-gd04c8a1
by noreply＠mpich.org 24 Apr '15

24 Apr '15

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 d04c8a1e86c811422bf6d5f5afd78f8584ae36b0 (commit) via b6ce8a4cc37d7449708f4a9f080c0b091011a04d (commit) from b3a731791da03bf0489e0eec11c6f1e412bb0085 (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/d04c8a1e86c811422bf6d5f5afd78f858… commit d04c8a1e86c811422bf6d5f5afd78f8584ae36b0 Author: Igor Ivanov <Igor.Ivanov(a)itseez.com> Date: Thu Apr 23 17:05:54 2015 +0300 mpid/common/hcoll: Fix broken hcoll support - Fixed hcoll broken by #98c76f7 commit; - Resolved warnings reported by hcoll supported code; Signed-off-by: Igor Ivanov <Igor.Ivanov(a)itseez.com> Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/mpid/common/hcoll/hcoll.h b/src/mpid/common/hcoll/hcoll.h index 2c09320..5671a0f 100644 --- a/src/mpid/common/hcoll/hcoll.h +++ b/src/mpid/common/hcoll/hcoll.h @@ -10,13 +10,13 @@ extern int world_comm_destroying; int hcoll_comm_create(MPID_Comm * comm, void *param); int hcoll_comm_destroy(MPID_Comm * comm, void *param); -int hcoll_Barrier(MPID_Comm * comm_ptr, int *err); +int hcoll_Barrier(MPID_Comm * comm_ptr, mpir_errflag_t *err); int hcoll_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, - MPID_Comm * comm_ptr, int *err); + MPID_Comm * comm_ptr, mpir_errflag_t *err); int hcoll_Allgather(const void *sbuf, int scount, MPI_Datatype sdtype, - void *rbuf, int rcount, MPI_Datatype rdtype, MPID_Comm * comm_ptr, int *err); + void *rbuf, int rcount, MPI_Datatype rdtype, MPID_Comm * comm_ptr, mpir_errflag_t *err); int hcoll_Allreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, int *err); + MPI_Op op, MPID_Comm * comm_ptr, mpir_errflag_t *err); int hcoll_Ibarrier_req(MPID_Comm * comm_ptr, MPID_Request ** request); int hcoll_Ibcast_req(void *buffer, int count, MPI_Datatype datatype, int root, diff --git a/src/mpid/common/hcoll/hcoll_ops.c b/src/mpid/common/hcoll/hcoll_ops.c index 0719ff6..13523fc 100644 --- a/src/mpid/common/hcoll/hcoll_ops.c +++ b/src/mpid/common/hcoll/hcoll_ops.c @@ -5,7 +5,7 @@ #define FUNCNAME hcoll_Barrier #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) -int hcoll_Barrier(MPID_Comm * comm_ptr, int *err) +int hcoll_Barrier(MPID_Comm * comm_ptr, mpir_errflag_t *err) { int rc; MPI_Comm comm = comm_ptr->handle; @@ -29,7 +29,7 @@ int hcoll_Barrier(MPID_Comm * comm_ptr, int *err) #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) int hcoll_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, - MPID_Comm * comm_ptr, int *err) + MPID_Comm * comm_ptr, mpir_errflag_t *err) { dte_data_representation_t dtype; int rc; @@ -73,7 +73,7 @@ int hcoll_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) int hcoll_Allreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, int *err) + MPI_Op op, MPID_Comm * comm_ptr, mpir_errflag_t *err) { dte_data_representation_t Dtype; hcoll_dte_op_t *Op; @@ -97,7 +97,7 @@ int hcoll_Allreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype use_fallback = 1; } else { - rc = hcoll_collectives.coll_allreduce(sendbuf, recvbuf, count, Dtype, Op, + rc = hcoll_collectives.coll_allreduce((void *)sendbuf, recvbuf, count, Dtype, Op, comm_ptr->hcoll_priv.hcoll_context); if (HCOLL_SUCCESS != rc) { use_fallback = 1; @@ -124,7 +124,7 @@ int hcoll_Allreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) int hcoll_Allgather(const void *sbuf, int scount, MPI_Datatype sdtype, - void *rbuf, int rcount, MPI_Datatype rdtype, MPID_Comm * comm_ptr, int *err) + void *rbuf, int rcount, MPI_Datatype rdtype, MPID_Comm * comm_ptr, mpir_errflag_t *err) { int is_homogeneous = 1, use_fallback = 0; MPI_Comm comm = comm_ptr->handle; @@ -149,7 +149,7 @@ int hcoll_Allgather(const void *sbuf, int scount, MPI_Datatype sdtype, use_fallback = 1; } else { - rc = hcoll_collectives.coll_allgather(sbuf, scount, stype, rbuf, rcount, rtype, + rc = hcoll_collectives.coll_allgather((void *)sbuf, scount, stype, rbuf, rcount, rtype, comm_ptr->hcoll_priv.hcoll_context); if (HCOLL_SUCCESS != rc) { use_fallback = 1; @@ -282,7 +282,7 @@ int hcoll_Iallgather_req(const void *sendbuf, int sendcount, MPI_Datatype sendty use_fallback = 1; } else { - rc = hcoll_collectives.coll_iallgather(sendbuf, sendcount, stype, recvbuf, recvcount, rtype, + rc = hcoll_collectives.coll_iallgather((void *)sendbuf, sendcount, stype, recvbuf, recvcount, rtype, comm_ptr->hcoll_priv.hcoll_context, rt_handle); if (HCOLL_SUCCESS != rc) { use_fallback = 1; @@ -337,7 +337,7 @@ int hcoll_Iallreduce_req(const void *sendbuf, void *recvbuf, int count, MPI_Data use_fallback = 1; } else { - rc = hcoll_collectives.coll_iallreduce(sendbuf, recvbuf, count, Dtype, Op, + rc = hcoll_collectives.coll_iallreduce((void *)sendbuf, recvbuf, count, Dtype, Op, comm_ptr->hcoll_priv.hcoll_context, rt_handle); if (HCOLL_SUCCESS != rc) { use_fallback = 1; diff --git a/src/mpid/common/hcoll/hcoll_rte.c b/src/mpid/common/hcoll/hcoll_rte.c index 7dc1c3b..b6a3ea7 100644 --- a/src/mpid/common/hcoll/hcoll_rte.c +++ b/src/mpid/common/hcoll/hcoll_rte.c @@ -103,7 +103,7 @@ static inline int count_total_dte_repeat_entries(struct dte_data_representation_ struct dte_generalized_iovec_t *dte_iovec = data->rep.general_rep->data_representation.data; int total_entries_number = 0; for (i = 0; i < dte_iovec->repeat_count; i++) { - total_entries_number += dte_iovec->repeat[i].n_builtin_elements; + total_entries_number += dte_iovec->repeat[i].n_elements; } return total_entries_number; } @@ -161,7 +161,7 @@ static int recv_nb(struct dte_data_representation_t data, repeat = data.rep.general_rep->data_representation.data->repeat; repeat_count = data.rep.general_rep->data_representation.data->repeat_count; for (i = 0; i < repeat_count; i++) { - for (j = 0; j < repeat[i].n_builtin_elements; j++) { + for (j = 0; j < repeat[i].n_elements; j++) { char *repeat_unit = (char *) &repeat[i]; buf = (void *) (repeat_unit + repeat[i].elements[j].base_offset); len = repeat[i].elements[j].packed_size; @@ -228,7 +228,7 @@ static int send_nb(dte_data_representation_t data, repeat = data.rep.general_rep->data_representation.data->repeat; repeat_count = data.rep.general_rep->data_representation.data->repeat_count; for (i = 0; i < repeat_count; i++) { - for (j = 0; j < repeat[i].n_builtin_elements; j++) { + for (j = 0; j < repeat[i].n_elements; j++) { char *repeat_unit = (char *) &repeat[i]; buf = (void *) (repeat_unit + repeat[i].elements[j].base_offset); len = repeat[i].elements[j].packed_size; http://git.mpich.org/mpich.git/commitdiff/b6ce8a4cc37d7449708f4a9f080c0b091… commit b6ce8a4cc37d7449708f4a9f080c0b091011a04d Author: Igor Ivanov <Igor.Ivanov(a)itseez.com> Date: Tue Apr 21 16:38:36 2015 +0300 netmod/mxm: Add barrier before mxm_ep_destroy() call Signed-off-by: Igor Ivanov <Igor.Ivanov(a)itseez.com> diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c index 4d78565..d7704ca 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c @@ -515,6 +515,8 @@ static int _mxm_fini(void) if (_mxm_obj.endpoint) MPIU_Free(_mxm_obj.endpoint); + _mxm_barrier(); + if (_mxm_obj.mxm_ep) mxm_ep_destroy(_mxm_obj.mxm_ep); ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/netmod/mxm/mxm_init.c | 2 ++ src/mpid/common/hcoll/hcoll.h | 8 ++++---- src/mpid/common/hcoll/hcoll_ops.c | 16 ++++++++-------- src/mpid/common/hcoll/hcoll_rte.c | 6 +++--- 4 files changed, 17 insertions(+), 15 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b2-3-gb3a7317
by noreply＠mpich.org 24 Apr '15

24 Apr '15

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 b3a731791da03bf0489e0eec11c6f1e412bb0085 (commit) from 38f365b4950f1579e2c46686edfc2a49f783f6bd (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/b3a731791da03bf0489e0eec11c6f1e41… commit b3a731791da03bf0489e0eec11c6f1e412bb0085 Author: Pavan Balaji <balaji(a)anl.gov> Date: Thu Apr 16 22:11:44 2015 -0500 Reenable a bunch of tests that were disabled so far. Over time, we have disabled a number of tests. Some of these were ones that we had tickets for and some were just simply commented out before we had the xfail mechanism. This patch is semi-temporary to see where we stand with these changes and to try to see how far we can get in fixing them. This patch does not reenable the FT failures or the performance test failures. Signed-off-by: Huiwei Lu <huiweilu(a)mcs.anl.gov> diff --git a/test/mpi/coll/testlist b/test/mpi/coll/testlist index 12787c9..2c8d5fe 100644 --- a/test/mpi/coll/testlist +++ b/test/mpi/coll/testlist @@ -18,7 +18,7 @@ red4 10 alltoall1 8 alltoallv 10 alltoallv0 10 -alltoallw1 10 xfail=ticket2180 +alltoallw1 10 alltoallw2 10 alltoallw_zeros 1 alltoallw_zeros 2 diff --git a/test/mpi/comm/testlist b/test/mpi/comm/testlist index 20f7f24..b3987af 100644 --- a/test/mpi/comm/testlist +++ b/test/mpi/comm/testlist @@ -24,11 +24,11 @@ comm_group_half 8 mpiversion=3.0 comm_group_rand 2 mpiversion=3.0 comm_group_rand 4 mpiversion=3.0 comm_group_rand 8 mpiversion=3.0 -comm_idup 2 mpiversion=3.0 xfail=ticket2183 -comm_idup 4 mpiversion=3.0 xfail=ticket2183 -comm_idup 9 mpiversion=3.0 xfail=ticket2183 -comm_idup_mul 2 mpiversion=3.0 xfail=ticket2183 -comm_idup_overlap 2 mpiversion=3.0 xfail=ticket2238 +comm_idup 2 mpiversion=3.0 +comm_idup 4 mpiversion=3.0 +comm_idup 9 mpiversion=3.0 +comm_idup_mul 2 mpiversion=3.0 +comm_idup_overlap 2 mpiversion=3.0 dup_with_info 2 mpiversion=3.0 dup_with_info 4 mpiversion=3.0 dup_with_info 9 mpiversion=3.0 diff --git a/test/mpi/datatype/testlist.in b/test/mpi/datatype/testlist.in index 7fee6a4..0e53faf 100644 --- a/test/mpi/datatype/testlist.in +++ b/test/mpi/datatype/testlist.in @@ -29,7 +29,7 @@ subarray-pack 1 subarray 2 darray-pack 1 darray-pack 9 -# darray-pack 72 +darray-pack 72 darray-cyclic 12 pairtype-size-extent 1 simple-commit 1 @@ -54,7 +54,7 @@ vecblklen 1 hvecblklen 1 longdouble 1 dataalign 2 -@largetest@large-count 1 mpiversion=3.0 xfail=ticket1767 +@largetest@large-count 1 mpiversion=3.0 cxx-types 1 mpiversion=3.0 @largetest@large_type 1 mpiversion=3.0 @largetest@large_type_sendrec 2 arg=31 mpiversion=3.0 diff --git a/test/mpi/errors/coll/testlist b/test/mpi/errors/coll/testlist index 75fda41..7cb768a 100644 --- a/test/mpi/errors/coll/testlist +++ b/test/mpi/errors/coll/testlist @@ -3,15 +3,4 @@ noalias2 4 mpiversion=2.2 noalias3 4 mpiversion=3.0 rerr 2 reduce_local 1 -# MPICH currently fails the bcastlength test because it needs to do more -# checking on the receive status, so for the 1.0.5 release, we are -# commenting out this test. -# 3/20/2011. Since this was commented out before 1.0.5 and we are now -# at 1.4, it is clear that this should not be commented out again -# -# 2012-04-20 Commenting out again. r9686 disabled the functionality that detects -# this because it was broken when nonblocking collectives are used. Darius has -# a plan for how to fix this, but it will take some effort to implement. It -# would be better if the mpich test suite had an XFAIL type of feature, but -# we don't so commenting is what we are stuck with for now. [goodell@] -#bcastlength 4 +bcastlength 4 diff --git a/test/mpi/errors/rma/testlist b/test/mpi/errors/rma/testlist index 07a59ca..5fd1788 100644 --- a/test/mpi/errors/rma/testlist +++ b/test/mpi/errors/rma/testlist @@ -1,14 +1,12 @@ winerr 2 winerr2 2 -cas_type_check 2 mpiversion=3.0 xfail=ticket1906 +cas_type_check 2 mpiversion=3.0 win_sync_unlock 2 win_sync_free_pt 2 win_sync_free_at 2 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_lock_fence 2 win_sync_nested 2 win_sync_op 2 diff --git a/test/mpi/f77/io/testlist.in b/test/mpi/f77/io/testlist.in index 0c637ad..ae4bec8 100644 --- a/test/mpi/f77/io/testlist.in +++ b/test/mpi/f77/io/testlist.in @@ -19,4 +19,4 @@ setviewcurf 4 c2f2ciof 1 c2fmultio 1 @mpix@i_setviewcurf 4 -@mpix@iwriteatallf 4 xfail=ticket2201 +@mpix@iwriteatallf 4 diff --git a/test/mpi/f77/rma/testlist.in b/test/mpi/f77/rma/testlist.in index 185bce9..78675ac 100644 --- a/test/mpi/f77/rma/testlist.in +++ b/test/mpi/f77/rma/testlist.in @@ -10,4 +10,4 @@ c2f2cwinf 1 baseattrwinf 1 winattrf 1 winattr2f 1 -@mpix@aintf 2 strict=false xfail=ticket1877 +@mpix@aintf 2 strict=false diff --git a/test/mpi/io/testlist.in b/test/mpi/io/testlist.in index fa728d2..2f9da64 100644 --- a/test/mpi/io/testlist.in +++ b/test/mpi/io/testlist.in @@ -8,7 +8,7 @@ async 4 async_any 4 userioerr 1 resized 1 -resized2 1 xfail=ticket2088 +resized2 1 bigtype 1 hindexed_io 1 @mpix@i_bigtype 1 diff --git a/test/mpi/pt2pt/testlist b/test/mpi/pt2pt/testlist index 56f2c3c..514f7b8 100644 --- a/test/mpi/pt2pt/testlist +++ b/test/mpi/pt2pt/testlist @@ -25,11 +25,11 @@ greq1 1 probe-unexp 4 probenull 1 # For testing, scancel will run with 1 process as well -scancel 2 xfail=ticket287 +scancel 2 scancel2 2 -pscancel 2 xfail=ticket287 +pscancel 2 rcancel 2 -cancelrecv 2 xfail=ticket287 +cancelrecv 2 cancelanysrc 2 isendselfprobe 1 inactivereq 1 diff --git a/test/mpi/rma/testlist.in b/test/mpi/rma/testlist.in index 6abee4d..52e94fa 100644 --- a/test/mpi/rma/testlist.in +++ b/test/mpi/rma/testlist.in @@ -119,7 +119,7 @@ linked_list_bench_lock_shr_nocheck 4 mpiversion=3.0 mutex_bench 4 mpiversion=3.0 mutex_bench_shared 4 mpiversion=3.0 mutex_bench_shm 4 mpiversion=3.0 -mutex_bench_shm_ordered 4 mpiversion=3.0 xfail=ticket2127 +mutex_bench_shm_ordered 4 mpiversion=3.0 rma-contig 2 mpiversion=3.0 timeLimit=600 badrma 2 mpiversion=3.0 acc-loc 4 diff --git a/test/mpi/threads/comm/testlist b/test/mpi/threads/comm/testlist index d3b6b5e..1485529 100644 --- a/test/mpi/threads/comm/testlist +++ b/test/mpi/threads/comm/testlist @@ -3,5 +3,5 @@ dup_leak_test 2 comm_dup_deadlock 4 comm_create_threads 4 comm_create_group_threads 4 -comm_idup 4 mpiversion=3.0 xfail=ticket2108 -ctxidup 4 mpiversion=3.0 xfail=ticket2108 +comm_idup 4 mpiversion=3.0 +ctxidup 4 mpiversion=3.0 diff --git a/test/mpi/threads/rma/testlist b/test/mpi/threads/rma/testlist index b9f0a46..c66231f 100644 --- a/test/mpi/threads/rma/testlist +++ b/test/mpi/threads/rma/testlist @@ -1,2 +1,2 @@ multirma 2 mpiversion=3.0 -multiget 2 mpiversion=3.0 xfail=ticket2143 +multiget 2 mpiversion=3.0 diff --git a/test/mpi/threads/spawn/testlist b/test/mpi/threads/spawn/testlist index c2a7c80..c974184 100644 --- a/test/mpi/threads/spawn/testlist +++ b/test/mpi/threads/spawn/testlist @@ -1,3 +1,3 @@ multispawn 1 th_taskmaster 1 timeLimit=600 -#th_taskmaster 2 timeLimit=600 +th_taskmaster 2 timeLimit=600 ----------------------------------------------------------------------- Summary of changes: test/mpi/coll/testlist | 2 +- test/mpi/comm/testlist | 10 +++++----- test/mpi/datatype/testlist.in | 4 ++-- test/mpi/errors/coll/testlist | 13 +------------ test/mpi/errors/rma/testlist | 6 ++---- test/mpi/f77/io/testlist.in | 2 +- test/mpi/f77/rma/testlist.in | 2 +- test/mpi/io/testlist.in | 2 +- test/mpi/pt2pt/testlist | 6 +++--- test/mpi/rma/testlist.in | 2 +- test/mpi/threads/comm/testlist | 4 ++-- test/mpi/threads/rma/testlist | 2 +- test/mpi/threads/spawn/testlist | 2 +- 13 files changed, 22 insertions(+), 35 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b2-2-g38f365b
by noreply＠mpich.org 24 Apr '15

24 Apr '15

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 38f365b4950f1579e2c46686edfc2a49f783f6bd (commit) via bdc46c7e7da2ffa03d58cab4a6c6cd4ac35913e3 (commit) from c895bd9cc8bdb1701ac149d91742727ecd3cbca7 (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/38f365b4950f1579e2c46686edfc2a49f… commit 38f365b4950f1579e2c46686edfc2a49f783f6bd Author: Paul Coffman <pkcoff(a)us.ibm.com> Date: Thu Apr 23 11:11:42 2015 -0500 PAMI_Rput_typed / PAMI_Rget_typed add ref count to MPID_Datatype Because the PAMI_Rput_typed / PAMI_Rget_typed are used with user defined derived types that could be freed between the time of the MPID_Put / Get and when the pami context actually executes the put or get (say in the win_fence) add a ref count to the MPID_Datatype at the time of the MPID_Put / Get and release the ref in the MPIDI_Win_DoneCB callback once the get or put has actually executed and it is ok to free the datatype. Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/mpid/pamid/src/onesided/mpid_1s.c b/src/mpid/pamid/src/onesided/mpid_1s.c index fa91cd9..f46c0ba 100644 --- a/src/mpid/pamid/src/onesided/mpid_1s.c +++ b/src/mpid/pamid/src/onesided/mpid_1s.c @@ -82,6 +82,15 @@ MPIDI_Win_DoneCB(pami_context_t context, MPID_cc_set(req_handle->cc_ptr, 0); } } + if ((MPIDI_Process.typed_onesided == 1) && (!req->target.dt.contig || !req->origin.dt.contig)) { + /* We used the PAMI_Rput/Rget_typed call and added a ref so any MPI_Type_free before the context + * executes the put/get would not free the MPID_Datatype, which would also free the associated PAMI datatype + * which was still needed for communication -- that communication has completed, so now release the ref + * in the callback to allow the MPID_Datatype to be freed. + */ + MPID_Datatype_release(req->origin.dt.pointer); + MPID_Datatype_release(req->target.dt.pointer); + } MPIDI_Progress_signal(); } diff --git a/src/mpid/pamid/src/onesided/mpid_win_get.c b/src/mpid/pamid/src/onesided/mpid_win_get.c index ba318af..338c4ab 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_get.c +++ b/src/mpid/pamid/src/onesided/mpid_win_get.c @@ -396,16 +396,25 @@ MPID_Get(void *origin_addr, #endif - MPIDI_Win_datatype_map(&req->target.dt); - if ((!req->target.dt.contig || !req->origin.dt.contig) && (MPIDI_Process.typed_onesided == 1)) /* If the datatype is non-contiguous and the PAMID typed_onesided optimization * is enabled then we will be using the typed interface and will only make 1 call. */ win->mpid.sync.total = 1; - else + else { + MPIDI_Win_datatype_map(&req->target.dt); win->mpid.sync.total += req->target.dt.num_contig; + } + if ((MPIDI_Process.typed_onesided == 1) && (!req->target.dt.contig || !req->origin.dt.contig)) { + /* We will use the PAMI_Rget_typed call so we need to make sure any MPI_Type_free before the context + * executes the get does not free the MPID_Datatype, which would also free the associated PAMI datatype which + * is still needed for communication -- decrement the ref in the callback to allow the MPID_Datatype + * to be freed once the PAMI communication has completed. + */ + MPID_Datatype_add_ref(req->origin.dt.pointer); + MPID_Datatype_add_ref(req->target.dt.pointer); + } /* The pamid one-sided design requires context post in order to handle the * case where the number of pending rma operation exceeds the * 'PAMID_RMA_PENDING' threshold. When there are too many pending requests the diff --git a/src/mpid/pamid/src/onesided/mpid_win_put.c b/src/mpid/pamid/src/onesided/mpid_win_put.c index a7e7ce5..625676e 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_put.c +++ b/src/mpid/pamid/src/onesided/mpid_win_put.c @@ -397,15 +397,24 @@ MPID_Put(const void *origin_addr, #endif - MPIDI_Win_datatype_map(&req->target.dt); if ((!req->target.dt.contig || !req->origin.dt.contig) && (MPIDI_Process.typed_onesided == 1)) /* If the datatype is non-contiguous and the PAMID typed_onesided optimization * is enabled then we will be using the typed interface and will only make 1 call. */ win->mpid.sync.total = 1; - else + else { + MPIDI_Win_datatype_map(&req->target.dt); win->mpid.sync.total += req->target.dt.num_contig; - + } + if ((MPIDI_Process.typed_onesided == 1) && (!req->target.dt.contig || !req->origin.dt.contig)) { + /* We will use the PAMI_Rput_typed call so we need to make sure any MPI_Type_free before the context + * executes the put does not free the MPID_Datatype, which would also free the associated PAMI datatype which + * is still needed for communication -- decrement the ref in the callback to allow the MPID_Datatype + * to be freed once the PAMI communication has completed. + */ + MPID_Datatype_add_ref(req->origin.dt.pointer); + MPID_Datatype_add_ref(req->target.dt.pointer); + } /* The pamid one-sided design requires context post in order to handle the * case where the number of pending rma operation exceeds the * 'PAMID_RMA_PENDING' threshold. When there are too many pending requests the http://git.mpich.org/mpich.git/commitdiff/bdc46c7e7da2ffa03d58cab4a6c6cd4ac… commit bdc46c7e7da2ffa03d58cab4a6c6cd4ac35913e3 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Wed Apr 22 14:05:51 2015 -0500 tweak hint inspection approach Recent changes to MPI_INFO_GET will report a hard error if the info value passed in is too short. If we want to determine if a key is set or not, and don't care what it is, we'll use MPI_INFO_GET_VALUELEN. Took the opportunity to add a system-hints test to the ROMIO tests Signed-off-by: Paul Coffman <pkcoff(a)us.ibm.com> Signed-off-by: Wei-keng Liao <wkliao(a)ece.northwestern.edu> diff --git a/src/mpi/romio/adio/common/system_hints.c b/src/mpi/romio/adio/common/system_hints.c index fd6cba5..1b049b1 100644 --- a/src/mpi/romio/adio/common/system_hints.c +++ b/src/mpi/romio/adio/common/system_hints.c @@ -38,8 +38,8 @@ void ADIOI_Info_print_keyvals(MPI_Info info) { int i, nkeys, flag; - char key[MPI_MAX_INFO_KEY]; - char value[MPI_MAX_INFO_VAL]; + char key[MPI_MAX_INFO_KEY+1]; + char value[MPI_MAX_INFO_VAL+1]; if (info == MPI_INFO_NULL) return; @@ -48,7 +48,7 @@ void ADIOI_Info_print_keyvals(MPI_Info info) for (i=0; i<nkeys; i++) { MPI_Info_get_nthkey(info, i, key); - ADIOI_Info_get(info, key, MPI_MAX_INFO_VAL-1, value, &flag); + ADIOI_Info_get(info, key, MPI_MAX_INFO_VAL, value, &flag); printf("key = %-25s value = %-10s\n", key, value); } return; @@ -91,7 +91,7 @@ static int file_to_info_all(int fd, MPI_Info info, int rank, MPI_Comm comm) char *pos1=NULL, *pos2=NULL; int flag; ssize_t ret; - char dummy; + int valuelen; /* assumption: config files will be small */ #define HINTFILE_MAX_SIZE 1024*4 @@ -128,7 +128,7 @@ static int file_to_info_all(int fd, MPI_Info info, int rank, MPI_Comm comm) #endif /* don't actually care what the value is. only want to know if key * exists: we leave it alone if so*/ - ADIOI_Info_get(info, key, 1, &dummy, &flag); + ADIOI_Info_get_valuelen(info, key, &valuelen, &flag); if (flag == 1) continue; ADIOI_Info_set(info, key, val); } while ((token = strtok_r(NULL, "\n", &pos1)) != NULL); @@ -159,9 +159,10 @@ void ADIOI_incorporate_system_hints(MPI_Info info, MPI_Info sysinfo, MPI_Info *new_info) { - int i, nkeys_sysinfo, flag=0; /* must initialize flag to 0 */ + int i, nkeys_sysinfo, nkeys_info=0, flag=0; /* must initialize flag to 0 */ + int valuelen; - char val[MPI_MAX_INFO_VAL], key[MPI_MAX_INFO_KEY]; + char val[MPI_MAX_INFO_VAL+1], key[MPI_MAX_INFO_KEY+1]; if (sysinfo == MPI_INFO_NULL) nkeys_sysinfo = 0; @@ -176,15 +177,21 @@ void ADIOI_incorporate_system_hints(MPI_Info info, if (info == MPI_INFO_NULL) MPI_Info_create(new_info); - else + else { + /* tiny optimization: if 'info' has no keys, we can skip the check if a + * hint is set: no keys means nothing has been set, and there's nothing + * we might step on */ + MPI_Info_get_nkeys(info, &nkeys_info); MPI_Info_dup(info, new_info); + } for (i=0; i<nkeys_sysinfo; i++) { MPI_Info_get_nthkey(sysinfo, i, key); /* don't care about the value, just want to know if hint set already*/ - if (info != MPI_INFO_NULL) ADIOI_Info_get(info, key, 1, val, &flag); + if (info != MPI_INFO_NULL && nkeys_info) + ADIOI_Info_get_valuelen(info, key, &valuelen, &flag); if (flag == 1) continue; /* skip any hints already set by user */ - ADIOI_Info_get(sysinfo, key, MPI_MAX_INFO_VAL-1, val, &flag); + ADIOI_Info_get(sysinfo, key, MPI_MAX_INFO_VAL, val, &flag); ADIOI_Info_set(*new_info, key, val); flag = 0; } diff --git a/src/mpi/romio/test/Makefile.am b/src/mpi/romio/test/Makefile.am index caa5be9..cdddf64 100644 --- a/src/mpi/romio/test/Makefile.am +++ b/src/mpi/romio/test/Makefile.am @@ -25,7 +25,7 @@ AM_FFLAGS = $(USER_FFLAGS) CTESTS = simple perf async coll_test coll_perf misc file_info excl large_array \ atomicity noncontig i_noncontig noncontig_coll split_coll shared_fp \ large_file psimple error status noncontig_coll2 aggregation1 aggregation2 \ - async-multiple ordered_fp hindexed external32 types_with_zeros darray_read + async-multiple ordered_fp hindexed external32 types_with_zeros darray_read syshints FTESTS = fcoll_test fperf fmisc pfcoll_test diff --git a/src/mpi/romio/test/runtests.in b/src/mpi/romio/test/runtests.in index 2b8643e..0e5e58f 100644 --- a/src/mpi/romio/test/runtests.in +++ b/src/mpi/romio/test/runtests.in @@ -386,6 +386,11 @@ MakeExe darray_read echo '**** Testing darray_read ****' $mpirun -np 4 ./darray_read $FILENAME CleanExe darray_read +MakeExe syshints +echo '**** Testing syshints ****' +$mpirun -np 1 ./syshints $srcdir/test_hintfile +CleanExe syshints + # if [ @NOF77@ = 0 ] ; then echo "" diff --git a/src/mpi/romio/test/syshints.c b/src/mpi/romio/test/syshints.c new file mode 100755 index 0000000..e9952aa --- /dev/null +++ b/src/mpi/romio/test/syshints.c @@ -0,0 +1,53 @@ +#include <mpi.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> + +static void handle_error(int errcode, const char *str) +{ + char msg[MPI_MAX_ERROR_STRING]; + int resultlen; + MPI_Error_string(errcode, msg, &resultlen); + fprintf(stderr, "%s: %s\n", str, msg); + MPI_Abort(MPI_COMM_WORLD, 1); +} + +#define CHECK(fn) {int errcode; errcode = (fn); if (errcode != MPI_SUCCESS) handle_error(errcode, #fn); } + +static int hint_check(MPI_Info info_used, char * key, char *expected) { + char value[MPI_MAX_INFO_VAL+1]; + int flag; + + CHECK(MPI_Info_get(info_used, key, MPI_MAX_INFO_VAL, value, &flag)); + if (strcmp(expected, value) ){ + fprintf(stderr, "expected value \"%s\" for key \"%s\" got \"%s\"\n", + expected, key, value); + return 1; + } + return 0; +} + +int main(int argc, char ** argv) +{ + setenv("ROMIO_HINTS", argv[1], 1); + MPI_File fh; + MPI_Info info_used, info_mine; + int nr_errors=0; + + MPI_Init(&argc, &argv); + MPI_Info_create(&info_mine); + MPI_Info_set(info_mine, "romio_cb_read", "disable"); + CHECK(MPI_File_open(MPI_COMM_WORLD, argv[1], MPI_MODE_RDONLY, info_mine, &fh)); + CHECK(MPI_File_get_info(fh, &info_used)); + + nr_errors += hint_check(info_used, "ind_rd_buffer_size", "49"); + nr_errors += hint_check(info_used, "romio_no_indep_rw", "true"); + + if (nr_errors == 0) printf(" No Errors\n"); + + CHECK(MPI_Info_free(&info_mine)); + CHECK(MPI_Info_free(&info_used)); + CHECK(MPI_File_close(&fh)); + MPI_Finalize(); + return nr_errors; +} diff --git a/src/mpi/romio/test/test_hintfile b/src/mpi/romio/test/test_hintfile new file mode 100644 index 0000000..edb72b0 --- /dev/null +++ b/src/mpi/romio/test/test_hintfile @@ -0,0 +1,6 @@ +romio_cb_read enable +# multiple info keys are strage but not an error. Note only the first one will +# be processed +ind_rd_buffer_size 49 +ind_rd_buffer_size 60 +romio_no_indep_rw true ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/common/system_hints.c | 27 +++++++++----- src/mpi/romio/test/Makefile.am | 2 +- src/mpi/romio/test/runtests.in | 5 +++ src/mpi/romio/test/syshints.c | 53 ++++++++++++++++++++++++++++ src/mpi/romio/test/test_hintfile | 6 +++ src/mpid/pamid/src/onesided/mpid_1s.c | 9 +++++ src/mpid/pamid/src/onesided/mpid_win_get.c | 15 ++++++-- src/mpid/pamid/src/onesided/mpid_win_put.c | 15 ++++++-- 8 files changed, 115 insertions(+), 17 deletions(-) create mode 100755 src/mpi/romio/test/syshints.c create mode 100644 src/mpi/romio/test/test_hintfile hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository annotated tag, v3.2b2, created. v3.2b2
by noreply＠mpich.org 24 Apr '15

24 Apr '15

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.2b2 has been created at ced902bb0853c2b89c4c4e5e2d92d49ec0064bfb (tag) tagging c895bd9cc8bdb1701ac149d91742727ecd3cbca7 (commit) replaces v3.2b1 tagged by Huiwei Lu on Fri Apr 24 10:18:22 2015 -0500 - Log ----------------------------------------------------------------- tagging 'v3.2b2' Antonio J. Pena (5): Fix unsafe datatype release in several RMA tests Fix win_shared_create* tests Revert "Fix unsafe datatype release in several RMA tests" Moved a request assert to an earlier location Disable MPICH2 tests by default in old nightlies Antonio Pena Monferrer (1): Fix several RMA + async failures Charles J Archer (8): Update polling loop for OFI cq_read EAGAIN return OFI semantics: close AV after closing endpoint Simplification of OFI initialization flow using allocinfo OFI tsearch removed from API in favor of FI_PEEK+trecvmsg OFI Netmod: Add CVAR enhancements for OFI provider selection OFI: Update for removed FI_CANCEL flag OFI: Fix multiple providers failing probe-unexp Add ordering check to mprobe test case Halim Amer (3): Applied the PPoPP patch Revert "Applied the PPoPP patch" Hot fix for commit abb56764 Huiwei Lu (3): Fixes build failure with per-object thread-cs Changed MPICH version to 3.2b2 Modify CHANGES for 3.2b2 release Junchao Zhang (6): Change file extension from .F90 to .f90 in mpi_f08 Delete module files generated in F08 config test Revise F08 binding build system Define MPI_MESSAGE_NULL directly with an integer Enhance F08 buildiface to auto-set compile time constants Enhance F08 buildiface to auto-set int kinds of c_Ain/Count/Offset Ken Raffenetti (16): move error checking inside guards in info_get.c track OFI library (libfabric) in EXTERNAL_LIBS gforker: implement PMI_Abort handler gforker: fixup for [7bb8bd59] testsuite: Makefile cleanup portals4: fix incorrect usage of max_eqs limit portals4: remove unused header file portals4: add missing newline to error message portals4: fixup for [7d1fd292] portals4: increase max_entries limit portals4: improvements to VC close portals4: overhaul MPICH control message handling portals4: revert [722d85a4] and [d459c025] portals4: tuning portals4: fix anysource_matched mxm: fix anysource_matched Min Si (3): Fixed the Fortran common symbol issue on Mac. A workaround for FreeBSD pthread mallc/free bug. Revert "A workaround for FreeBSD pthread mallc/free bug." Norio Yamaguchi (11): Delete unused code in netmod-IB Code cleanup in netmod-IB Fix fail to build with new libc Fix allocation size and release size in netmod-IB Fix memory leak in netmod-IB Fix strict-aliasing rules break in netmod-IB Fix sending size of non-contiguous data in IB Fix invalid access before connection established Fix some build warnings in netmod-IB Fix operation of long messages in netmod-IB Add copyright in netmod-IB Paul Coffman (7): ROMIO One-sided Collective IO Aggregation base code ROMIO Collective IO One-sided aggregation algorithm base code ROMIO Collective IO One-sided aggregation algorithm GPFS enablement ROMIO Collective IO One-sided aggregation algorithm non-contiguous ROMIO Collective IO One-sided aggregation algorithm avoid ROMIO Collective IO One-sided aggregation algorithm support read-modify-write PAMI_Rput_typed / PAMI_Rget_typed utilization for derived types Pavan Balaji (14): Reduce the number of processes in the commcreatep test. Bump up the bcast2/bcast3 timeouts a bit more. Remove unnecessary backslashes in man pages. Get rid of bcast3.c Cosmetic changes to the bcast2 test. Simplify the bcast test. Update .gitignore. Free communicators when not using them. Increase bcast_full time limit. Run putfence1 and getfence1 only with two processes. Replace xfail ticket number. Cleanup threaded progress. Initial version of the intelligent thread yielding. Fix arbitrary poll count before yielding. Rob Latham (7): update ROMIO header checks for modern autoconf use autoconf routines for AIO struct checks check for aio-lite request/presence romio standalone: implement missing check fix "is present" case for MPI_Count check Revert "When decrementing a ref-count to 0, do not bother with atomics." move window creation out of common code Sameh Sharkawi (4): PAMID: CUDA AWARE support in collectives didn't handle local copy PAMID: Dynamically loading libcuda instead of static linking to libmpi.so PAMID: Fix CUDA-aware NULL buffer assert PAMID: MPI_Allreduce/MPI_Reduce coredump w/ DOUBLE_INT datatype Sangmin Seo (1): Fix wrong alias names. Su Huang (1): PAMID: Unexpected mpi_gather message print out when MP_PRINTENV=yes Wesley Bland (4): Remove unused version of MPID_Comm_agree Remove MPID_Comm_failed_bitarray Remove fixed size variable usage Extend timeouts for putfence1/getfence1 Xin Zhao (5): Move 'stream_offset' out of RMA packet struct. Set size of IMMED data in RMA packets to 8 bytes. Delete assert that no longer makes sense. Bug-fix: correct the wrong judgement in RMA function. Modify comments about atomicity in GACC/FOP handlers. ----------------------------------------------------------------------- hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b1-99-gc895bd9
by noreply＠mpich.org 23 Apr '15

23 Apr '15

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 c895bd9cc8bdb1701ac149d91742727ecd3cbca7 (commit) via deb9418cfaee7abad6420223dc57d0a8831a5b87 (commit) from 7fd8b6bb6e40a1d33d38f524fdec47712eae47e7 (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/c895bd9cc8bdb1701ac149d91742727ec… commit c895bd9cc8bdb1701ac149d91742727ecd3cbca7 Author: Huiwei Lu <huiweilu(a)mcs.anl.gov> Date: Thu Apr 23 14:58:12 2015 -0500 Modify CHANGES for 3.2b2 release 3.2b2 is mainly a bug fix release. Most text remains unchanged. Only the web link for changes between 3.1.3 and 3.2b2 has been changed. Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/CHANGES b/CHANGES index a505e0d..81874e8 100644 --- a/CHANGES +++ b/CHANGES @@ -33,7 +33,7 @@ A full list of changes is available at the following link: - http://git.mpich.org/mpich.git/shortlog/v3.1.3..v3.2b1 + http://git.mpich.org/mpich.git/shortlog/v3.1.3..v3.2b2 A full list of bugs that have been fixed is available at the following link: http://git.mpich.org/mpich.git/commitdiff/deb9418cfaee7abad6420223dc57d0a88… commit deb9418cfaee7abad6420223dc57d0a8831a5b87 Author: Huiwei Lu <huiweilu(a)mcs.anl.gov> Date: Thu Apr 23 14:32:04 2015 -0500 Changed MPICH version to 3.2b2 ABI string remains unchanged as 3.2b1. Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/maint/version.m4 b/maint/version.m4 index fb712ab..f283b80 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.2b1])dnl +m4_define([MPICH_VERSION_m4],[3.2b2])dnl m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl # For libtool ABI versioning rules see: ----------------------------------------------------------------------- Summary of changes: CHANGES | 2 +- maint/version.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b1-97-g7fd8b6b
by noreply＠mpich.org 23 Apr '15

23 Apr '15

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 7fd8b6bb6e40a1d33d38f524fdec47712eae47e7 (commit) from abb56764b8dff75e636c9da985c43335742015aa (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/7fd8b6bb6e40a1d33d38f524fdec47712… commit 7fd8b6bb6e40a1d33d38f524fdec47712eae47e7 Author: Halim Amer <aamer(a)anl.gov> Date: Wed Apr 22 21:13:03 2015 -0500 Hot fix for commit abb56764 Initialize the num_queued_threads variable and updated it with the appropriate OPA operations. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/include/thread/mpiu_thread_posix_funcs.h b/src/include/thread/mpiu_thread_posix_funcs.h index f0d3b94..db91208 100644 --- a/src/include/thread/mpiu_thread_posix_funcs.h +++ b/src/include/thread/mpiu_thread_posix_funcs.h @@ -75,6 +75,7 @@ do { \ do { \ int err__; \ \ + OPA_store_int(&(mutex_ptr_)->num_queued_threads,0); \ err__ = pthread_mutex_init(&(mutex_ptr_)->mutex, NULL); \ /* FIXME: convert error to an MPIU_THREAD_ERR value */ \ *(int *)(err_ptr_) = err__; \ @@ -84,6 +85,7 @@ do { \ #define MPIU_Thread_mutex_create(mutex_ptr_, err_ptr_) \ do { \ int err__; \ + OPA_store_int(&(mutex_ptr_)->num_queued_threads,0); \ pthread_mutexattr_t attr__; \ \ /* FIXME this used to be PTHREAD_MUTEX_ERRORCHECK_NP, but we had to change @@ -117,9 +119,9 @@ do { \ do { \ int err__; \ MPIU_DBG_MSG_P(THREAD,VERBOSE,"enter MPIU_Thread_mutex_lock %p", (mutex_ptr_)); \ - OPA_add_int(&(mutex_ptr_)->num_queued_threads, 1); \ + OPA_incr_int(&(mutex_ptr_)->num_queued_threads); \ err__ = pthread_mutex_lock(&(mutex_ptr_)->mutex); \ - OPA_add_int(&(mutex_ptr_)->num_queued_threads, -1); \ + OPA_decr_int(&(mutex_ptr_)->num_queued_threads); \ /* FIXME: convert error to an MPIU_THREAD_ERR value */ \ *(int *)(err_ptr_) = err__; \ MPIU_DBG_MSG_P(THREAD,VERBOSE,"exit MPIU_Thread_mutex_lock %p", (mutex_ptr_)); \ @@ -129,9 +131,9 @@ do { \ do { \ int err__; \ MPIU_DBG_MSG_P(THREAD,VERBOSE,"enter MPIU_Thread_mutex_lock %p", (mutex_ptr_)); \ - OPA_add_int(&(mutex_ptr_)->num_queued_threads, 1); \ + OPA_incr_int(&(mutex_ptr_)->num_queued_threads); \ err__ = pthread_mutex_lock(&(mutex_ptr_)->mutex); \ - OPA_add_int(&(mutex_ptr_)->num_queued_threads, -1); \ + OPA_decr_int(&(mutex_ptr_)->num_queued_threads); \ if (err__) \ { \ MPIU_DBG_MSG_S(THREAD,TERSE," mutex lock error: %s", MPIU_Strerror(err__)); \ @@ -236,9 +238,9 @@ do { \ MPIU_DBG_MSG_FMT(THREAD,TYPICAL,(MPIU_DBG_FDEST,"Enter cond_wait on cond=%p mutex=%p",(cond_ptr_),(mutex_ptr_))) \ do \ { \ - OPA_add_int(&(mutex_ptr_)->num_queued_threads, 1); \ + OPA_incr_int(&(mutex_ptr_)->num_queued_threads); \ err__ = pthread_cond_wait((cond_ptr_), &(mutex_ptr_)->mutex); \ - OPA_add_int(&(mutex_ptr_)->num_queued_threads, -1); \ + OPA_decr_int(&(mutex_ptr_)->num_queued_threads); \ } \ while (err__ == EINTR); \ \ ----------------------------------------------------------------------- Summary of changes: src/include/thread/mpiu_thread_posix_funcs.h | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b1-96-gabb5676
by noreply＠mpich.org 22 Apr '15

22 Apr '15

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 abb56764b8dff75e636c9da985c43335742015aa (commit) via b39314a5b24242907c5819a0e43dc4b19728fada (commit) via f385680e392d999ad5e2f7ddcc625a0f6556f014 (commit) from 5fb750b97cb0a95d13a1b31a1952100c58c7dfd6 (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/abb56764b8dff75e636c9da985c433357… commit abb56764b8dff75e636c9da985c43335742015aa Author: Pavan Balaji <balaji(a)anl.gov> Date: Sat Apr 18 04:46:33 2015 -0500 Fix arbitrary poll count before yielding. Instead of polling for an arbitrarily decided number of times in the progress engine before yielding, we now moved the yielding intelligence to the threading layer. The threading layer can keep track of other threads that are waiting to enter the critical section and only yield if another thread is waiting. In this way, if no thread is waiting to get the lock, the main thread never yields. At the same time, if another thread is waiting to get a lock, there is no delay in yielding. This change, however, introduces possible deadlocks. If a thread enters MPIDI_CH3I_progress with is_blocking unset, it may set the MPIDI_CH3I_progress_blocked flag and then will yield the critical section. Another thread may enter with is_blocking set, find the flag MPIDI_CH3I_progress_blocked set, and block in the conditional variable. The first thread will wake up and leave the progress engine without emitting any signal to wake up the second thread which may sleep forever. A simple fix is to yield the critical section only if the current thread entered the progress engine with is_blocking set. Signed-off-by: Halim Amer <aamer(a)anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/include/mpid_nem_inline.h b/src/mpid/ch3/channels/nemesis/include/mpid_nem_inline.h index 9601eac..e537dc2 100644 --- a/src/mpid/ch3/channels/nemesis/include/mpid_nem_inline.h +++ b/src/mpid/ch3/channels/nemesis/include/mpid_nem_inline.h @@ -7,8 +7,6 @@ #ifndef _MPID_NEM_INLINE_H #define _MPID_NEM_INLINE_H -#define MPID_NEM_THREAD_POLLS_BEFORE_YIELD 10 - #include "my_papi_defs.h" #include "mpiiov.h" #include "mpidi_nem_statistics.h" diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_progress.c b/src/mpid/ch3/channels/nemesis/src/ch3_progress.c index 422c533..351bf81 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_progress.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_progress.c @@ -289,9 +289,6 @@ int MPIDI_CH3I_Shm_send_progress(void) int MPIDI_CH3I_Progress (MPID_Progress_state *progress_state, int is_blocking) { int mpi_errno = MPI_SUCCESS; -#ifdef MPICH_IS_THREADED - int pollcount = 0; -#endif int made_progress = FALSE; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_PROGRESS); @@ -503,28 +500,23 @@ int MPIDI_CH3I_Progress (MPID_Progress_state *progress_state, int is_blocking) #ifdef MPICH_IS_THREADED MPIU_THREAD_CHECK_BEGIN; { - /* In the case of threads, we poll for lesser number of - * iterations than the case with only processes, as - * threads contend for CPU and the lock, while processes - * only contend for the CPU. */ - if (pollcount >= MPID_NEM_THREAD_POLLS_BEFORE_YIELD) - { - pollcount = 0; + if (is_blocking) { MPIDI_CH3I_progress_blocked = TRUE; MPIU_THREAD_CS_YIELD(ALLFUNC,); - /* MPIDCOMM yield is needed because at least the send functions - * acquire MPIDCOMM to put things into the send queues. Failure - * to yield could result in a deadlock. This thread needs the - * send from another thread to be posted, but the other thread - * can't post it while this CS is held. */ + /* MPIDCOMM yield is needed because at least the send + * functions acquire MPIDCOMM to put things into the send + * queues. Failure to yield could result in a deadlock. + * This thread needs the send from another thread to be + * posted, but the other thread can't post it while this + * CS is held. */ /* assertion: we currently do not hold any other critical - * sections besides the MPIDCOMM CS at this point. Violating - * this will probably lead to lock-ordering deadlocks. */ + * sections besides the MPIDCOMM CS at this point. + * Violating this will probably lead to lock-ordering + * deadlocks. */ MPIU_THREAD_CS_YIELD(MPIDCOMM,); MPIDI_CH3I_progress_blocked = FALSE; MPIDI_CH3I_progress_wakeup_signalled = FALSE; } - ++pollcount; } MPIU_THREAD_CHECK_END; #else http://git.mpich.org/mpich.git/commitdiff/b39314a5b24242907c5819a0e43dc4b19… commit b39314a5b24242907c5819a0e43dc4b19728fada Author: Pavan Balaji <balaji(a)anl.gov> Date: Sat Apr 18 04:37:09 2015 -0500 Initial version of the intelligent thread yielding. Instead of a simple thread yield, this patch adds some additional information to the yield about how many threads are waiting for it. When a thread tries to acquire a lock, they increment a counter. When a thread needs to yield, it can check this counter to see how many threads are waiting to get the lock. If there are no threads waiting, the yield can be skipped. This patch contains various changes to make that happen: 1. We modify the mutex object to maintain additional information on the number of queued threads. 2. We improve the yield call to include the unlock and lock as well, since it needs to decide whether to do the unlock/lock based on how many other threads are queued up. Signed-off-by: Halim Amer <aamer(a)anl.gov> diff --git a/src/include/mpiimplthreadpost.h b/src/include/mpiimplthreadpost.h index be4578f..fe1cf99 100644 --- a/src/include/mpiimplthreadpost.h +++ b/src/include/mpiimplthreadpost.h @@ -69,9 +69,7 @@ MPIU_Thread_CS_yield_lockname_impl_(enum MPIU_Nest_mutexes kind, MPIU_THREADPRIV_DECL; MPIU_THREADPRIV_GET; MPIU_THREAD_CHECKDEPTH(kind, lockname, 1); - MPID_Thread_mutex_unlock(mutex); - MPID_Thread_yield(); - MPID_Thread_mutex_lock(mutex); + MPID_Thread_yield(mutex); } /* ------------------------------------------------------------------- */ @@ -189,9 +187,7 @@ MPIU_Thread_CS_yield_lockname_recursive_impl_(enum MPIU_Nest_mutexes kind, MPIU_Assert(depth > 0 && depth < 10); /* we must hold the mutex */ /* no need to update depth, this is a thread-local value */ - MPID_Thread_mutex_unlock(mutex); - MPID_Thread_yield(); - MPID_Thread_mutex_lock(mutex); + MPID_Thread_yield(mutex); } /* undef for safety, this is a commonly-included header */ diff --git a/src/include/thread/mpiu_thread_posix_funcs.h b/src/include/thread/mpiu_thread_posix_funcs.h index 10af9fc..f0d3b94 100644 --- a/src/include/thread/mpiu_thread_posix_funcs.h +++ b/src/include/thread/mpiu_thread_posix_funcs.h @@ -46,12 +46,17 @@ do { \ *(same_) = pthread_equal(*(id1_), *(id2_)) ? TRUE : FALSE; \ } while (0) -#define MPIU_Thread_yield() \ -do { \ - MPIU_DBG_MSG(THREAD,VERBOSE,"enter MPIU_Thread_yield"); \ - MPIU_PW_Sched_yield(); \ - MPIU_DBG_MSG(THREAD,VERBOSE,"exit MPIU_Thread_yield"); \ -} while (0) +#define MPIU_Thread_yield(mutex_ptr_) \ + do { \ + int err; \ + MPIU_DBG_MSG(THREAD,VERBOSE,"enter MPIU_Thread_yield"); \ + if (OPA_load_int(&(mutex_ptr_)->num_queued_threads) == 0) \ + break; \ + MPIU_Thread_mutex_unlock(mutex_ptr_, &err); \ + MPIU_PW_Sched_yield(); \ + MPIU_Thread_mutex_lock(mutex_ptr_, &err); \ + MPIU_DBG_MSG(THREAD,VERBOSE,"exit MPIU_Thread_yield"); \ + } while (0) /* @@ -70,7 +75,7 @@ do { \ do { \ int err__; \ \ - err__ = pthread_mutex_init((mutex_ptr_), NULL); \ + err__ = pthread_mutex_init(&(mutex_ptr_)->mutex, NULL); \ /* FIXME: convert error to an MPIU_THREAD_ERR value */ \ *(int *)(err_ptr_) = err__; \ MPIU_DBG_MSG_P(THREAD,TYPICAL,"Created MPIU_Thread_mutex %p", (mutex_ptr_)); \ @@ -87,7 +92,7 @@ do { \ error checked versions with the recursive mutexes. */ \ pthread_mutexattr_init(&attr__); \ pthread_mutexattr_settype(&attr__, PTHREAD_MUTEX_ERRORCHECK_VALUE); \ - err__ = pthread_mutex_init((mutex_ptr_), &attr__); \ + err__ = pthread_mutex_init(&(mutex_ptr_)->mutex, &attr__); \ if (err__) \ MPIU_Internal_sys_error_printf("pthread_mutex_init", err__, \ " %s:%d\n", __FILE__, __LINE__);\ @@ -102,7 +107,7 @@ do { \ int err__; \ \ MPIU_DBG_MSG_P(THREAD,TYPICAL,"About to destroy MPIU_Thread_mutex %p", (mutex_ptr_)); \ - err__ = pthread_mutex_destroy(mutex_ptr_); \ + err__ = pthread_mutex_destroy(&(mutex_ptr_)->mutex); \ /* FIXME: convert error to an MPIU_THREAD_ERR value */ \ *(int *)(err_ptr_) = err__; \ } while (0) @@ -112,7 +117,9 @@ do { \ do { \ int err__; \ MPIU_DBG_MSG_P(THREAD,VERBOSE,"enter MPIU_Thread_mutex_lock %p", (mutex_ptr_)); \ - err__ = pthread_mutex_lock(mutex_ptr_); \ + OPA_add_int(&(mutex_ptr_)->num_queued_threads, 1); \ + err__ = pthread_mutex_lock(&(mutex_ptr_)->mutex); \ + OPA_add_int(&(mutex_ptr_)->num_queued_threads, -1); \ /* FIXME: convert error to an MPIU_THREAD_ERR value */ \ *(int *)(err_ptr_) = err__; \ MPIU_DBG_MSG_P(THREAD,VERBOSE,"exit MPIU_Thread_mutex_lock %p", (mutex_ptr_)); \ @@ -122,7 +129,9 @@ do { \ do { \ int err__; \ MPIU_DBG_MSG_P(THREAD,VERBOSE,"enter MPIU_Thread_mutex_lock %p", (mutex_ptr_)); \ - err__ = pthread_mutex_lock(mutex_ptr_); \ + OPA_add_int(&(mutex_ptr_)->num_queued_threads, 1); \ + err__ = pthread_mutex_lock(&(mutex_ptr_)->mutex); \ + OPA_add_int(&(mutex_ptr_)->num_queued_threads, -1); \ if (err__) \ { \ MPIU_DBG_MSG_S(THREAD,TERSE," mutex lock error: %s", MPIU_Strerror(err__)); \ @@ -141,7 +150,7 @@ do { \ int err__; \ \ MPIU_DBG_MSG_P(THREAD,TYPICAL,"MPIU_Thread_mutex_unlock %p", (mutex_ptr_)); \ - err__ = pthread_mutex_unlock(mutex_ptr_); \ + err__ = pthread_mutex_unlock(&(mutex_ptr_)->mutex); \ /* FIXME: convert error to an MPIU_THREAD_ERR value */ \ *(int *)(err_ptr_) = err__; \ } while (0) @@ -151,7 +160,7 @@ do { \ int err__; \ \ MPIU_DBG_MSG_P(THREAD,VERBOSE,"MPIU_Thread_mutex_unlock %p", (mutex_ptr_)); \ - err__ = pthread_mutex_unlock(mutex_ptr_); \ + err__ = pthread_mutex_unlock(&(mutex_ptr_)->mutex); \ if (err__) \ { \ MPIU_DBG_MSG_S(THREAD,TERSE," mutex unlock error: %s", MPIU_Strerror(err__)); \ @@ -168,7 +177,7 @@ do { \ do { \ int err__; \ \ - err__ = pthread_mutex_trylock(mutex_ptr_); \ + err__ = pthread_mutex_trylock(&(mutex_ptr_)->mutex); \ *(flag_ptr_) = (err__ == 0) ? TRUE : FALSE; \ MPIU_DBG_MSG_FMT(THREAD,VERBOSE,(MPIU_DBG_FDEST, "MPIU_Thread_mutex_trylock mutex=%p result=%s", (mutex_ptr_), (*(flag_ptr_) ? "success" : "failure"))); \ *(int *)(err_ptr_) = (err__ == EBUSY) ? MPIU_THREAD_SUCCESS : err__; \ @@ -179,7 +188,7 @@ do { \ do { \ int err__; \ \ - err__ = pthread_mutex_trylock(mutex_ptr_); \ + err__ = pthread_mutex_trylock(&(mutex_ptr_)->mutex); \ if (err__ && err__ != EBUSY) \ { \ MPIU_DBG_MSG_S(THREAD,TERSE," mutex trylock error: %s", MPIU_Strerror(err__)); \ @@ -227,7 +236,9 @@ do { \ MPIU_DBG_MSG_FMT(THREAD,TYPICAL,(MPIU_DBG_FDEST,"Enter cond_wait on cond=%p mutex=%p",(cond_ptr_),(mutex_ptr_))) \ do \ { \ - err__ = pthread_cond_wait((cond_ptr_), (mutex_ptr_)); \ + OPA_add_int(&(mutex_ptr_)->num_queued_threads, 1); \ + err__ = pthread_cond_wait((cond_ptr_), &(mutex_ptr_)->mutex); \ + OPA_add_int(&(mutex_ptr_)->num_queued_threads, -1); \ } \ while (err__ == EINTR); \ \ diff --git a/src/include/thread/mpiu_thread_posix_types.h b/src/include/thread/mpiu_thread_posix_types.h index b38f7a1..b9e07b4 100644 --- a/src/include/thread/mpiu_thread_posix_types.h +++ b/src/include/thread/mpiu_thread_posix_types.h @@ -7,8 +7,12 @@ #include <errno.h> #include <pthread.h> +#include "opa_primitives.h" -typedef pthread_mutex_t MPIU_Thread_mutex_t; +typedef struct { + pthread_mutex_t mutex; + OPA_int_t num_queued_threads; +} MPIU_Thread_mutex_t; typedef pthread_cond_t MPIU_Thread_cond_t; typedef pthread_t MPIU_Thread_id_t; typedef pthread_key_t MPIU_Thread_tls_t; diff --git a/src/include/thread/mpiu_thread_solaris_funcs.h b/src/include/thread/mpiu_thread_solaris_funcs.h index 3880b99..79dece6 100644 --- a/src/include/thread/mpiu_thread_solaris_funcs.h +++ b/src/include/thread/mpiu_thread_solaris_funcs.h @@ -26,9 +26,12 @@ do { \ *(same_ptr_) = (*(id1_ptr_) == *(id2_ptr_)) ? TRUE : FALSE; \ } while (0) -#define MPIU_Thread_yield() \ +#define MPIU_Thread_yield(mutex_ptr_) \ do { \ - thr_yield(); \ + int err; \ + MPIU_Thread_mutex_unlock(mutex_ptr_, &err); \ + thr_yield(); \ + MPIU_Thread_mutex_lock(mutex_ptr_, &err); \ } while (0) diff --git a/src/mpid/common/thread/mpid_thread.h b/src/mpid/common/thread/mpid_thread.h index 8386cf2..969134f 100644 --- a/src/mpid/common/thread/mpid_thread.h +++ b/src/mpid/common/thread/mpid_thread.h @@ -278,9 +278,9 @@ do { \ MPIU_Thread_same((id1_), (id2_), (same_)); \ } while (0) -#define MPID_Thread_yield() \ +#define MPID_Thread_yield(mutex_ptr) \ do { \ - MPIU_Thread_yield(); \ + MPIU_Thread_yield(mutex_ptr); \ } while (0) diff --git a/src/util/thread/mpiu_thread.c b/src/util/thread/mpiu_thread.c index fa881f0..2c2599f 100644 --- a/src/util/thread/mpiu_thread.c +++ b/src/util/thread/mpiu_thread.c @@ -260,9 +260,13 @@ void MPIU_Thread_same(MPIU_Thread_id_t * id1, MPIU_Thread_id_t * id2, int * same *same = (*id1 == *id2) ? TRUE : FALSE; } -void MPIU_Thread_yield() +void MPIU_Thread_yield(MPIU_Thread_mutex_t * mutex) { + int err; + + MPIU_Thread_mutex_unlock(mutex, &err); Sleep(0); + MPIU_Thread_mutex_lock(mutex, &err); } /* http://git.mpich.org/mpich.git/commitdiff/f385680e392d999ad5e2f7ddcc625a0f6… commit f385680e392d999ad5e2f7ddcc625a0f6556f014 Author: Pavan Balaji <balaji(a)anl.gov> Date: Fri Apr 17 18:31:29 2015 -0500 Cleanup threaded progress. The nemesis progress engine was written in a way so that if one thread is inside a progress engine, other threads cannot enter the receive progress. They can enter the send progress in some cases. There doesn't seem to be a good reason for this behavior. This patch combines this so threads would simply return for nonblocking operations and wait for a signal before entering the progress engine for blocking operations. Signed-off-by: Halim Amer <aamer(a)anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_progress.c b/src/mpid/ch3/channels/nemesis/src/ch3_progress.c index f022651..422c533 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_progress.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_progress.c @@ -325,6 +325,40 @@ int MPIDI_CH3I_Progress (MPID_Progress_state *progress_state, int is_blocking) } #endif +/* For threaded mode, if another thread is in the progress engine, we + * don't enter the progress engine */ +#ifdef MPICH_IS_THREADED + MPIU_THREAD_CHECK_BEGIN; + { + while (MPIDI_CH3I_progress_blocked == TRUE) + { + /* if this is a nonblocking call, and some other thread is + * going to poke progress, our job is done and we can + * return */ + if (!is_blocking) + goto fn_exit; + + /* if it's a blocking call, and some other thread is going + * to poke progress, our job might also be done. But + * there's no point returning from this call to see if the + * work is done and coming back in again if it's not done. + * We might as well wait for the other thread to be done + * before doing that. */ + if (progress_state->ch.completion_count == OPA_load_int(&MPIDI_CH3I_progress_completion_count)) + MPIDI_CH3I_Progress_delay(progress_state->ch.completion_count); + else { + /* if the completion count of our progress state is + * different from the current completion count, some + * progress happened. We reset the value for the next + * iteration and return from the progress engine. */ + progress_state->ch.completion_count = OPA_load_int(&MPIDI_CH3I_progress_completion_count); + goto fn_exit; + } + } + } + MPIU_THREAD_CHECK_END; +#endif + do { MPID_Request *rreq; @@ -334,19 +368,6 @@ int MPIDI_CH3I_Progress (MPID_Progress_state *progress_state, int is_blocking) do /* receive progress */ { - -#ifdef MPICH_IS_THREADED - MPIU_THREAD_CHECK_BEGIN; - { - if (MPIDI_CH3I_progress_blocked == TRUE) - { - /* another thread is already blocking in the progress engine.*/ - break; /* break out of receive block */ - } - } - MPIU_THREAD_CHECK_END; -#endif - /* make progress receiving */ /* check queue */ if (MPID_nem_safe_to_block_recv() && is_blocking @@ -434,21 +455,6 @@ int MPIDI_CH3I_Progress (MPID_Progress_state *progress_state, int is_blocking) if (MPIDI_CH3I_shm_active_send || MPIDI_CH3I_Sendq_head(MPIDI_CH3I_shm_sendq)) { mpi_errno = MPIDI_CH3I_Shm_send_progress(); if (mpi_errno) MPIU_ERR_POP(mpi_errno); - } else { - /* there are no pending sends */ -#ifdef MPICH_IS_THREADED - MPIU_THREAD_CHECK_BEGIN; - { - if (MPIDI_CH3I_progress_blocked == TRUE && is_blocking && !MPID_nem_local_lmt_pending) - { - /* There's nothing to send and there's another thread already blocking in the progress engine.*/ - MPIDI_CH3I_Progress_delay(progress_state->ch.completion_count); - /* the progress_state count will be updated below at the - * bottom of the outermost loop (see CC-1) */ - } - } - MPIU_THREAD_CHECK_END; -#endif } /* make progress on LMTs */ @@ -563,13 +569,7 @@ static int MPIDI_CH3I_Progress_delay(unsigned int completion_count) /* FIXME should be appropriately abstracted somehow */ # if defined(MPICH_IS_THREADED) && (MPIU_THREAD_GRANULARITY == MPIU_THREAD_GRANULARITY_GLOBAL) { - while (1) - { - if (completion_count != OPA_load_int(&MPIDI_CH3I_progress_completion_count) || - MPIDI_CH3I_progress_blocked != TRUE) - break; - MPID_Thread_cond_wait(&MPIDI_CH3I_progress_completion_cond, &MPIR_ThreadInfo.global_mutex/*MPIDCOMM*/); - } + MPID_Thread_cond_wait(&MPIDI_CH3I_progress_completion_cond, &MPIR_ThreadInfo.global_mutex/*MPIDCOMM*/); } # endif ----------------------------------------------------------------------- Summary of changes: src/include/mpiimplthreadpost.h | 8 +- src/include/thread/mpiu_thread_posix_funcs.h | 43 ++++++--- src/include/thread/mpiu_thread_posix_types.h | 6 +- src/include/thread/mpiu_thread_solaris_funcs.h | 7 +- .../ch3/channels/nemesis/include/mpid_nem_inline.h | 2 - src/mpid/ch3/channels/nemesis/src/ch3_progress.c | 98 +++++++++----------- src/mpid/common/thread/mpid_thread.h | 4 +- src/util/thread/mpiu_thread.c | 6 +- 8 files changed, 91 insertions(+), 83 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b1-93-g5fb750b
by noreply＠mpich.org 22 Apr '15

22 Apr '15

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 5fb750b97cb0a95d13a1b31a1952100c58c7dfd6 (commit) from e60c9375492793c7ab4d784fd03facca35555d43 (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/5fb750b97cb0a95d13a1b31a1952100c5… commit 5fb750b97cb0a95d13a1b31a1952100c58c7dfd6 Author: Sangmin Seo <sseo(a)anl.gov> Date: Wed Apr 22 09:29:04 2015 -0500 Fix wrong alias names. __attribute__((weak,alias())) should have function names starting with PMPI, but some MPIX functions, such as MPIX_Grequest_class_create, MPIX_Grequest_class_allocate, MPIX_Grequest_start, MPIX_Mutex_create, MPIX_Mutex_free, MPIX_Mutex_lock, and MPIX_Mutex_unlock, had the same alias names as those of original functions. This patch fixes wrong alias names in __attribute__((weak,alias())) and also fixes some wrong alias names in #pragma. Signed-off-by: Huiwei Lu <huiweilu(a)mcs.anl.gov> diff --git a/src/mpi/pt2pt/greq_start.c b/src/mpi/pt2pt/greq_start.c index 5ec7075..8137024 100644 --- a/src/mpi/pt2pt/greq_start.c +++ b/src/mpi/pt2pt/greq_start.c @@ -236,7 +236,7 @@ int MPIX_Grequest_class_create(MPI_Grequest_query_function *query_fn, MPI_Grequest_cancel_function *cancel_fn, MPIX_Grequest_poll_function *poll_fn, MPIX_Grequest_wait_function *wait_fn, - MPIX_Grequest_class *greq_class) __attribute__((weak,alias("MPIX_Grequest_class_create"))); + MPIX_Grequest_class *greq_class) __attribute__((weak,alias("PMPIX_Grequest_class_create"))); #endif /* -- End Profiling Symbol Block */ @@ -324,11 +324,11 @@ fn_fail: #if defined(HAVE_PRAGMA_WEAK) #pragma weak MPIX_Grequest_class_allocate = PMPIX_Grequest_class_allocate #elif defined(HAVE_PRAGMA_HP_SEC_DEF) -#pragma _HP_SECONDARY_DEF PMPI_Grequest_class_allocate MPIX_Grequest_class_allocate +#pragma _HP_SECONDARY_DEF PMPIX_Grequest_class_allocate MPIX_Grequest_class_allocate #elif defined(HAVE_PRAGMA_CRI_DUP) #pragma _CRI duplicate MPIX_Grequest_class_allocate as PMPIX_Grequest_class_allocate #elif defined(HAVE_WEAK_ATTRIBUTE) -int MPIX_Grequest_class_allocate(MPIX_Grequest_class greq_class, void *extra_state, MPI_Request *request) __attribute__((weak,alias("MPIX_Grequest_class_allocate"))); +int MPIX_Grequest_class_allocate(MPIX_Grequest_class greq_class, void *extra_state, MPI_Request *request) __attribute__((weak,alias("PMPIX_Grequest_class_allocate"))); #endif /* -- End Profiling Symbol Block */ @@ -369,7 +369,7 @@ int MPIX_Grequest_class_allocate(MPIX_Grequest_class greq_class, #if defined(HAVE_PRAGMA_WEAK) #pragma weak MPIX_Grequest_start = PMPIX_Grequest_start #elif defined(HAVE_PRAGMA_HP_SEC_DEF) -#pragma _HP_SECONDARY_DEF PMPI_Grequest_start MPIX_Grequest_start +#pragma _HP_SECONDARY_DEF PMPIX_Grequest_start MPIX_Grequest_start #elif defined(HAVE_PRAGMA_CRI_DUP) #pragma _CRI duplicate MPIX_Grequest_start as PMPIX_Grequest_start #elif defined(HAVE_WEAK_ATTRIBUTE) @@ -379,7 +379,7 @@ int MPIX_Grequest_start( MPI_Grequest_query_function *query_fn, MPIX_Grequest_poll_function *poll_fn, MPIX_Grequest_wait_function *wait_fn, void *extra_state, - MPI_Request *request ) __attribute__((weak,alias("MPIX_Grequest_start"))); + MPI_Request *request ) __attribute__((weak,alias("PMPIX_Grequest_start"))); #endif /* -- End Profiling Symbol Block */ diff --git a/src/mutex/mutex_create.c b/src/mutex/mutex_create.c index eec39c1..91c0766 100644 --- a/src/mutex/mutex_create.c +++ b/src/mutex/mutex_create.c @@ -23,7 +23,7 @@ #elif defined(HAVE_PRAGMA_CRI_DUP) #pragma _CRI duplicate MPIX_Mutex_create as PMPIX_Mutex_create #elif defined(HAVE_WEAK_ATTRIBUTE) -int MPIX_Mutex_create(int my_count, MPI_Comm comm, MPIX_Mutex * hdl_out) __attribute__((weak,alias("MPIX_Mutex_create"))); +int MPIX_Mutex_create(int my_count, MPI_Comm comm, MPIX_Mutex * hdl_out) __attribute__((weak,alias("PMPIX_Mutex_create"))); #endif /* -- End Profiling Symbol Block */ diff --git a/src/mutex/mutex_free.c b/src/mutex/mutex_free.c index 79715ca..b3c4877 100644 --- a/src/mutex/mutex_free.c +++ b/src/mutex/mutex_free.c @@ -20,7 +20,7 @@ #elif defined(HAVE_PRAGMA_CRI_DUP) #pragma _CRI duplicate MPIX_Mutex_free as PMPIX_Mutex_free #elif defined(HAVE_WEAK_ATTRIBUTE) -int MPIX_Mutex_free(MPIX_Mutex * hdl_ptr) __attribute__((weak,alias("MPIX_Mutex_free"))); +int MPIX_Mutex_free(MPIX_Mutex * hdl_ptr) __attribute__((weak,alias("PMPIX_Mutex_free"))); #endif /* -- End Profiling Symbol Block */ diff --git a/src/mutex/mutex_lock.c b/src/mutex/mutex_lock.c index 257e80f..4c4846d 100644 --- a/src/mutex/mutex_lock.c +++ b/src/mutex/mutex_lock.c @@ -21,7 +21,7 @@ #elif defined(HAVE_PRAGMA_CRI_DUP) #pragma _CRI duplicate MPIX_Mutex_lock as PMPIX_Mutex_lock #elif defined(HAVE_WEAK_ATTRIBUTE) -int MPIX_Mutex_lock(MPIX_Mutex hdl, int mutex, int proc) __attribute__((weak,alias("MPIX_Mutex_lock"))); +int MPIX_Mutex_lock(MPIX_Mutex hdl, int mutex, int proc) __attribute__((weak,alias("PMPIX_Mutex_lock"))); #endif /* -- End Profiling Symbol Block */ diff --git a/src/mutex/mutex_unlock.c b/src/mutex/mutex_unlock.c index 722f8b9..7930f17 100644 --- a/src/mutex/mutex_unlock.c +++ b/src/mutex/mutex_unlock.c @@ -21,7 +21,7 @@ #elif defined(HAVE_PRAGMA_CRI_DUP) #pragma _CRI duplicate MPIX_Mutex_unlock as PMPIX_Mutex_unlock #elif defined(HAVE_WEAK_ATTRIBUTE) -int MPIX_Mutex_unlock(MPIX_Mutex hdl, int mutex, int proc) __attribute__((weak,alias("MPIX_Mutex_unlock"))); +int MPIX_Mutex_unlock(MPIX_Mutex hdl, int mutex, int proc) __attribute__((weak,alias("PMPIX_Mutex_unlock"))); #endif /* -- End Profiling Symbol Block */ ----------------------------------------------------------------------- Summary of changes: src/mpi/pt2pt/greq_start.c | 10 +++++----- src/mutex/mutex_create.c | 2 +- src/mutex/mutex_free.c | 2 +- src/mutex/mutex_lock.c | 2 +- src/mutex/mutex_unlock.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b1-92-ge60c937
by noreply＠mpich.org 22 Apr '15

22 Apr '15

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 e60c9375492793c7ab4d784fd03facca35555d43 (commit) from 1be5fc4978fd14b94bbd60602edcdb56debfb1ec (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/e60c9375492793c7ab4d784fd03facca3… commit e60c9375492793c7ab4d784fd03facca35555d43 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Wed Apr 22 10:34:27 2015 -0500 Disable MPICH2 tests by default in old nightlies Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/maint/testbuild b/maint/testbuild index ad46d0b..ea78c16 100755 --- a/maint/testbuild +++ b/maint/testbuild @@ -33,7 +33,7 @@ fi date=`date "+%Y-%m-%d"` # default outfile outfile=testbuild.xml -tests="mpich:mpicxx:intel:testmpio:mpich2" +tests="mpich:mpicxx:intel:testmpio" # Optional: mpich2 # # Option options to checkbuild other_opts="" ----------------------------------------------------------------------- Summary of changes: maint/testbuild | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b1-91-g1be5fc4
by noreply＠mpich.org 22 Apr '15

22 Apr '15

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 1be5fc4978fd14b94bbd60602edcdb56debfb1ec (commit) from 51512b7d5428d74c5d8ddae691b993596d570e7f (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/1be5fc4978fd14b94bbd60602edcdb56d… commit 1be5fc4978fd14b94bbd60602edcdb56debfb1ec Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Wed Apr 22 10:43:34 2015 -0500 mxm: fix anysource_matched The return value of anysource_matched should be the actual result of the cancel operation. If the result is uncancelable, i.e. already matched, then CH3 will let the netmod message win and move on to the other requests in the queue. When the completion for the unsuccessfully canceled message comes in, we process it like normal. Reviewed-by: Igor Ivanov <Igor.Ivanov(a)itseez.com> Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c index 752a1f9..e044f6c 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c @@ -133,7 +133,7 @@ int MPID_nem_mxm_anysource_matched(MPID_Request * req) req_area = REQ_BASE(req); ret = mxm_req_cancel_recv(&req_area->mxm_req->item.recv); mxm_req_wait(&req_area->mxm_req->item.base); - if ((MXM_OK != ret) && (MXM_ERR_NO_PROGRESS != ret)) { + if (req_area->mxm_req->item.base.error != MXM_ERR_CANCELED) { matched = TRUE; } @@ -225,7 +225,7 @@ int MPID_nem_mxm_recv(MPIDI_VC_t * vc, MPID_Request * rreq) static int _mxm_handle_rreq(MPID_Request * req) { - int complete = FALSE; + int complete = FALSE, found = FALSE; int dt_contig; MPI_Aint dt_true_lb ATTRIBUTE((unused)); MPIDI_msg_sz_t userbuf_sz; @@ -236,10 +236,12 @@ static int _mxm_handle_rreq(MPID_Request * req) void *tmp_buf = NULL; MPIU_THREAD_CS_ENTER(MSGQUEUE, req); - complete = MPIDI_CH3U_Recvq_DP(req); + found = MPIDI_CH3U_Recvq_DP(req); MPIU_THREAD_CS_EXIT(MSGQUEUE, req); - if (!complete) { - return TRUE; + /* an MPI_ANY_SOURCE request may have been previously removed from the + CH3 queue by an FDP (find and dequeue posted) operation */ + if (req->dev.match.parts.rank != MPI_ANY_SOURCE) { + MPIU_Assert(found); } MPIDI_Datatype_get_info(req->dev.user_count, req->dev.datatype, dt_contig, userbuf_sz, dt_ptr, ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/netmod/mxm/mxm_poll.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) hooks/post-receive -- MPICH primary repository

1 0