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

Commit 1d9de8d

Browse files
edgargabrieledgargabriel
committed
make the f08 interface actually compile.
1 parent 18a4969 commit 1d9de8d

File tree

4 files changed

+244
-0
lines changed

4 files changed

+244
-0
lines changed

‎ompi/mpi/fortran/use-mpi-f08/mpi-f-interfaces-bind.h‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2731,6 +2731,30 @@ subroutine ompi_file_iread_at_f(fh,offset,buf,count,datatype,request,ierror) &
27312731
INTEGER, INTENT(OUT) :: ierror
27322732
end subroutine ompi_file_iread_at_f
27332733

2734+
subroutine ompi_file_iread_all_f(fh,buf,count,datatype,request,ierror) &
2735+
BIND(C, name="ompi_file_iread_all_f")
2736+
implicit none
2737+
INTEGER, INTENT(IN) :: fh
2738+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
2739+
INTEGER, INTENT(IN) :: count
2740+
INTEGER, INTENT(IN) :: datatype
2741+
INTEGER, INTENT(OUT) :: request
2742+
INTEGER, INTENT(OUT) :: ierror
2743+
end subroutine ompi_file_iread_all_f
2744+
2745+
subroutine ompi_file_iread_at_all_f(fh,offset,buf,count,datatype,request,ierror) &
2746+
BIND(C, name="ompi_file_iread_at_all_f")
2747+
use :: mpi_f08_types, only : MPI_OFFSET_KIND
2748+
implicit none
2749+
INTEGER, INTENT(IN) :: fh
2750+
INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
2751+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
2752+
INTEGER, INTENT(IN) :: count
2753+
INTEGER, INTENT(IN) :: datatype
2754+
INTEGER, INTENT(OUT) :: request
2755+
INTEGER, INTENT(OUT) :: ierror
2756+
end subroutine ompi_file_iread_at_all_f
2757+
27342758
subroutine ompi_file_iread_shared_f(fh,buf,count,datatype,request,ierror) &
27352759
BIND(C, name="ompi_file_iread_shared_f")
27362760
implicit none
@@ -2766,6 +2790,30 @@ subroutine ompi_file_iwrite_at_f(fh,offset,buf,count,datatype,request,ierror) &
27662790
INTEGER, INTENT(OUT) :: ierror
27672791
end subroutine ompi_file_iwrite_at_f
27682792

2793+
subroutine ompi_file_iwrite_all_f(fh,buf,count,datatype,request,ierror) &
2794+
BIND(C, name="ompi_file_iwrite_all_f")
2795+
implicit none
2796+
INTEGER, INTENT(IN) :: fh
2797+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
2798+
INTEGER, INTENT(IN) :: count
2799+
INTEGER, INTENT(IN) :: datatype
2800+
INTEGER, INTENT(OUT) :: request
2801+
INTEGER, INTENT(OUT) :: ierror
2802+
end subroutine ompi_file_iwrite_all_f
2803+
2804+
subroutine ompi_file_iwrite_at_all_f(fh,offset,buf,count,datatype,request,ierror) &
2805+
BIND(C, name="ompi_file_iwrite_at_all_f")
2806+
use :: mpi_f08_types, only : MPI_OFFSET_KIND
2807+
implicit none
2808+
INTEGER, INTENT(IN) :: fh
2809+
INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
2810+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
2811+
INTEGER, INTENT(IN) :: count
2812+
INTEGER, INTENT(IN) :: datatype
2813+
INTEGER, INTENT(OUT) :: request
2814+
INTEGER, INTENT(OUT) :: ierror
2815+
end subroutine ompi_file_iwrite_at_all_f
2816+
27692817
subroutine ompi_file_iwrite_shared_f(fh,buf,count,datatype,request,ierror) &
27702818
BIND(C, name="ompi_file_iwrite_shared_f")
27712819
implicit none

‎ompi/mpi/fortran/use-mpi-f08/mpi-f08-interfaces.F90‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3679,6 +3679,43 @@ subroutine MPI_File_iread_at_f08(fh,offset,buf,count,datatype,request,ierror)
36793679
end subroutine MPI_File_iread_at_f08
36803680
end interface MPI_File_iread_at
36813681

