Commit f0151661 authored by Wesley Bland's avatar Wesley Bland Committed by Junchao Zhang
Browse files

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: default avatarJunchao Zhang <jczhang@mcs.anl.gov>
parent c11ccde6
......@@ -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,7 +431,6 @@ 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);
mpi_errno = MPID_Irecv(recvbuf, recvcount, recvtype, source, recvtag,
......@@ -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,7 +505,6 @@ 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);
MPID_Comm_get_ptr(comm, comm_ptr);
......@@ -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)) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment