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

Commit 7b8ef0a

Browse files
author
rhc54
committed
Merge pull request #552 from Zhiming-Wang/v1.10
Merge pull request #835 into branch v1.10
2 parents 21b19ac + 6639604 commit 7b8ef0a

File tree

5 files changed

+15
-6
lines changed

5 files changed

+15
-6
lines changed

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ [email protected] Wesley Bland UTK
117117
[email protected] Yael Dalen Mellanox
118118
[email protected] Yossi Etigin Mellanox
119119
[email protected] Weikuan Yu LANL, OSU
120+
[email protected] Zhiming Wang IBM
120121
------------------------------- --------------------------- -------------------
121122

122123
Affiliation abbreviations:

ompi/mpi/fortran/use-mpi-f08/buffer_detach.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
OMPI_DECLSPEC void ompi_buffer_detach_f08(char *buffer, MPI_Fint *size,
3333
MPI_Fint *ierr);
3434

35+
OMPI_DECLSPEC void pompi_buffer_detach_f08(char *buffer, MPI_Fint *size,
36+
MPI_Fint *ierr);
37+
3538
/* (this comment is repeated in ompi/mpi/fortran/mpif-h/buffer_detach_f.c)
3639
*
3740
* MPI-3.1 section 3.6, page 45, states that the mpif.h and mpi module
@@ -65,3 +68,8 @@ void ompi_buffer_detach_f08(char *buffer, MPI_Fint *size, MPI_Fint *ierr)
6568
*(void **)buffer = dummy;
6669
}
6770
}
71+
72+
void pompi_buffer_detach_f08(char *buffer, MPI_Fint *size, MPI_Fint *ierr)
73+
{
74+
ompi_buffer_detach_f08(buffer, size, ierr);
75+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1366,7 +1366,7 @@ subroutine ompi_comm_set_attr_f(comm,comm_keyval,attribute_val,ierror) &
13661366
end subroutine ompi_comm_set_attr_f
13671367

13681368
subroutine ompi_comm_set_info_f(comm,info,ierror) &
1369-
BIND(C, name="ompi_comm_get_info_f")
1369+
BIND(C, name="ompi_comm_set_info_f")
13701370
implicit none
13711371
INTEGER, INTENT(IN) :: comm
13721372
INTEGER, INTENT(IN) :: info

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ end subroutine pompi_buffer_attach_f
9898
! us; they can just both be bound to the same back-end
9999
! ompi_buffer_detach_f08 C function.
100100
subroutine pompi_buffer_detach_f(buffer_addr,size,ierror) &
101-
BIND(C, name="ompi_buffer_detach_f08")
101+
BIND(C, name="pompi_buffer_detach_f08")
102102
implicit none
103103
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buffer_addr
104104
INTEGER, INTENT(OUT) :: size
@@ -1416,7 +1416,7 @@ subroutine pompi_type_set_name_f(type,type_name,ierror,type_name_len) &
14161416
end subroutine pompi_type_set_name_f
14171417

14181418
subroutine pompi_win_allocate_f(size, disp_unit, info, comm, &
1419-
baseptr, win, ierror) BIND(C, name="ompi_win_allocate_f")
1419+
baseptr, win, ierror) BIND(C, name="pompi_win_allocate_f")
14201420
USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
14211421
use :: mpi_f08_types, only : MPI_ADDRESS_KIND
14221422
INTEGER(KIND=MPI_ADDRESS_KIND), INTENT(IN) :: size
@@ -1429,7 +1429,7 @@ subroutine pompi_win_allocate_f(size, disp_unit, info, comm, &
14291429
end subroutine pompi_win_allocate_f
14301430

14311431
subroutine pompi_win_allocate_shared_f(size, disp_unit, info, comm, &
1432-
baseptr, win, ierror) BIND(C, name="ompi_win_allocate_shared_f")
1432+
baseptr, win, ierror) BIND(C, name="pompi_win_allocate_shared_f")
14331433
USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
14341434
use :: mpi_f08_types, only : MPI_ADDRESS_KIND
14351435
INTEGER(KIND=MPI_ADDRESS_KIND), INTENT(IN) :: size

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2413,7 +2413,7 @@ end subroutine PMPI_Topo_test_f08
24132413
! MPI_Wtick is not a wrapper function
24142414
!
24152415
interface PMPI_Wtick
2416-
function PMPI_Wtick_f08( ) BIND(C,name="MPI_Wtick")
2416+
function PMPI_Wtick_f08( ) BIND(C,name="PMPI_Wtick")
24172417
use, intrinsic :: ISO_C_BINDING
24182418
implicit none
24192419
DOUBLE PRECISION :: PMPI_Wtick_f08
@@ -2423,7 +2423,7 @@ end function PMPI_Wtick_f08
24232423
! MPI_Wtime is not a wrapper function
24242424
!
24252425
interface PMPI_Wtime
2426-
function PMPI_Wtime_f08( ) BIND(C,name="MPI_Wtime")
2426+
function PMPI_Wtime_f08( ) BIND(C,name="PMPI_Wtime")
24272427
use, intrinsic :: ISO_C_BINDING
24282428
implicit none
24292429
DOUBLE PRECISION :: PMPI_Wtime_f08

0 commit comments

Comments
 (0)