3682+
interface MPI_File_iread_all
3683+
subroutine MPI_File_iread_all_f08(fh,buf,count,datatype,request,ierror)
3684+
use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
3685+
implicit none
3686+
TYPE(MPI_File), INTENT(IN) :: fh
3687+
!DEC$ ATTRIBUTES NO_ARG_CHECK :: buf
3688+
!GCC$ ATTRIBUTES NO_ARG_CHECK :: buf
3689+
!$PRAGMA IGNORE_TKR buf
3690+
!DIR$ IGNORE_TKR buf
3691+
!IBM* IGNORE_TKR buf
3692+
OMPI_FORTRAN_IGNORE_TKR_TYPE :: buf
3693+
INTEGER, INTENT(IN) :: count
3694+
TYPE(MPI_Datatype), INTENT(IN) :: datatype
3695+
TYPE(MPI_Request), INTENT(OUT) :: request
3696+
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
3697+
end subroutine MPI_File_iread_all_f08
3698+
end interface MPI_File_iread_all
3699+
3700+
interface MPI_File_iread_at_all
3701+
subroutine MPI_File_iread_at_all_f08(fh,offset,buf,count,datatype,request,ierror)
3702+
use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request, MPI_OFFSET_KIND
3703+
implicit none
3704+
TYPE(MPI_File), INTENT(IN) :: fh
3705+
INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
3706+
!DEC$ ATTRIBUTES NO_ARG_CHECK :: buf
3707+
!GCC$ ATTRIBUTES NO_ARG_CHECK :: buf
3708+
!$PRAGMA IGNORE_TKR buf
3709+
!DIR$ IGNORE_TKR buf
3710+
!IBM* IGNORE_TKR buf
3711+
OMPI_FORTRAN_IGNORE_TKR_TYPE :: buf
3712+
INTEGER, INTENT(IN) :: count
3713+
TYPE(MPI_Datatype), INTENT(IN) :: datatype
3714+
TYPE(MPI_Request), INTENT(OUT) :: request
3715+
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
3716+
end subroutine MPI_File_iread_at_all_f08
3717+
end interface MPI_File_iread_at_all
3718+
36823719
interface MPI_File_iread_shared
36833720
subroutine MPI_File_iread_shared_f08(fh,buf,count,datatype,request,ierror)
36843721
use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
@@ -3734,6 +3771,43 @@ subroutine MPI_File_iwrite_at_f08(fh,offset,buf,count,datatype,request,ierror)
37343771
end subroutine MPI_File_iwrite_at_f08
37353772
end interface MPI_File_iwrite_at
37363773

3774+
interface MPI_File_iwrite_all
3775+
subroutine MPI_File_iwrite_all_f08(fh,buf,count,datatype,request,ierror)
3776+
use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
3777+
implicit none
3778+
TYPE(MPI_File), INTENT(IN) :: fh
3779+
!DEC$ ATTRIBUTES NO_ARG_CHECK :: buf
3780+
!GCC$ ATTRIBUTES NO_ARG_CHECK :: buf
3781+
!$PRAGMA IGNORE_TKR buf
3782+
!DIR$ IGNORE_TKR buf
3783+
!IBM* IGNORE_TKR buf
3784+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
3785+
INTEGER, INTENT(IN) :: count
3786+
TYPE(MPI_Datatype), INTENT(IN) :: datatype
3787+
TYPE(MPI_Request), INTENT(OUT) :: request
3788+
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
3789+
end subroutine MPI_File_iwrite_all_f08
3790+
end interface MPI_File_iwrite_all
3791+
3792+
interface MPI_File_iwrite_at_all
3793+
subroutine MPI_File_iwrite_at_all_f08(fh,offset,buf,count,datatype,request,ierror)
3794+
use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request, MPI_OFFSET_KIND
3795+
implicit none
3796+
TYPE(MPI_File), INTENT(IN) :: fh
3797+
INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
3798+
!DEC$ ATTRIBUTES NO_ARG_CHECK :: buf
3799+
!GCC$ ATTRIBUTES NO_ARG_CHECK :: buf
3800+
!$PRAGMA IGNORE_TKR buf
3801+
!DIR$ IGNORE_TKR buf
3802+
!IBM* IGNORE_TKR buf
3803+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
3804+
INTEGER, INTENT(IN) :: count
3805+
TYPE(MPI_Datatype), INTENT(IN) :: datatype
3806+
TYPE(MPI_Request), INTENT(OUT) :: request
3807+
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
3808+
end subroutine MPI_File_iwrite_at_all_f08
3809+
end interface MPI_File_iwrite_at_all
3810+
37373811
interface MPI_File_iwrite_shared
37383812
subroutine MPI_File_iwrite_shared_f08(fh,buf,count,datatype,request,ierror)
37393813
use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request

