Do not iface_check in non-blocking and never set MPI_ERROR in single

abouteiller · abouteiller · commit 3a9fd329e355 · 2020-05-14T21:22:04.000-04:00
status functions

Signed-off-by: Aurelien Bouteiller &lt;bouteill@icl.utk.edu&gt;
diff --git a/ompi/mpi/c/improbe.c b/ompi/mpi/c/improbe.c
@@ -1,10 +1,12 @@
 /*
  * Copyright (c) 2011      Sandia National Laboratories. All rights reserved.
  * Copyright (c) 2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2012      Oak Ridge National Labs.  All rights reserved.
  * Copyright (c) 2012      Oracle and/or its affiliates.  All rights reserved.
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2020      The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -73,19 +75,9 @@ int MPI_Improbe(int source, int tag, MPI_Comm comm, int *flag,
 
 #if OPAL_ENABLE_FT_MPI
     /*
-     * Check here for issues with the peer, so we do not have to duplicate the
-     * functionality in the PML.
+     * The request will check checked for process failure errors during the
+     * completion calls. So no need to check here.
      */
-    if( OPAL_UNLIKELY(!ompi_comm_iface_p2p_check_proc(comm, source, &rc)) ) {
-        if (MPI_STATUS_IGNORE != status) {
-            status->MPI_SOURCE = source;
-            status->MPI_TAG    = tag;
-            status->MPI_ERROR  = rc;
-        }
-        *flag = false;
-        *message = &ompi_message_no_proc.message;
-        OMPI_ERRHANDLER_RETURN(rc, comm, rc, FUNC_NAME);
-    }
 #endif
 
     OPAL_CR_ENTER_LIBRARY();
diff --git a/ompi/mpi/c/iprobe.c b/ompi/mpi/c/iprobe.c
@@ -2,14 +2,13 @@
  * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2018 The University of Tennessee and The University
+ * Copyright (c) 2004-2020 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2008 High Performance Computing Center Stuttgart,
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2010-2012 Oak Ridge National Labs.  All rights reserved.
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
@@ -81,18 +80,9 @@ int MPI_Iprobe(int source, int tag, MPI_Comm comm, int *flag, MPI_Status *status
 
 #if OPAL_ENABLE_FT_MPI
     /*
-     * Check here for issues with the peer, so we do not have to duplicate the
-     * functionality in the PML.
+     * The request will check checked for process failure errors during the
+     * completion calls. So no need to check here.
      */
-    if( OPAL_UNLIKELY(!ompi_comm_iface_p2p_check_proc(comm, source, &rc)) ) {
-        if (MPI_STATUS_IGNORE != status) {
-            status->MPI_SOURCE = source;
-            status->MPI_TAG    = tag;
-            status->MPI_ERROR  = rc;
-        }
-        *flag = false;
-        OMPI_ERRHANDLER_RETURN(rc, comm, rc, FUNC_NAME);
-    }
 #endif
 
     OPAL_CR_ENTER_LIBRARY();
diff --git a/ompi/mpi/c/mprobe.c b/ompi/mpi/c/mprobe.c
@@ -5,6 +5,9 @@
  * Copyright (c) 2012      Oracle and/or its affiliates.  All rights reserved.
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2020      The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -79,7 +82,6 @@ int MPI_Mprobe(int source, int tag, MPI_Comm comm,
         if (MPI_STATUS_IGNORE != status) {
             status->MPI_SOURCE = source;
             status->MPI_TAG    = tag;
-            status->MPI_ERROR  = rc;
         }
         *message = &ompi_message_no_proc.message;
         OMPI_ERRHANDLER_RETURN(rc, comm, rc, FUNC_NAME);
diff --git a/ompi/mpi/c/probe.c b/ompi/mpi/c/probe.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2018 The University of Tennessee and The University
+ * Copyright (c) 2004-2020 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2008 High Performance Computing Center Stuttgart,
@@ -65,6 +65,19 @@ int MPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status)
         OMPI_ERRHANDLER_CHECK(rc, comm, rc, "MPI_Probe");
     }
 
