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

[mpich] MPICH primary repository branch, master, updated. v3.2b1-24-gd3034ef
by noreply＠mpich.org 31 Mar '15

31 Mar '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 d3034ef2f1eeeaba21fe53276f05dc199c9bdf40 (commit) from f840491129bc170ffc383d25cd313088642a358a (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/d3034ef2f1eeeaba21fe53276f05dc199… commit d3034ef2f1eeeaba21fe53276f05dc199c9bdf40 Author: Charles J Archer <charles.j.archer(a)intel.com> Date: Tue Mar 31 10:52:39 2015 -0700 OFI semantics: close AV after closing endpoint diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c index 7e51a58..7291219 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c @@ -308,8 +308,8 @@ int MPID_nem_ofi_finalize(void) MPI_RC(MPID_nem_ofi_cm_finalize()); FI_RC(fi_close((fid_t) gl_data.mr), mrclose); - FI_RC(fi_close((fid_t) gl_data.av), avclose); FI_RC(fi_close((fid_t) gl_data.endpoint), epclose); + FI_RC(fi_close((fid_t) gl_data.av), avclose); FI_RC(fi_close((fid_t) gl_data.cq), cqclose); FI_RC(fi_close((fid_t) gl_data.domain), domainclose); FI_RC(fi_close((fid_t) gl_data.fabric), fabricclose); ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/netmod/ofi/ofi_init.c | 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-23-gf840491
by noreply＠mpich.org 31 Mar '15

31 Mar '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 f840491129bc170ffc383d25cd313088642a358a (commit) via f855566a45f1e6ab1a789f4fb9833d9cd8af93c0 (commit) via 7d1fd2923de65f2f6b37d27ff3ca83fb2f1349b7 (commit) from 27330ebafd4615a95c2054e9c4c33a61c4b93fec (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/f840491129bc170ffc383d25cd3130886… commit f840491129bc170ffc383d25cd313088642a358a Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Tue Mar 24 11:12:15 2015 -0500 portals4: add missing newline to error message Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c index 40dc3cc..27cbc02 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c @@ -478,7 +478,7 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) break; default: - MPIU_Error_printf("Received unexpected event type: %d %s", e->type, MPID_nem_ptl_strevent(e)); + MPIU_Error_printf("Received unexpected event type: %d %s\n", e->type, MPID_nem_ptl_strevent(e)); MPIU_ERR_INTERNALANDJUMP(mpi_errno, "Unexpected event type"); break; } http://git.mpich.org/mpich.git/commitdiff/f855566a45f1e6ab1a789f4fb9833d9cd… commit f855566a45f1e6ab1a789f4fb9833d9cd8af93c0 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Mon Mar 23 16:24:57 2015 -0500 portals4: remove unused header file Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c index fcc5e01..40dc3cc 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c @@ -5,7 +5,6 @@ */ #include "ptl_impl.h" -#include "stddef.h" /* C99; for offsetof */ #include <mpl_utlist.h> #include "rptl.h" http://git.mpich.org/mpich.git/commitdiff/7d1fd2923de65f2f6b37d27ff3ca83fb2… commit 7d1fd2923de65f2f6b37d27ff3ca83fb2f1349b7 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Mon Mar 23 16:15:35 2015 -0500 portals4: fix incorrect usage of max_eqs limit The max_eqs limit returned at PtlNIInit time is actually a limit on the number of event queues a particular interface can support. It is not the number of events a single queue can hold, which is how we were using it. Since there is no way to query for the max events a queue can hold, we simply request a conservative 32K. Thanks to Sayantan Sur for pointing out our error. Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c index 3b0807d..1a7f5da 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c @@ -13,7 +13,7 @@ #endif #define UNEXPECTED_HDR_COUNT 32768 -#define EQ_COUNT 32768 +#define EVENT_COUNT 32768 #define LIST_SIZE 32768 #define NID_KEY "NID" #define PID_KEY "PID" @@ -179,8 +179,6 @@ static int ptl_init(MPIDI_PG_t *pg_p, int pg_rank, char **bc_val_p, int *val_max /* set higher limits if they are determined to be too low */ if (desired.max_unexpected_headers < UNEXPECTED_HDR_COUNT && getenv("PTL_LIM_MAX_UNEXPECTED_HEADERS") == NULL) desired.max_unexpected_headers = UNEXPECTED_HDR_COUNT; - if (desired.max_eqs < EQ_COUNT && getenv("PTL_LIM_MAX_EQS") == NULL) - desired.max_eqs = EQ_COUNT; if (desired.max_list_size < LIST_SIZE && getenv("PTL_LIM_MAX_LIST_SIZE") == NULL) desired.max_list_size = LIST_SIZE; @@ -190,18 +188,18 @@ static int ptl_init(MPIDI_PG_t *pg_p, int pg_rank, char **bc_val_p, int *val_max MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlniinit", "**ptlniinit %s", MPID_nem_ptl_strerror(ret)); /* allocate EQs for each portal */ - ret = PtlEQAlloc(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_ni_limits.max_eqs, &MPIDI_nem_ptl_eq); + ret = PtlEQAlloc(MPIDI_nem_ptl_ni, EVENT_COUNT, &MPIDI_nem_ptl_eq); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptleqalloc", "**ptleqalloc %s", MPID_nem_ptl_strerror(ret)); - ret = PtlEQAlloc(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_ni_limits.max_eqs, &MPIDI_nem_ptl_get_eq); + ret = PtlEQAlloc(MPIDI_nem_ptl_ni, EVENT_COUNT, &MPIDI_nem_ptl_get_eq); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptleqalloc", "**ptleqalloc %s", MPID_nem_ptl_strerror(ret)); - ret = PtlEQAlloc(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_ni_limits.max_eqs, &MPIDI_nem_ptl_control_eq); + ret = PtlEQAlloc(MPIDI_nem_ptl_ni, EVENT_COUNT, &MPIDI_nem_ptl_control_eq); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptleqalloc", "**ptleqalloc %s", MPID_nem_ptl_strerror(ret)); /* allocate a separate EQ for origin events. with this, we can implement rate-limit operations to prevent a locally triggered flow control even */ - ret = PtlEQAlloc(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_ni_limits.max_eqs, &MPIDI_nem_ptl_origin_eq); + ret = PtlEQAlloc(MPIDI_nem_ptl_ni, EVENT_COUNT, &MPIDI_nem_ptl_origin_eq); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptleqalloc", "**ptleqalloc %s", MPID_nem_ptl_strerror(ret)); /* allocate portal for matching messages */ ----------------------------------------------------------------------- Summary of changes: .../channels/nemesis/netmod/portals4/ptl_init.c | 12 +++++------- .../ch3/channels/nemesis/netmod/portals4/ptl_nm.c | 3 +-- 2 files changed, 6 insertions(+), 9 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b1-20-g27330eb
by noreply＠mpich.org 30 Mar '15

30 Mar '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 27330ebafd4615a95c2054e9c4c33a61c4b93fec (commit) from fbae4e327d638b3615517fdd992824bac3e1d8af (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/27330ebafd4615a95c2054e9c4c33a61c… commit 27330ebafd4615a95c2054e9c4c33a61c4b93fec Author: Charles J Archer <charles.j.archer(a)intel.com> Date: Mon Mar 30 12:56:45 2015 -0700 Update polling loop for OFI cq_read EAGAIN return diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c index 02cc02e..7c9d1c8 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c @@ -256,6 +256,8 @@ int MPID_nem_ofi_poll(int in_blocking_poll) MPIU_Assert(0); } } + else if (ret == -FI_EAGAIN) + ; else if (ret < 0) { if (ret == -FI_EAVAIL) { ret = fi_cq_readerr(gl_data.cq, (void *) &error, 0); ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/netmod/ofi/ofi_progress.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b1-19-gfbae4e3
by noreply＠mpich.org 28 Mar '15

28 Mar '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 fbae4e327d638b3615517fdd992824bac3e1d8af (commit) from 5538b7ce44f7f7eaf184c90692640d860376c259 (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/fbae4e327d638b3615517fdd992824bac… commit fbae4e327d638b3615517fdd992824bac3e1d8af Author: Pavan Balaji <balaji(a)anl.gov> Date: Mon Mar 23 04:00:00 2015 -0500 Remove unnecessary backslashes in man pages. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/env/mpicc.txt b/src/env/mpicc.txt index 99e1bc0..125dbbb 100644 --- a/src/env/mpicc.txt +++ b/src/env/mpicc.txt @@ -60,16 +60,16 @@ Examples: To compile a single file 'foo.c', use .vb - mpicc \-c foo.c + mpicc -c foo.c .ve To link the output and make an executable, use .vb - mpicc \-o foo foo.o + mpicc -o foo foo.o .ve Combining compilation and linking in a single command .vb - mpicc \-o foo foo.c + mpicc -o foo foo.c .ve is a convenient way to build simple programs. @@ -95,8 +95,8 @@ is a convenient way to build simple programs. you could create the file 'myprof.conf' with the lines .vb - PROFILE_PRELIB="\-L/usr/local/myprof/lib \-lmyprof" - PROFILE_INCPATHS="\-I/usr/local/myprof/include" + PROFILE_PRELIB="-L/usr/local/myprof/lib -lmyprof" + PROFILE_INCPATHS="-I/usr/local/myprof/include" .ve and place it in the sysconfdir directory (this directory is set at configure time when MPICH is built). Then using the command-line diff --git a/src/env/mpicxx.txt b/src/env/mpicxx.txt index 3cf0be4..4935697 100644 --- a/src/env/mpicxx.txt +++ b/src/env/mpicxx.txt @@ -60,16 +60,16 @@ Examples: To compile a single file 'foo.c', use .vb - mpicxx \-c foo.cxx + mpicxx -c foo.cxx .ve To link the output and make an executable, use .vb - mpicxx \-o foo foo.o + mpicxx -o foo foo.o .ve Combining compilation and linking in a single command .vb - mpicxx \-o foo foo.cxx + mpicxx -o foo foo.cxx .ve is a convenient way to build simple programs. @@ -95,8 +95,8 @@ is a convenient way to build simple programs. you could create the file 'myprof.conf' with the lines .vb - PROFILE_PRELIB="\-L/usr/local/myprof/lib \-lmyprof" - PROFILE_INCPATHS="\-I/usr/local/myprof/include" + PROFILE_PRELIB="-L/usr/local/myprof/lib -lmyprof" + PROFILE_INCPATHS="-I/usr/local/myprof/include" .ve and place it in the sysconfdir directory (this directory is set at configure time when MPICH is built). Then using the command-line diff --git a/src/env/mpiexec.txt b/src/env/mpiexec.txt index d3ca8e2..998f83c 100644 --- a/src/env/mpiexec.txt +++ b/src/env/mpiexec.txt @@ -11,7 +11,7 @@ Multiple Data applications). For example, the following command will run the MPI program 'a.out' on 4 processes\: .vb - mpiexec \-n 4 a.out + mpiexec -n 4 a.out .ve The MPI standard specifies the following arguments and their meanings\: @@ -27,7 +27,7 @@ The MPI standard specifies the following arguments and their meanings\: - \-configfile <name> - file containing specifications of host/program, one per line, with # as a comment indicator, e.g., the usual mpiexec input, but with ":" replaced with a newline. That is, - the configfile contains lines with \-soft, \-n etc. + the configfile contains lines with -soft, -n etc. Additional arguments that are specific to the MPICH implementation are discussed below. @@ -42,7 +42,7 @@ The MPI standard specifies the following arguments and their meanings\: to run the program 'ocean' on 4 processes and 'air' on 8 processes, use\: .vb - mpiexec \-n 4 ocean : \-n 8 air + mpiexec -n 4 ocean : -n 8 air .ve diff --git a/src/env/mpif77.txt b/src/env/mpif77.txt index dde707c..22786ad 100644 --- a/src/env/mpif77.txt +++ b/src/env/mpif77.txt @@ -55,16 +55,16 @@ Examples: To compile a single file 'foo.f', use .vb - mpif77 \-c foo.f + mpif77 -c foo.f .ve To link the output and make an executable, use .vb - mpif77 \-o foo foo.o + mpif77 -o foo foo.o .ve Combining compilation and linking in a single command .vb - mpif77 \-o foo foo.f + mpif77 -o foo foo.f .ve is a convenient way to build simple programs. @@ -90,8 +90,8 @@ is a convenient way to build simple programs. you could create the file 'myprof.conf' with the lines .vb - PROFILE_PRELIB="\-L/usr/local/myprof/lib \-lmyprof" - PROFILE_INCPATHS="\-I/usr/local/myprof/include" + PROFILE_PRELIB="-L/usr/local/myprof/lib -lmyprof" + PROFILE_INCPATHS="-I/usr/local/myprof/include" .ve and place it in the sysconfdir directory (this directory is set at configure time when MPICH is built). Then using the command-line diff --git a/src/env/mpifort.txt b/src/env/mpifort.txt index e91935b..5f919a2 100644 --- a/src/env/mpifort.txt +++ b/src/env/mpifort.txt @@ -55,16 +55,16 @@ Examples: To compile a single file 'foo.f', use .vb - mpifort \-c foo.f + mpifort -c foo.f .ve To link the output and make an executable, use .vb - mpifort \-o foo foo.o + mpifort -o foo foo.o .ve Combining compilation and linking in a single command .vb - mpifort \-o foo foo.f + mpifort -o foo foo.f .ve is a convenient way to build simple programs. @@ -90,8 +90,8 @@ is a convenient way to build simple programs. you could create the file 'myprof.conf' with the lines .vb - PROFILE_PRELIB="\-L/usr/local/myprof/lib \-lmyprof" - PROFILE_INCPATHS="\-I/usr/local/myprof/include" + PROFILE_PRELIB="-L/usr/local/myprof/lib -lmyprof" + PROFILE_INCPATHS="-I/usr/local/myprof/include" .ve and place it in the sysconfdir directory (this directory is set at configure time when MPICH is built). Then using the command-line ----------------------------------------------------------------------- Summary of changes: src/env/mpicc.txt | 10 +++++----- src/env/mpicxx.txt | 10 +++++----- src/env/mpiexec.txt | 6 +++--- src/env/mpif77.txt | 10 +++++----- src/env/mpifort.txt | 10 +++++----- 5 files changed, 23 insertions(+), 23 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b1-18-g5538b7c
by noreply＠mpich.org 27 Mar '15

27 Mar '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 5538b7ce44f7f7eaf184c90692640d860376c259 (commit) from 983a60e8fd6490daf15301f5f092795de941ed8d (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/5538b7ce44f7f7eaf184c90692640d860… commit 5538b7ce44f7f7eaf184c90692640d860376c259 Author: Pavan Balaji <balaji(a)anl.gov> Date: Mon Mar 23 17:17:55 2015 -0500 Bump up the bcast2/bcast3 timeouts a bit more. FreeBSD seems to take slightly more than 20 minutes to run these tests primarily because the poll() call is somehow superslow on that OS. This new timeout should be sufficient to cover that case. No reviewer. diff --git a/test/mpi/coll/testlist b/test/mpi/coll/testlist index 2e77908..f776bc5 100644 --- a/test/mpi/coll/testlist +++ b/test/mpi/coll/testlist @@ -35,8 +35,8 @@ bcasttest 10 bcast2 4 # More that 8 processes are required to get bcast to switch to the long # msg algorithm (see coll definitions in mpiimpl.h) -bcast2 10 timeLimit=1200 -bcast3 10 timeLimit=1200 +bcast2 10 timeLimit=1500 +bcast3 10 timeLimit=1500 bcastzerotype 1 bcastzerotype 4 bcastzerotype 5 ----------------------------------------------------------------------- Summary of changes: test/mpi/coll/testlist | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b1-17-g983a60e
by noreply＠mpich.org 27 Mar '15