‎ompi/mpi/fortran/use-mpi-f08/pmpi-f-interfaces-bind.h‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2516,6 +2516,30 @@ subroutine pompi_file_iread_at_f(fh,offset,buf,count,datatype,request,ierror) &
25162516
INTEGER, INTENT(OUT) :: ierror
25172517
end subroutine pompi_file_iread_at_f
25182518

2519+
subroutine pompi_file_iread_all_f(fh,buf,count,datatype,request,ierror) &
2520+
BIND(C, name="pompi_file_iread_all_f")
2521+
implicit none
2522+
INTEGER, INTENT(IN) :: fh
2523+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
2524+
INTEGER, INTENT(IN) :: count
2525+
INTEGER, INTENT(IN) :: datatype
2526+
INTEGER, INTENT(OUT) :: request
2527+
INTEGER, INTENT(OUT) :: ierror
2528+
end subroutine pompi_file_iread_all_f
2529+
2530+
subroutine pompi_file_iread_at_all_f(fh,offset,buf,count,datatype,request,ierror) &
2531+
BIND(C, name="pompi_file_iread_at_all_f")
2532+
use :: mpi_f08_types, only : MPI_OFFSET_KIND
2533+
implicit none
2534+
INTEGER, INTENT(IN) :: fh
2535+
INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
2536+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
2537+
INTEGER, INTENT(IN) :: count
2538+
INTEGER, INTENT(IN) :: datatype
2539+
INTEGER, INTENT(OUT) :: request
2540+
INTEGER, INTENT(OUT) :: ierror
2541+
end subroutine pompi_file_iread_at_all_f
2542+
25192543
subroutine pompi_file_iread_shared_f(fh,buf,count,datatype,request,ierror) &
25202544
BIND(C, name="pompi_file_iread_shared_f")
25212545
implicit none
@@ -2551,6 +2575,30 @@ subroutine pompi_file_iwrite_at_f(fh,offset,buf,count,datatype,request,ierror) &
25512575
INTEGER, INTENT(OUT) :: ierror
25522576
end subroutine pompi_file_iwrite_at_f
25532577

2578+
subroutine pompi_file_iwrite_all_f(fh,buf,count,datatype,request,ierror) &
2579+
BIND(C, name="pompi_file_iwrite_all_f")
2580+
implicit none
2581+
INTEGER, INTENT(IN) :: fh
2582+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
2583+
INTEGER, INTENT(IN) :: count
2584+
INTEGER, INTENT(IN) :: datatype
2585+
INTEGER, INTENT(OUT) :: request
2586+
INTEGER, INTENT(OUT) :: ierror
2587+
end subroutine pompi_file_iwrite_all_f
2588+
2589+
subroutine pompi_file_iwrite_at_all_f(fh,offset,buf,count,datatype,request,ierror) &
2590+
BIND(C, name="pompi_file_iwrite_at_all_f")
2591+
use :: mpi_f08_types, only : MPI_OFFSET_KIND
2592+
implicit none
2593+
INTEGER, INTENT(IN) :: fh
2594+
INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
2595+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
2596+
INTEGER, INTENT(IN) :: count
2597+
INTEGER, INTENT(IN) :: datatype
2598+
INTEGER, INTENT(OUT) :: request
2599+
INTEGER, INTENT(OUT) :: ierror
2600+
end subroutine pompi_file_iwrite_at_all_f
2601+
25542602
subroutine pompi_file_iwrite_shared_f(fh,buf,count,datatype,request,ierror) &
25552603
BIND(C, name="pompi_file_iwrite_shared_f")
25562604
implicit none

‎ompi/mpi/fortran/use-mpi-f08/pmpi-f08-interfaces.F90‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3576,6 +3576,43 @@ subroutine PMPI_File_iread_at_f08(fh,offset,buf,count,datatype,request,ierror)
35763576
end subroutine PMPI_File_iread_at_f08
35773577
end interface PMPI_File_iread_at
35783578

3579+
interface PMPI_File_iread_all
3580+
subroutine PMPI_File_iread_all_f08(fh,buf,count,datatype,request,ierror)
3581+
use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
3582+
implicit none
3583+
TYPE(MPI_File), INTENT(IN) :: fh
3584+
!DEC$ ATTRIBUTES NO_ARG_CHECK :: buf
3585+
!GCC$ ATTRIBUTES NO_ARG_CHECK :: buf
3586+
!$PRAGMA IGNORE_TKR buf
3587+
!DIR$ IGNORE_TKR buf
3588+
!IBM* IGNORE_TKR buf
3589+
OMPI_FORTRAN_IGNORE_TKR_TYPE OMPI_ASYNCHRONOUS :: buf
3590+
INTEGER, INTENT(IN) :: count
3591+
TYPE(MPI_Datatype), INTENT(IN) :: datatype
3592+
TYPE(MPI_Request), INTENT(OUT) :: request
3593+
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
3594+
end subroutine PMPI_File_iread_all_f08
3595+
end interface PMPI_File_iread_all
3596+
3597+
interface PMPI_File_iread_at_all
3598+
subroutine PMPI_File_iread_at_all_f08(fh,offset,buf,count,datatype,request,ierror)
3599+
use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request, MPI_OFFSET_KIND
3600+
implicit none
3601+
TYPE(MPI_File), INTENT(IN) :: fh
3602+
INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
3603+
!DEC$ ATTRIBUTES NO_ARG_CHECK :: buf
3604+
!GCC$ ATTRIBUTES NO_ARG_CHECK :: buf
3605+
!$PRAGMA IGNORE_TKR buf
3606+
!DIR$ IGNORE_TKR buf
3607+
!IBM* IGNORE_TKR buf
3608+
OMPI_FORTRAN_IGNORE_TKR_TYPE OMPI_ASYNCHRONOUS :: buf
3609+
INTEGER, INTENT(IN) :: count
3610+
TYPE(MPI_Datatype), INTENT(IN) :: datatype
3611+
TYPE(MPI_Request), INTENT(OUT) :: request
3612+
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
3613+
end subroutine PMPI_File_iread_at_all_f08
3614+
end interface PMPI_File_iread_at_all
3615+
35793616
interface PMPI_File_iread_shared
35803617
subroutine PMPI_File_iread_shared_f08(fh,buf,count,datatype,request,ierror)
35813618
use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
@@ -3631,6 +3668,43 @@ subroutine PMPI_File_iwrite_at_f08(fh,offset,buf,count,datatype,request,ierror)
36313668
end subroutine PMPI_File_iwrite_at_f08
36323669
end interface PMPI_File_iwrite_at
36333670

3671+
interface PMPI_File_iwrite_all
3672+
subroutine PMPI_File_iwrite_all_f08(fh,buf,count,datatype,request,ierror)
3673+
use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
3674+
implicit none
3675+
TYPE(MPI_File), INTENT(IN) :: fh
3676+
!DEC$ ATTRIBUTES NO_ARG_CHECK :: buf
3677+
!GCC$ ATTRIBUTES NO_ARG_CHECK :: buf
3678+
!$PRAGMA IGNORE_TKR buf
3679+
!DIR$ IGNORE_TKR buf
3680+
!IBM* IGNORE_TKR buf
3681+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: buf
3682+
INTEGER, INTENT(IN) :: count
3683+
TYPE(MPI_Datatype), INTENT(IN) :: datatype
3684+
TYPE(MPI_Request), INTENT(OUT) :: request
3685+
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
3686+
end subroutine PMPI_File_iwrite_all_f08
3687+
end interface PMPI_File_iwrite_all
3688+
3689+
interface PMPI_File_iwrite_at_all
3690+
subroutine PMPI_File_iwrite_at_all_f08(fh,offset,buf,count,datatype,request,ierror)
3691+
use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request, MPI_OFFSET_KIND
3692+
implicit none
3693+
TYPE(MPI_File), INTENT(IN) :: fh
3694+
INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
3695+
!DEC$ ATTRIBUTES NO_ARG_CHECK :: buf
3696+
!GCC$ ATTRIBUTES NO_ARG_CHECK :: buf
3697+
!$PRAGMA IGNORE_TKR buf
3698+
!DIR$ IGNORE_TKR buf
3699+
!IBM* IGNORE_TKR buf
3700+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: buf
3701+
INTEGER, INTENT(IN) :: count
3702+
TYPE(MPI_Datatype), INTENT(IN) :: datatype
3703+
TYPE(MPI_Request), INTENT(OUT) :: request
3704+
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
3705+
end subroutine PMPI_File_iwrite_at_all_f08
3706+
end interface PMPI_File_iwrite_at_all
3707+
36343708
interface PMPI_File_iwrite_shared
36353709
subroutine PMPI_File_iwrite_shared_f08(fh,buf,count,datatype,request,ierror)
36363710
use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request

0 commit comments

Comments
 (0)