[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1.3-13-gf015166

[Service Account]

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  f0151661c7276b57e39a31c092c8c63de0fb94f0 (commit)
      from  c11ccde6bd3e9ceca312d1976c89f344e6560e82 (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/f0151661c7276b57e39a31c092c8c63de0fb94f0

commit f0151661c7276b57e39a31c092c8c63de0fb94f0
Author: Wesley Bland <wbland at anl.gov>
Date:   Tue Oct 14 12:50:41 2014 -0500

    Remove MPIR_CVAR_ENABLE_COLL_FT_RET
    
    This CVAR was deprecated in MPICH 3.1 and will now be removed for MPICH 3.2.
    
    Signed-off-by: Junchao Zhang <jczhang at mcs.anl.gov>

diff --git a/src/mpi/coll/helper_fns.c b/src/mpi/coll/helper_fns.c
index 1ee252c..c98690c 100644
--- a/src/mpi/coll/helper_fns.c
+++ b/src/mpi/coll/helper_fns.c
@@ -8,32 +8,6 @@
 #include "mpiimpl.h"
 #include "datatype.h"
 
-/*
-=== BEGIN_MPI_T_CVAR_INFO_BLOCK ===
-
-categories:
-    - name        : FAULT_TOLERANCE
-      description : cvars that control fault tolerance behavior
-
-cvars:
-    - name        : MPIR_CVAR_ENABLE_COLL_FT_RET
-      category    : FAULT_TOLERANCE
-      type        : boolean
-      default     : true
-      class       : device
-      verbosity   : MPI_T_VERBOSITY_USER_BASIC
-      scope       : MPI_T_SCOPE_ALL_EQ
-      description : >-
-        DEPRECATED! Will be removed in MPICH-3.2
-        Collectives called on a communicator with a failed process
-        should not hang, however the result of the operation may be
-        invalid even though the function returns MPI_SUCCESS.  This
-        option enables an experimental feature that will return an error
-        if the result of the collective is invalid.
-
-=== END_MPI_T_CVAR_INFO_BLOCK ===
-*/
-
 #define COPY_BUFFER_SZ 16384
 
 /* These functions are used in the implementation of collective
@@ -293,7 +267,7 @@ int MPIC_Send(const void *buf, int count, MPI_Datatype datatype, int dest, int t
     MPIU_ERR_CHKANDJUMP1((count < 0), mpi_errno, MPI_ERR_COUNT,
                          "**countneg", "**countneg %d", count);
 
-    if (*errflag && MPIR_CVAR_ENABLE_COLL_FT_RET)
+    if (*errflag)
         MPIR_TAG_SET_ERROR_BIT(tag);
 
     MPID_Comm_get_ptr(comm, comm_ptr);
@@ -361,8 +335,6 @@ int MPIC_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag,
         MPID_Request_release(request_ptr);
     }
 
-    if (!MPIR_CVAR_ENABLE_COLL_FT_RET) goto fn_exit;
-
     if (source != MPI_PROC_NULL) {
         if (MPIR_TAG_CHECK_ERROR_BIT(status->MPI_TAG)) {
             *errflag = TRUE;
@@ -407,7 +379,7 @@ int MPIC_Ssend(const void *buf, int count, MPI_Datatype datatype, int dest, int
     context_id = (comm_ptr->comm_kind == MPID_INTRACOMM) ?
         MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL;
 
-    if (*errflag && MPIR_CVAR_ENABLE_COLL_FT_RET)
+    if (*errflag)
         MPIR_TAG_SET_ERROR_BIT(tag);
 
     mpi_errno = MPID_Ssend(buf, count, datatype, dest, tag, comm_ptr,
@@ -459,8 +431,7 @@ int MPIC_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
         MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL;
 
     if (status == MPI_STATUS_IGNORE) status = &mystatus;
-    if (MPIR_CVAR_ENABLE_COLL_FT_RET)
-        if (*errflag) MPIR_TAG_SET_ERROR_BIT(sendtag);
+    if (*errflag) MPIR_TAG_SET_ERROR_BIT(sendtag);
 
     mpi_errno = MPID_Irecv(recvbuf, recvcount, recvtype, source, recvtag,
                            comm_ptr, context_id, &recv_req_ptr);
@@ -480,8 +451,6 @@ int MPIC_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
     MPID_Request_release(send_req_ptr);
     MPID_Request_release(recv_req_ptr);
 
-    if (!MPIR_CVAR_ENABLE_COLL_FT_RET) goto fn_exit;
-
     if (source != MPI_PROC_NULL) {
         if (MPIR_TAG_CHECK_ERROR_BIT(status->MPI_TAG)) {
             *errflag = TRUE;
@@ -536,8 +505,7 @@ int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype,
                          "**countneg", "**countneg %d", count);
 
     if (status == MPI_STATUS_IGNORE) status = &mystatus;
-    if (MPIR_CVAR_ENABLE_COLL_FT_RET)
-        if (*errflag) MPIR_TAG_SET_ERROR_BIT(sendtag);
+    if (*errflag) MPIR_TAG_SET_ERROR_BIT(sendtag);
 
     MPID_Comm_get_ptr(comm, comm_ptr);
     context_id_offset = (comm_ptr->comm_kind == MPID_INTRACOMM) ?
@@ -595,7 +563,6 @@ int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype,
     MPID_Request_release(sreq);
     MPID_Request_release(rreq);
 
-    if (!MPIR_CVAR_ENABLE_COLL_FT_RET) goto fn_exit;
     if (mpi_errno) MPIU_ERR_POP(mpi_errno);
     
     if (source != MPI_PROC_NULL) {
@@ -636,7 +603,7 @@ int MPIC_Isend(const void *buf, int count, MPI_Datatype datatype, int dest, int
     MPIU_ERR_CHKANDJUMP1((count < 0), mpi_errno, MPI_ERR_COUNT,
                          "**countneg", "**countneg %d", count);
 
-    if (*errflag && MPIR_CVAR_ENABLE_COLL_FT_RET)
+    if (*errflag)
         MPIR_TAG_SET_ERROR_BIT(tag);
 
     MPID_Comm_get_ptr(comm, comm_ptr);
@@ -717,8 +684,7 @@ int MPIC_Waitall(int numreq, MPI_Request requests[], MPI_Status statuses[], int
     mpi_errno = MPIR_Waitall_impl(numreq, requests, statuses);
     if (mpi_errno) MPIU_ERR_POP(mpi_errno);
 
-    if (*errflag || !MPIR_CVAR_ENABLE_COLL_FT_RET)
-        goto fn_exit;
+    if (*errflag) goto fn_exit;
 
     for (i = 0; i < numreq; ++i) {
         if (MPIR_TAG_CHECK_ERROR_BIT(statuses[i].MPI_TAG)) {

-----------------------------------------------------------------------

Summary of changes:
 src/mpi/coll/helper_fns.c |   46 +++++---------------------------------------
 1 files changed, 6 insertions(+), 40 deletions(-)


hooks/post-receive
-- 
MPICH primary repository