27 Mar '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 983a60e8fd6490daf15301f5f092795de941ed8d (commit) from ed383176b480dd5ae2dff1d444a5d6ba3ca713a9 (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/983a60e8fd6490daf15301f5f092795de… commit 983a60e8fd6490daf15301f5f092795de941ed8d Author: Huiwei Lu <huiweilu(a)mcs.anl.gov> Date: Thu Mar 26 20:23:54 2015 -0500 Fixes build failure with per-object thread-cs When configured with --enable-thread-cs=per-object, MPICH build will go wrong because MPID_cc_t will be defined as OPA_int_t, which can not be directly compared with or assigned with int. This patch adds one macro, MPID_cc_get, for correctly reading MPID_cc_t. Also, change writing to MPID_cc_t to use MPID_cc_set. Fixes #2250 diff --git a/src/include/mpiimplthread.h b/src/include/mpiimplthread.h index f0141c6..625cc90 100644 --- a/src/include/mpiimplthread.h +++ b/src/include/mpiimplthread.h @@ -910,6 +910,7 @@ do { \ do { \ *(was_incomplete_) = (*(cc_ptr_))++; \ } while (0) +#define MPID_cc_get(cc_) (cc_) # elif MPIU_THREAD_GRANULARITY == MPIU_THREAD_GRANULARITY_PER_OBJECT @@ -977,6 +978,8 @@ static MPIU_DBG_INLINE_KEYWORD int MPID_cc_is_complete(MPID_cc_t *cc_ptr) *(was_incomplete_) = OPA_fetch_and_incr_int(cc_ptr_); \ } while (0) +#define MPID_cc_get(cc_) OPA_load_int(&(cc_)) + # else # error "unexpected thread granularity" # endif /* granularity */ @@ -993,6 +996,7 @@ do { \ do { \ *(was_incomplete_) = (*(cc_ptr_))++; \ } while (0) +#define MPID_cc_get(cc_) (cc_) #endif /* defined(MPICH_IS_THREADED) */ diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c index c38968c..5f12566 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c @@ -158,7 +158,7 @@ static inline int MPID_nem_ofi_handle_packet(cq_tagged_entry_t * wc ATTRIBUTE((u MPIDI_VC_t *vc; BEGIN_FUNC(FCNAME); - if (rreq->cc == 1) { + if (MPID_cc_get(rreq->cc) == 1) { vc = REQ_OFI(rreq)->vc; MPIU_Assert(vc); MPI_RC(MPID_nem_handle_pkt(vc, REQ_OFI(rreq)->pack_buffer, REQ_OFI(rreq)->pack_buffer_size)) diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c index 2a67e31..fece219 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c @@ -105,7 +105,7 @@ static int MPID_nem_ofi_data_callback(cq_tagged_entry_t * wc, MPID_Request * sre req_fn reqFn; uint64_t tag = 0; BEGIN_FUNC(FCNAME); - if (sreq->cc == 2) { + if (MPID_cc_get(sreq->cc) == 2) { vc = REQ_OFI(sreq)->vc; REQ_OFI(sreq)->tag = tag | MPID_MSG_DATA; FI_RC(fi_tsend(gl_data.endpoint, @@ -115,7 +115,7 @@ static int MPID_nem_ofi_data_callback(cq_tagged_entry_t * wc, MPID_Request * sre VC_OFI(vc)->direct_addr, wc->tag | MPID_MSG_DATA, (void *) &(REQ_OFI(sreq)->ofi_context)), tsend); } - if (sreq->cc == 1) { + if (MPID_cc_get(sreq->cc) == 1) { if (REQ_OFI(sreq)->pack_buffer) MPIU_Free(REQ_OFI(sreq)->pack_buffer); diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c index 4ee5de1..d1ad140 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c @@ -73,7 +73,7 @@ static int handler_send(const ptl_event_t *e) MPIU_Assert(e->type == PTL_EVENT_SEND || e->type == PTL_EVENT_GET); /* if we are done, release all resources and complete the request */ - if (sreq->cc == 1) { + if (MPID_cc_get(sreq->cc) == 1) { if (REQ_PTL(sreq)->md != PTL_INVALID_HANDLE) { ret = PtlMDRelease(REQ_PTL(sreq)->md); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlmdrelease", "**ptlmdrelease %s", MPID_nem_ptl_strerror(ret)); diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c index e7cdb6e..c07d322 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c @@ -205,7 +205,7 @@ static int pkt_RTS_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPIDI_msg_sz_t /* If the completion counter is 0, that means that the communicator to * which this message is being sent has been revoked and we shouldn't * bother finishing this. */ - if (!found && rreq->cc == 0) { + if (!found && MPID_cc_get(rreq->cc) == 0) { *rreqp = NULL; goto fn_exit; } diff --git a/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c b/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c index 3dc40d2..7f31cd8 100644 --- a/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c +++ b/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c @@ -131,7 +131,7 @@ int MPIDI_CH3_iStartMsg(MPIDI_VC_t * vc, void * hdr, MPIDI_msg_sz_t hdr_sz, MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem"); } sreq->kind = MPID_REQUEST_SEND; - sreq->cc = 0; + MPID_cc_set(&(sreq->cc), 0); sreq->status.MPI_ERROR = MPIR_Err_create_code( rc, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_INTERN, "**ch3|sock|writefailed", @@ -199,7 +199,7 @@ int MPIDI_CH3_iStartMsg(MPIDI_VC_t * vc, void * hdr, MPIDI_msg_sz_t hdr_sz, MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem"); } sreq->kind = MPID_REQUEST_SEND; - sreq->cc = 0; + MPID_cc_set(&sreq->cc, 0); sreq->status.MPI_ERROR = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, diff --git a/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c b/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c index 223b854..0b9d402 100644 --- a/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c +++ b/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c @@ -163,7 +163,7 @@ int MPIDI_CH3_iStartMsgv(MPIDI_VC_t * vc, MPID_IOV * iov, int n_iov, MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem"); } sreq->kind = MPID_REQUEST_SEND; - sreq->cc = 0; + MPID_cc_set(&(sreq->cc), 0); sreq->status.MPI_ERROR = MPIR_Err_create_code( rc, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_INTERN, "**ch3|sock|writefailed", @@ -231,7 +231,7 @@ int MPIDI_CH3_iStartMsgv(MPIDI_VC_t * vc, MPID_IOV * iov, int n_iov, MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem"); } sreq->kind = MPID_REQUEST_SEND; - sreq->cc = 0; + MPID_cc_set(&(sreq->cc), 0); sreq->status.MPI_ERROR = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_INTERN, "**ch3|sock|connectionfailed",0 ); diff --git a/src/mpid/ch3/src/ch3u_eager.c b/src/mpid/ch3/src/ch3u_eager.c index 92440a0..2f16890 100644 --- a/src/mpid/ch3/src/ch3u_eager.c +++ b/src/mpid/ch3/src/ch3u_eager.c @@ -308,7 +308,7 @@ int MPIDI_CH3_PktHandler_EagerShortSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, /* If the completion counter is 0, that means that the communicator to * which this message is being sent has been revoked and we shouldn't * bother finishing this. */ - if (!found && rreq->cc == 0) { + if (!found && MPID_cc_get(rreq->cc) == 0) { *rreqp = NULL; goto fn_fail; } @@ -622,7 +622,7 @@ int MPIDI_CH3_PktHandler_EagerSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, /* If the completion counter is 0, that means that the communicator to * which this message is being sent has been revoked and we shouldn't * bother finishing this. */ - if (!found && rreq->cc == 0) { + if (!found && MPID_cc_get(rreq->cc) == 0) { *rreqp = NULL; goto fn_fail; } @@ -706,7 +706,7 @@ int MPIDI_CH3_PktHandler_ReadySend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, /* If the completion counter is 0, that means that the communicator to * which this message is being sent has been revoked and we shouldn't * bother finishing this. */ - if (!found && rreq->cc == 0) { + if (!found && MPID_cc_get(rreq->cc) == 0) { *rreqp = NULL; goto fn_fail; } diff --git a/src/mpid/ch3/src/ch3u_eagersync.c b/src/mpid/ch3/src/ch3u_eagersync.c index 48cd5eb..89f5872 100644 --- a/src/mpid/ch3/src/ch3u_eagersync.c +++ b/src/mpid/ch3/src/ch3u_eagersync.c @@ -239,7 +239,7 @@ int MPIDI_CH3_PktHandler_EagerSyncSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, /* If the completion counter is 0, that means that the communicator to * which this message is being sent has been revoked and we shouldn't * bother finishing this. */ - if (!found && rreq->cc == 0) { + if (!found && MPID_cc_get(rreq->cc) == 0) { *rreqp = NULL; goto fn_fail; } diff --git a/src/mpid/ch3/src/ch3u_rndv.c b/src/mpid/ch3/src/ch3u_rndv.c index 6861f44..9d64e7a 100644 --- a/src/mpid/ch3/src/ch3u_rndv.c +++ b/src/mpid/ch3/src/ch3u_rndv.c @@ -131,7 +131,7 @@ int MPIDI_CH3_PktHandler_RndvReqToSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, /* If the completion counter is 0, that means that the communicator to * which this message is being sent has been revoked and we shouldn't * bother finishing this. */ - if (!found && rreq->cc == 0) { + if (!found && MPID_cc_get(rreq->cc) == 0) { *rreqp = NULL; goto fn_fail; } diff --git a/src/mpid/ch3/src/mpid_send.c b/src/mpid/ch3/src/mpid_send.c index bb9338d..cf25242 100644 --- a/src/mpid/ch3/src/mpid_send.c +++ b/src/mpid/ch3/src/mpid_send.c @@ -56,7 +56,7 @@ int MPID_Send(const void * buf, int count, MPI_Datatype datatype, int rank, will not be made (long-term FIXME) */ # ifndef MPICH_IS_THREADED { - if (sreq != NULL && sreq->cc != 0) { + if (sreq != NULL && MPID_cc_get(sreq->cc) != 0) { MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER, "**dev|selfsenddeadlock"); } diff --git a/src/mpid/ch3/src/mpid_ssend.c b/src/mpid/ch3/src/mpid_ssend.c index 7ee8883..b3d735c 100644 --- a/src/mpid/ch3/src/mpid_ssend.c +++ b/src/mpid/ch3/src/mpid_ssend.c @@ -55,7 +55,7 @@ int MPID_Ssend(const void * buf, int count, MPI_Datatype datatype, int rank, int # ifndef MPICH_IS_THREADED { /* --BEGIN ERROR HANDLING-- */ - if (sreq != NULL && sreq->cc != 0) + if (sreq != NULL && MPID_cc_get(sreq->cc) != 0) { mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OTHER, "**dev|selfsenddeadlock", 0); diff --git a/src/mpid/ch3/src/mpidi_isend_self.c b/src/mpid/ch3/src/mpidi_isend_self.c index b003e6e..7521c68 100644 --- a/src/mpid/ch3/src/mpidi_isend_self.c +++ b/src/mpid/ch3/src/mpidi_isend_self.c @@ -59,7 +59,7 @@ int MPIDI_Isend_self(const void * buf, int count, MPI_Datatype datatype, int ran /* If the completion counter is 0, that means that the communicator to * which this message is being sent has been revoked and we shouldn't * bother finishing this. */ - if (!found && rreq->cc == 0) { + if (!found && MPID_cc_get(rreq->cc) == 0) { MPIU_Object_set_ref(sreq, 0); MPIDI_CH3_Request_destroy(sreq); sreq = NULL; ----------------------------------------------------------------------- Summary of changes: src/include/mpiimplthread.h | 4 ++++ src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c | 2 +- src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c | 4 ++-- .../channels/nemesis/netmod/portals4/ptl_send.c | 2 +- src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c | 2 +- src/mpid/ch3/channels/sock/src/ch3_istartmsg.c | 4 ++-- src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c | 4 ++-- src/mpid/ch3/src/ch3u_eager.c | 6 +++--- src/mpid/ch3/src/ch3u_eagersync.c | 2 +- src/mpid/ch3/src/ch3u_rndv.c | 2 +- src/mpid/ch3/src/mpid_send.c | 2 +- src/mpid/ch3/src/mpid_ssend.c | 2 +- src/mpid/ch3/src/mpidi_isend_self.c | 2 +- 13 files changed, 21 insertions(+), 17 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b1-16-ged38317
by noreply＠mpich.org 27 Mar '15

27 Mar '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 ed383176b480dd5ae2dff1d444a5d6ba3ca713a9 (commit) from b6a5b179e6e903b8f0a21291d3e3d1212606faaf (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/ed383176b480dd5ae2dff1d444a5d6ba3… commit ed383176b480dd5ae2dff1d444a5d6ba3ca713a9 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Fri Mar 27 13:59:44 2015 -0500 testsuite: Makefile cleanup The nonblocking4 test was renamed and moved to the errors directory in [a0ebb441]. No reviewer. diff --git a/test/mpi/coll/Makefile.am b/test/mpi/coll/Makefile.am index 7368173..98264a4 100644 --- a/test/mpi/coll/Makefile.am +++ b/test/mpi/coll/Makefile.am @@ -70,7 +70,6 @@ noinst_PROGRAMS = \ nonblocking \ nonblocking2 \ nonblocking3 \ - nonblocking4 \ op_commutative \ opband \ opbor \ ----------------------------------------------------------------------- Summary of changes: test/mpi/coll/Makefile.am | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b1-15-gb6a5b17
by noreply＠mpich.org 26 Mar '15

26 Mar '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 b6a5b179e6e903b8f0a21291d3e3d1212606faaf (commit) from 7bb8bd5987fc18074ffd2f8424dbfd87b477af12 (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/b6a5b179e6e903b8f0a21291d3e3d1212… commit b6a5b179e6e903b8f0a21291d3e3d1212606faaf Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Thu Mar 26 09:29:54 2015 -0500 gforker: fixup for [7bb8bd59] The abort fix for gforker was not agressive enough about cleaning up MPI processes. An abort could lead to a situation where some MPI processes were left running on the node after mpiexec has exited. Now we force kill all processes before exit. Refs #2249 Signed-off-by: Huiwei Lu <huiweilu(a)mcs.anl.gov> diff --git a/src/pm/util/pmiserv.c b/src/pm/util/pmiserv.c index e0c180e..cf8fdff 100644 --- a/src/pm/util/pmiserv.c +++ b/src/pm/util/pmiserv.c @@ -417,6 +417,9 @@ static int fPMI_Handle_abort( PMIProcess *pentry ) exitcode = atoi(PMIU_getval( "exitcode", exitcodestr, MAXVALLEN )); + /* cleanup all MPI processes */ + MPIE_KillUniverse( &pUniv ); + exit(exitcode); /* should never reach here */ ----------------------------------------------------------------------- Summary of changes: src/pm/util/pmiserv.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b1-14-g7bb8bd5
by noreply＠mpich.org 25 Mar '15

25 Mar '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 7bb8bd5987fc18074ffd2f8424dbfd87b477af12 (commit) from cc663e7622ea5317db959b8bc2994ea72042beeb (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/7bb8bd5987fc18074ffd2f8424dbfd87b… commit 7bb8bd5987fc18074ffd2f8424dbfd87b477af12 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Wed Mar 25 15:48:13 2015 -0500 gforker: implement PMI_Abort handler Since [b1e89abf], PMI_Abort sends an abort command to the PMI server and relies on it to cleanup the application. In the case of gforker, nothing was done with this command, leaving the PMI client hanging waiting for a response. Gforker will now exit with the requested abort code upon receiving the command. Fixes #2249 Signed-off-by: Huiwei Lu <huiweilu(a)mcs.anl.gov> diff --git a/src/pm/util/pmiserv.c b/src/pm/util/pmiserv.c index ccd96be..e0c180e 100644 --- a/src/pm/util/pmiserv.c +++ b/src/pm/util/pmiserv.c @@ -412,6 +412,14 @@ static int fPMI_Handle_finalize( PMIProcess *pentry ) } static int fPMI_Handle_abort( PMIProcess *pentry ) { + char exitcodestr[MAXVALLEN]; + int exitcode = 1; /* non-zero default */ + + exitcode = atoi(PMIU_getval( "exitcode", exitcodestr, MAXVALLEN )); + + exit(exitcode); + + /* should never reach here */ return 1; } /* ----------------------------------------------------------------------- Summary of changes: src/pm/util/pmiserv.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b1-13-gcc663e7
by noreply＠mpich.org 20 Mar '15

20 Mar '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 cc663e7622ea5317db959b8bc2994ea72042beeb (commit) from 5c060dfd724cc468a2e4bf0e6e35135b355d87e7 (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/cc663e7622ea5317db959b8bc2994ea72… commit cc663e7622ea5317db959b8bc2994ea72042beeb Author: Pavan Balaji <balaji(a)anl.gov> Date: Fri Mar 20 01:07:47 2015 -0500 Reduce the number of processes in the commcreatep test. This test is run with 64 processes. On platforms that do not schedule that many processes well (such as FreeBSD), this can slow down the test a lot and cause timeouts. Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/test/mpi/perf/testlist b/test/mpi/perf/testlist index fb206ed..3bda503 100644 --- a/test/mpi/perf/testlist +++ b/test/mpi/perf/testlist @@ -9,4 +9,4 @@ non_zero_root 4 timer 1 # The commcreatep test looks at how communicator creation scales with group # size. -commcreatep 64 +commcreatep 16 ----------------------------------------------------------------------- Summary of changes: test/mpi/perf/testlist | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0