Skip to content

Commit 304c014

Browse files
committed
use-mpi-f08: fix rma function signatures
The various RMA functions need to have the asynchronous property on all buffers. This property was missing and some buffers were incorrectly marked as intent(in). This commit fixes the function signatures. Signed-off-by: Nathan Hjelm <[email protected]> (cherry picked from commit 1c75aa8) Signed-off-by: Nathan Hjelm <[email protected]>
1 parent 7848d55 commit 304c014

File tree

10 files changed

+15
-15
lines changed

10 files changed

+15
-15
lines changed

ompi/mpi/fortran/use-mpi-f08/accumulate_f08.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ subroutine MPI_Accumulate_f08(origin_addr,origin_count,origin_datatype,&
1313
use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_ADDRESS_KIND
1414
use :: mpi_f08, only : ompi_accumulate_f
1515
implicit none
16-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: origin_addr
16+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr
1717
INTEGER, INTENT(IN) :: origin_count, target_rank, target_count
1818
TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype
1919
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp

ompi/mpi/fortran/use-mpi-f08/compare_and_swap_f08.F90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ subroutine MPI_Compare_and_swap_f08(origin_addr,compare_addr,result_addr,&
1313
use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_ADDRESS_KIND
1414
use :: mpi_f08, only : ompi_compare_and_swap_f
1515
implicit none
16-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: origin_addr, compare_addr
17-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: result_addr
16+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr, compare_addr
17+
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: result_addr
1818
TYPE(MPI_Datatype), INTENT(IN) :: datatype
1919
INTEGER, INTENT(IN) :: target_rank
2020
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp

ompi/mpi/fortran/use-mpi-f08/fetch_and_op_f08.F90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ subroutine MPI_Fetch_and_op_f08(origin_addr,result_addr,datatype,target_rank, &
1212
use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_ADDRESS_KIND
1313
use :: mpi_f08, only : ompi_fetch_and_op_f
1414
implicit none
15-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: origin_addr
16-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: result_addr
15+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr
16+
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: result_addr
1717
TYPE(MPI_Datatype), INTENT(IN) :: datatype
1818
INTEGER, INTENT(IN) :: target_rank
1919
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp

ompi/mpi/fortran/use-mpi-f08/get_accumulate_f08.F90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ subroutine MPI_Get_accumulate_f08(origin_addr,origin_count,origin_datatype,&
1414
use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_ADDRESS_KIND
1515
use :: mpi_f08, only : ompi_get_accumulate_f
1616
implicit none
17-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: origin_addr
17+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr
1818
INTEGER, INTENT(IN) :: origin_count, result_count, target_rank, target_count
1919
TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype
20-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: result_addr
20+
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: result_addr
2121
TYPE(MPI_Datatype), INTENT(IN) :: result_datatype
2222
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp
2323
TYPE(MPI_Datatype), INTENT(IN) :: target_datatype

ompi/mpi/fortran/use-mpi-f08/get_f08.F90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
! -*- f90 -*-
22
!
33
! Copyright (c) 2010-2012 Cisco Systems, Inc. All rights reserved.
4-
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
4+
! Copyright (c) 2009-2018 Los Alamos National Security, LLC.
55
! All Rights reserved.
66
! $COPYRIGHT$
77

@@ -12,7 +12,7 @@ subroutine MPI_Get_f08(origin_addr,origin_count,origin_datatype,target_rank,&
1212
use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_ADDRESS_KIND
1313
use :: mpi_f08, only : ompi_get_f
1414
implicit none
15-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: origin_addr
15+
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: origin_addr
1616
INTEGER, INTENT(IN) :: origin_count, target_rank, target_count
1717
TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype
1818
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp

ompi/mpi/fortran/use-mpi-f08/put_f08.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ subroutine MPI_Put_f08(origin_addr,origin_count,origin_datatype,target_rank,&
1212
use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_ADDRESS_KIND
1313
use :: mpi_f08, only : ompi_put_f
1414
implicit none
15-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: origin_addr
15+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr
1616
INTEGER, INTENT(IN) :: origin_count, target_rank, target_count
1717
TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype
1818
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp

ompi/mpi/fortran/use-mpi-f08/raccumulate_f08.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ subroutine MPI_Raccumulate_f08(origin_addr,origin_count,origin_datatype,&
1313
use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_Request, MPI_ADDRESS_KIND
1414
use :: mpi_f08, only : ompi_raccumulate_f
1515
implicit none
16-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: origin_addr
16+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN),ASYNCHRONOUS :: origin_addr
1717
INTEGER, INTENT(IN) :: origin_count, target_rank, target_count
1818
TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype
1919
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp

ompi/mpi/fortran/use-mpi-f08/rget_accumulate_f08.F90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ subroutine MPI_Rget_accumulate_f08(origin_addr,origin_count,origin_datatype,&
1414
use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_Request, MPI_ADDRESS_KIND
1515
use :: mpi_f08, only : ompi_rget_accumulate_f
1616
implicit none
17-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: origin_addr
17+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr
1818
INTEGER, INTENT(IN) :: origin_count, result_count, target_rank, target_count
1919
TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype
20-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: result_addr
20+
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: result_addr
2121
TYPE(MPI_Datatype), INTENT(IN) :: result_datatype
2222
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp
2323
TYPE(MPI_Datatype), INTENT(IN) :: target_datatype

ompi/mpi/fortran/use-mpi-f08/rget_f08.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ subroutine MPI_Rget_f08(origin_addr,origin_count,origin_datatype,target_rank,&
1212
use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_Request, MPI_ADDRESS_KIND
1313
use :: mpi_f08, only : ompi_rget_f
1414
implicit none
15-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: origin_addr
15+
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: origin_addr
1616
INTEGER, INTENT(IN) :: origin_count, target_rank, target_count
1717
TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype
1818
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp

ompi/mpi/fortran/use-mpi-f08/rput_f08.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ subroutine MPI_Rput_f08(origin_addr,origin_count,origin_datatype,target_rank,&
1212
use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_Request, MPI_ADDRESS_KIND
1313
use :: mpi_f08, only : ompi_rput_f
1414
implicit none
15-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: origin_addr
15+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr
1616
INTEGER, INTENT(IN) :: origin_count, target_rank, target_count
1717
TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype
1818
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp

0 commit comments

Comments
 (0)