+    if (MPI_PROC_NULL == source) {
+        if (MPI_STATUS_IGNORE != status) {
+            *status = ompi_request_empty.req_status;
+            /*
+             * Per MPI-1, the MPI_ERROR field is not defined for single-completion calls
+             */
+            MEMCHECKER(
+                opal_memchecker_base_mem_undefined(&status->MPI_ERROR, sizeof(int));
+            );
+        }
+        return MPI_SUCCESS;
+    }
+
 #if OPAL_ENABLE_FT_MPI
     /*
      * Check here for issues with the peer, so we do not have to duplicate the
@@ -74,25 +87,11 @@ int MPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status)
         if (MPI_STATUS_IGNORE != status) {
             status->MPI_SOURCE = source;
             status->MPI_TAG    = tag;
-            status->MPI_ERROR  = rc;
         }
         OMPI_ERRHANDLER_RETURN(rc, comm, rc, FUNC_NAME);
     }
 #endif
 
-    if (MPI_PROC_NULL == source) {
-        if (MPI_STATUS_IGNORE != status) {
-            *status = ompi_request_empty.req_status;
-            /*
-             * Per MPI-1, the MPI_ERROR field is not defined for single-completion calls
-             */
-            MEMCHECKER(
-                opal_memchecker_base_mem_undefined(&status->MPI_ERROR, sizeof(int));
-            );
-        }
-        return MPI_SUCCESS;
-    }
-
     OPAL_CR_ENTER_LIBRARY();
 
     rc = MCA_PML_CALL(probe(source, tag, comm, status));
diff --git a/ompi/mpi/c/recv.c b/ompi/mpi/c/recv.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2018 The University of Tennessee and The University
+ * Copyright (c) 2004-2020 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2008 High Performance Computing Center Stuttgart,
@@ -82,7 +82,6 @@ int MPI_Recv(void *buf, int count, MPI_Datatype type, int source,
         if (MPI_STATUS_IGNORE != status) {
             status->MPI_SOURCE = source;
             status->MPI_TAG    = tag;
-            status->MPI_ERROR  = rc;
         }
         OMPI_ERRHANDLER_RETURN(rc, comm, rc, FUNC_NAME);
     }
diff --git a/ompi/mpi/c/sendrecv_replace.c b/ompi/mpi/c/sendrecv_replace.c
@@ -2,14 +2,13 @@
  * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2018 The University of Tennessee and The University
+ * Copyright (c) 2004-2020 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2008 High Performance Computing Center Stuttgart,
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2010-2012 Oak Ridge National Labs.  All rights reserved.
  * Copyright (c) 2010-2012 Oracle and/or its affiliates.  All rights reserved.
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
@@ -79,29 +78,10 @@ int MPI_Sendrecv_replace(void * buf, int count, MPI_Datatype datatype,
 
 #if OPAL_ENABLE_FT_MPI
     /*
-     * An early check, so as to return early if we are communicating with
-     * a failed process. This is not absolutely necessary since we will
-     * check for this, and other, error conditions during the completion
-     * call in the PML.
+     * The final call to Sendrecv will check for process failures inside
+     * So no need to check here.
      */
-    if( OPAL_UNLIKELY(!ompi_comm_iface_p2p_check_proc(comm, dest, &rc)) ) {
-        if( MPI_STATUS_IGNORE != status ) {
-            status->MPI_SOURCE = dest;
-            status->MPI_TAG    = recvtag;
-            status->MPI_ERROR  = rc;
-        }
-        OMPI_ERRHANDLER_RETURN(rc, comm, rc, FUNC_NAME);
-    }
-
-    if( OPAL_UNLIKELY(!ompi_comm_iface_p2p_check_proc(comm, source, &rc)) ) {
-        if( MPI_STATUS_IGNORE != status ) {
-            status->MPI_SOURCE = source;
-            status->MPI_TAG    = recvtag;
-            status->MPI_ERROR  = rc;
-        }
-        OMPI_ERRHANDLER_RETURN(rc, comm, rc, FUNC_NAME);
-    }
-#endif
+#endif /* OPAL_ENABLE_FT_MPI */
 
     OPAL_CR_ENTER_LIBRARY();
 
