Skip to content
This repository was archived by the owner on Sep 30, 2022. It is now read-only.

Commit e2decda

Browse files
committed
ompi/fortran: fix typos in request RMA bindings
This commit fixes typos on the C side of the request-based RMA binding. We were not returning the request on success but on failure. Thanks to @alazzaro for reporting and @ggouaillardet, and @vondele for tracking this down. Fixes part of open-mpi/ompi#1869 Signed-off-by: Nathan Hjelm <[email protected]> (cherry picked from commit open-mpi/ompi@8bdcb40) Signed-off-by: Nathan Hjelm <[email protected]>
1 parent 325cd25 commit e2decda

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

ompi/mpi/fortran/mpif-h/raccumulate_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Copyright (c) 2004-2005 The Regents of the University of California.
1212
* All rights reserved.
1313
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
14-
* Copyright (c) 2014 Los Alamos National Security, LLC. All rights
14+
* Copyright (c) 2014-2016 Los Alamos National Security, LLC. All rights
1515
* reserved.
1616
* Copyright (c) 2015 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
@@ -96,7 +96,7 @@ void ompi_raccumulate_f(char *origin_addr, MPI_Fint *origin_count,
9696

9797
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c);
9898

99-
if (MPI_SUCCESS != ierr_c) {
99+
if (MPI_SUCCESS == ierr_c) {
100100
*request = PMPI_Request_c2f(c_req);
101101
}
102102
}

ompi/mpi/fortran/mpif-h/rget_accumulate_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Copyright (c) 2004-2005 The Regents of the University of California.
1212
* All rights reserved.
1313
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
14-
* Copyright (c) 2014 Los Alamos National Security, LLC. All rights
14+
* Copyright (c) 2014-2016 Los Alamos National Security, LLC. All rights
1515
* reserved.
1616
* Copyright (c) 2015 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
@@ -100,7 +100,7 @@ void ompi_rget_accumulate_f(char *origin_addr, MPI_Fint *origin_count,
100100
c_target_datatype, c_op, c_win, &c_req);
101101
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
102102

103-
if (MPI_SUCCESS != c_ierr) {
103+
if (MPI_SUCCESS == c_ierr) {
104104
*request = PMPI_Request_c2f(c_req);
105105
}
106106
}

ompi/mpi/fortran/mpif-h/rget_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Copyright (c) 2004-2005 The Regents of the University of California.
1212
* All rights reserved.
1313
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
14-
* Copyright (c) 2014 Los Alamos National Security, LLC. All rights
14+
* Copyright (c) 2014-2016 Los Alamos National Security, LLC. All rights
1515
* reserved.
1616
* Copyright (c) 2015 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
@@ -92,7 +92,7 @@ void ompi_rget_f(char *origin_addr, MPI_Fint *origin_count,
9292
c_target_datatype, c_win, &c_req);
9393
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
9494

95-
if (MPI_SUCCESS != c_ierr) {
95+
if (MPI_SUCCESS == c_ierr) {
9696
*request = PMPI_Request_c2f(c_req);
9797
}
9898
}

ompi/mpi/fortran/mpif-h/rput_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Copyright (c) 2004-2005 The Regents of the University of California.
1212
* All rights reserved.
1313
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
14-
* Copyright (c) 2014 Los Alamos National Security, LLC. All rights
14+
* Copyright (c) 2014-2016 Los Alamos National Security, LLC. All rights
1515
* reserved.
1616
* Copyright (c) 2015 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
@@ -92,7 +92,7 @@ void ompi_rput_f(char *origin_addr, MPI_Fint *origin_count,
9292
c_target_datatype, c_win, &c_req);
9393
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
9494

95-
if (MPI_SUCCESS != c_ierr) {
95+
if (MPI_SUCCESS == c_ierr) {
9696
*request = PMPI_Request_c2f(c_req);
9797
}
9898
}

0 commit comments

Comments
 (0)