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

Commit 60e9b26

Browse files
author
rhc54
authored
Merge pull request #1271 from hjelmn/v1.10_f_ops
ompi/fortran: fix typos in request RMA bindings
2 parents 9acf492 + 50fffd3 commit 60e9b26

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

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

Lines changed: 3 additions & 3 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$
1717
*
@@ -94,7 +94,7 @@ void ompi_raccumulate_f(char *origin_addr, MPI_Fint *origin_count,
9494

9595
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c);
9696

97-
if (MPI_SUCCESS != ierr_c) {
98-
*request = MPI_Request_c2f(c_req);
97+
if (MPI_SUCCESS == ierr_c) {
98+
*request = PMPI_Request_c2f(c_req);
9999
}
100100
}

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

Lines changed: 3 additions & 3 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 FUJITSU LIMITED. All rights reserved.
1717
* $COPYRIGHT$
@@ -98,7 +98,7 @@ void ompi_rget_accumulate_f(char *origin_addr, MPI_Fint *origin_count,
9898
c_target_datatype, c_op, c_win, &c_req);
9999
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
100100

101-
if (MPI_SUCCESS != c_ierr) {
102-
*request = MPI_Request_c2f(c_req);
101+
if (MPI_SUCCESS == c_ierr) {
102+
*request = PMPI_Request_c2f(c_req);
103103
}
104104
}

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

Lines changed: 3 additions & 3 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$
1717
*
@@ -90,7 +90,7 @@ void ompi_rget_f(char *origin_addr, MPI_Fint *origin_count,
9090
c_target_datatype, c_win, &c_req);
9191
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
9292

93-
if (MPI_SUCCESS != c_ierr) {
94-
*request = MPI_Request_c2f(c_req);
93+
if (MPI_SUCCESS == c_ierr) {
94+
*request = PMPI_Request_c2f(c_req);
9595
}
9696
}

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

Lines changed: 3 additions & 3 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$
1717
*
@@ -90,7 +90,7 @@ void ompi_rput_f(char *origin_addr, MPI_Fint *origin_count,
9090
c_target_datatype, c_win, &c_req);
9191
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
9292

93-
if (MPI_SUCCESS != c_ierr) {
94-
*request = MPI_Request_c2f(c_req);
93+
if (MPI_SUCCESS == c_ierr) {
94+
*request = PMPI_Request_c2f(c_req);
9595
}
9696
}

0 commit comments

Comments
 (0)