Skip to content

v3.1.x: fortran: Fix PMPI bugs in mpi_f08 module #4690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 17, 2018
Merged

v3.1.x: fortran: Fix PMPI bugs in mpi_f08 module #4690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
985c490
Add missing Fortran 2008 binding subroutines
yanagibashi Dec 21, 2017
d1b78eb
fortran: Remove ASYNCHRONOUS from mpi_f08 pmpi
kawashima-fj Dec 26, 2017
410fb5e
fortran: Change `PMPI_Aint_{add,diff}` to functions.
kawashima-fj Dec 26, 2017
0804aca
fortran: Use `C_PTR` for `buffer_addr`
kawashima-fj Dec 26, 2017
6a24adf
fortran: Correct type of `info_used`
kawashima-fj Dec 26, 2017
b3f1fc8
fortran: Align indentation
kawashima-fj Dec 26, 2017
4016253
fortran: Call PMPI from PMPI_Status_set_cancelled_f08
kawashima-fj Dec 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ompi/mpi/fortran/use-mpi-f08/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
# Copyright (c) 2015-2017 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# Copyright (c) 2016 IBM Corporation. All rights reserved.
# Copyright (c) 2017 FUJITSU LIMITED. All rights reserved.
#
# $COPYRIGHT$
#
Expand Down Expand Up @@ -533,9 +534,13 @@ pmpi_api_files = \
profile/pfile_get_view_f08.F90 \
profile/pfile_iread_at_f08.F90 \
profile/pfile_iread_f08.F90 \
profile/pfile_iread_at_all_f08.F90 \
profile/pfile_iread_all_f08.F90 \
profile/pfile_iread_shared_f08.F90 \
profile/pfile_iwrite_at_f08.F90 \
profile/pfile_iwrite_f08.F90 \
profile/pfile_iwrite_at_all_f08.F90 \
profile/pfile_iwrite_all_f08.F90 \
profile/pfile_iwrite_shared_f08.F90 \
profile/pfile_open_f08.F90 \
profile/pfile_preallocate_f08.F90 \
Expand Down
21 changes: 11 additions & 10 deletions ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-interfaces.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
! Copyright (c) 2012 Inria. All rights reserved.
! Copyright (c) 2015-2017 Research Organization for Information Science
! and Technology (RIST). All rights reserved.
! Copyright (c) 2017 FUJITSU LIMITED. All rights reserved.
! $COPYRIGHT$
!
! This file provides the interface specifications for the MPI Fortran
Expand Down Expand Up @@ -2101,7 +2102,7 @@ subroutine MPI_Type_set_name_f08(datatype,type_name,ierror)
end subroutine MPI_Type_set_name_f08
end interface MPI_Type_set_name

interface MPI_Win_allocate
interface MPI_Win_allocate
subroutine MPI_Win_allocate_f08(size, disp_unit, info, comm, &
baseptr, win, ierror)
USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
Expand All @@ -2114,9 +2115,9 @@ subroutine MPI_Win_allocate_f08(size, disp_unit, info, comm, &
TYPE(MPI_Win), INTENT(OUT) :: win
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
end subroutine MPI_Win_allocate_f08
end interface MPI_Win_allocate
end interface MPI_Win_allocate

interface MPI_Win_allocate_shared
interface MPI_Win_allocate_shared
subroutine MPI_Win_allocate_shared_f08(size, disp_unit, info, comm, &
baseptr, win, ierror)
USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
Expand All @@ -2129,7 +2130,7 @@ subroutine MPI_Win_allocate_shared_f08(size, disp_unit, info, comm, &
TYPE(MPI_Win), INTENT(OUT) :: win
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
end subroutine MPI_Win_allocate_shared_f08
end interface MPI_Win_allocate_shared
end interface MPI_Win_allocate_shared

interface MPI_Win_create_keyval
subroutine MPI_Win_create_keyval_f08(win_copy_attr_fn,win_delete_attr_fn,win_keyval, &
Expand Down Expand Up @@ -2465,7 +2466,7 @@ function MPI_Wtick_f08( ) BIND(C,name="MPI_Wtick")
use, intrinsic :: ISO_C_BINDING
implicit none
DOUBLE PRECISION :: MPI_Wtick_f08
end function MPI_Wtick_f08
end function MPI_Wtick_f08
end interface MPI_Wtick

! MPI_Wtime is not a wrapper function
Expand All @@ -2475,7 +2476,7 @@ function MPI_Wtime_f08( ) BIND(C,name="MPI_Wtime")
use, intrinsic :: ISO_C_BINDING
implicit none
DOUBLE PRECISION :: MPI_Wtime_f08
end function MPI_Wtime_f08
end function MPI_Wtime_f08
end interface MPI_Wtime

interface MPI_Aint_add
Expand All @@ -2485,7 +2486,7 @@ function MPI_Aint_add_f08(base,diff)
INTEGER(MPI_ADDRESS_KIND) :: base
INTEGER(MPI_ADDRESS_KIND) :: diff
INTEGER(MPI_ADDRESS_KIND) :: MPI_Aint_add_f08
end function MPI_Aint_add_f08
end function MPI_Aint_add_f08
end interface MPI_Aint_add

interface MPI_Aint_diff
Expand All @@ -2495,7 +2496,7 @@ function MPI_Aint_diff_f08(addr1,addr2)
INTEGER(MPI_ADDRESS_KIND) :: addr1
INTEGER(MPI_ADDRESS_KIND) :: addr2
INTEGER(MPI_ADDRESS_KIND) :: MPI_Aint_diff_f08
end function MPI_Aint_diff_f08
end function MPI_Aint_diff_f08
end interface MPI_Aint_diff

interface MPI_Abort
Expand Down Expand Up @@ -3336,7 +3337,7 @@ subroutine MPI_Win_post_f08(group,assert,win,ierror)
end subroutine MPI_Win_post_f08
end interface MPI_Win_post

interface MPI_Win_shared_query
interface MPI_Win_shared_query
subroutine MPI_Win_shared_query_f08(win, rank, size, disp_unit, baseptr,&
ierror)
USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
Expand All @@ -3348,7 +3349,7 @@ subroutine MPI_Win_shared_query_f08(win, rank, size, disp_unit, baseptr,&
TYPE(C_PTR), INTENT(OUT) :: baseptr
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
end subroutine MPI_Win_shared_query_f08
end interface
end interface MPI_Win_shared_query

interface MPI_Win_start
subroutine MPI_Win_start_f08(group,assert,win,ierror)
Expand Down
Loading