Skip to content

Commit 92cd6a9

Browse files
ggouaillardetggouaillardet
committed
fortran/use-mpi-f08: bsend/ibsend/bsend_init
Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
1 parent 4c9b4ba commit 92cd6a9

File tree

14 files changed

+215
-30
lines changed

14 files changed

+215
-30
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,19 +164,19 @@
164164
interface
165165

166166
subroutine ompi_bsend_f(buf,count,datatype,dest,tag,comm,ierror) &
167-
BIND(C, name="ompi_bsend_f")
167+
BIND(C, name="ompi_bsend_@OMPI_F08_BINDINGS_EXTENSION@")
168168
implicit none
169-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
169+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: buf
170170
INTEGER, INTENT(IN) :: count, dest, tag
171171
INTEGER, INTENT(IN) :: datatype
172172
INTEGER, INTENT(IN) :: comm
173173
INTEGER, INTENT(OUT) :: ierror
174174
end subroutine ompi_bsend_f
175175

176176
subroutine ompi_bsend_init_f(buf,count,datatype,dest,tag,comm,request,ierror) &
177-
BIND(C, name="ompi_bsend_init_f")
177+
BIND(C, name="ompi_bsend_init_@OMPI_F08_BINDINGS_EXTENSION@")
178178
implicit none
179-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
179+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: buf
180180
INTEGER, INTENT(IN) :: count, dest, tag
181181
INTEGER, INTENT(IN) :: datatype
182182
INTEGER, INTENT(IN) :: comm
@@ -222,9 +222,9 @@ subroutine ompi_get_count_f(status,datatype,count,ierror) &
222222
end subroutine ompi_get_count_f
223223

224224
subroutine ompi_ibsend_f(buf,count,datatype,dest,tag,comm,request,ierror) &
225-
BIND(C, name="ompi_ibsend_f")
225+
BIND(C, name="ompi_ibsend_@OMPI_F08_BINDINGS_EXTENSION@")
226226
implicit none
227-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
227+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: buf
228228
INTEGER, INTENT(IN) :: count, dest, tag
229229
INTEGER, INTENT(IN) :: datatype
230230
INTEGER, INTENT(IN) :: comm

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
! Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
6-
! Copyright (c) 2018 Research Organization for Information Science
6+
! Copyright (c) 2018-2019 Research Organization for Information Science
77
! and Technology (RIST). All rights reserved.
88
! $COPYRIGHT$
99

@@ -13,7 +13,7 @@ subroutine MPI_Bsend_f08(buf,count,datatype,dest,tag,comm,ierror)
1313
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
1414
use :: ompi_mpifh_bindings, only : ompi_bsend_f
1515
implicit none
16-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
16+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: buf
1717
INTEGER, INTENT(IN) :: count, dest, tag
1818
TYPE(MPI_Datatype), INTENT(IN) :: datatype
1919
TYPE(MPI_Comm), INTENT(IN) :: comm

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
! Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
6-
! Copyright (c) 2018 Research Organization for Information Science
6+
! Copyright (c) 2018-2019 Research Organization for Information Science
77
! and Technology (RIST). All rights reserved.
88
! $COPYRIGHT$
99

@@ -13,7 +13,7 @@ subroutine MPI_Bsend_init_f08(buf,count,datatype,dest,tag,comm,request,ierror)
1313
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
1414
use :: ompi_mpifh_bindings, only : ompi_bsend_init_f
1515
implicit none
16-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
16+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: buf
1717
INTEGER, INTENT(IN) :: count, dest, tag
1818
TYPE(MPI_Datatype), INTENT(IN) :: datatype
1919
TYPE(MPI_Comm), INTENT(IN) :: comm

‎ompi/mpi/fortran/use-mpi-f08/cdesc/Makefile.am‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ libforce_usempif08_internal_cdesc_to_be_built_la_SOURCES = \
4242
bindings.h \
4343
cdesc.h \
4444
cdesc.c \
45+
\
46+
bsend_cdesc.c \
47+
bsend_init_cdesc.c \
48+
ibsend_cdesc.c \
4549
irecv_cdesc.c \
4650
isend_cdesc.c \
4751
issend_cdesc.c \

‎ompi/mpi/fortran/use-mpi-f08/cdesc/bindings.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,18 @@
1717

1818
#include "mpi.h"
1919

20+
void ompi_bsend_cdesc(CFI_cdesc_t* x, MPI_Fint *count, MPI_Fint *datatype,
21+
MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm,
22+
MPI_Fint *ierr);
23+
24+
void ompi_bsend_init_cdesc(CFI_cdesc_t* x, MPI_Fint *count, MPI_Fint *datatype,
25+
MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm,
26+
MPI_Fint *request, MPI_Fint *ierr);
27+
28+
void ompi_ibsend_cdesc(CFI_cdesc_t* x, MPI_Fint *count, MPI_Fint *datatype,
29+
MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm,
30+
MPI_Fint *request, MPI_Fint *ierr);
31+
2032
void ompi_irecv_cdesc(CFI_cdesc_t *x, MPI_Fint *count, MPI_Fint *datatype,
2133
MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm,
2234
MPI_Fint *request, MPI_Fint *ierr);

‎ompi/mpi/fortran/use-mpi-f08/cdesc/bsend_cdesc.c‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
/*
2+
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
3+
* University Research and Technology
4+
* Corporation. All rights reserved.
5+
* Copyright (c) 2004-2005 The University of Tennessee and The University
6+
* of Tennessee Research Foundation. All rights
7+
* reserved.
8+
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
9+
* University of Stuttgart. All rights reserved.
10+
* Copyright (c) 2004-2005 The Regents of the University of California.
11+
* All rights reserved.
12+
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
13+
* Copyright (c) 2015-2019 Research Organization for Information Science
14+
* and Technology (RIST). All rights reserved.
15+
* $COPYRIGHT$
16+
*
17+
* Additional copyrights may follow
18+
*
19+
* $HEADER$
20+
*/
21+
22+
#include "ompi_config.h"
23+
24+
#include "ompi/mpi/fortran/mpif-h/bindings.h"
25+
#include "ompi/mpi/fortran/use-mpi-f08/cdesc/bindings.h"
26+
#include "ompi/mpi/fortran/base/constants.h"
27+
28+
void ompi_bsend_cdesc(CFI_cdesc_t* x, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *ierr)
29+
{
30+
int c_ierr;
31+
MPI_Comm c_comm;
32+
MPI_Datatype c_datatype, c_type = PMPI_Type_f2c(*datatype);
33+
void *buf = x->base_addr;
34+
int c_count = OMPI_FINT_2_INT(*count);
35+
36+
c_comm = PMPI_Comm_f2c (*comm);
37+
38+
c_ierr = PMPI_Bsend(OMPI_F2C_BOTTOM(buf), c_count,
39+
c_datatype, OMPI_FINT_2_INT(*dest),
40+
OMPI_FINT_2_INT(*tag), c_comm);
41+
if (c_datatype != c_type) {
42+
ompi_datatype_destroy(&c_datatype);
43+
}
44+
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
45+
}

‎ompi/mpi/fortran/use-mpi-f08/cdesc/bsend_init_cdesc.c‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
/*
2+
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
3+
* University Research and Technology
4+
* Corporation. All rights reserved.
5+
* Copyright (c) 2004-2005 The University of Tennessee and The University
6+
* of Tennessee Research Foundation. All rights
7+
* reserved.
8+
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
9+
* University of Stuttgart. All rights reserved.
10+
* Copyright (c) 2004-2005 The Regents of the University of California.
11+
* All rights reserved.
12+
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
13+
* Copyright (c) 2015-2019 Research Organization for Information Science
14+
* and Technology (RIST). All rights reserved.
15+
* $COPYRIGHT$
16+
*
17+
* Additional copyrights may follow
18+
*
19+
* $HEADER$
20+
*/
21+
22+
#include "ompi_config.h"
23+
24+
#include "ompi/mpi/fortran/mpif-h/bindings.h"
25+
#include "ompi/mpi/fortran/use-mpi-f08/cdesc/bindings.h"
26+
#include "ompi/mpi/fortran/base/constants.h"
27+
28+
29+
void ompi_bsend_init_cdesc(CFI_cdesc_t* x, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr)
30+
{
31+
int c_ierr;
32+
MPI_Datatype c_datatype, c_type = PMPI_Type_f2c(*datatype);
33+
MPI_Request c_req;
34+
MPI_Comm c_comm;
35+
void *buf = x->base_addr;
36+
int c_count = OMPI_FINT_2_INT(*count);
37+
38+
c_comm = PMPI_Comm_f2c (*comm);
39+
40+
c_datatype = c_type;
41+
if (x->rank != 0 && !CFI_is_contiguous(x)) {
42+
c_ierr = cdesc_create_datatype(x, c_count, c_type, &c_datatype);
43+
if (MPI_SUCCESS != c_ierr) {
44+
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
45+
return;
46+
}
47+
c_count = 1;
48+
}
49+
c_ierr = PMPI_Bsend_init(OMPI_F2C_BOTTOM(buf), c_count,
50+
c_datatype,
51+
OMPI_FINT_2_INT(*dest),
52+
OMPI_FINT_2_INT(*tag),
53+
c_comm, &c_req);
54+
if (c_datatype != c_type) {
55+
ompi_datatype_destroy(&c_datatype);
56+
}
57+
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
58+
59+
if (MPI_SUCCESS == c_ierr) {
60+
*request = PMPI_Request_c2f(c_req);
61+
}
62+
}

‎ompi/mpi/fortran/use-mpi-f08/cdesc/ibsend_cdesc.c‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
/*
2+
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
3+
* University Research and Technology
4+
* Corporation. All rights reserved.
5+
* Copyright (c) 2004-2005 The University of Tennessee and The University
6+
* of Tennessee Research Foundation. All rights
7+
* reserved.
8+
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
9+
* University of Stuttgart. All rights reserved.
10+
* Copyright (c) 2004-2005 The Regents of the University of California.
11+
* All rights reserved.
12+
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
13+
* Copyright (c) 2015-2019 Research Organization for Information Science
14+
* and Technology (RIST). All rights reserved.
15+
* $COPYRIGHT$
16+
*
17+
* Additional copyrights may follow
18+
*
19+
* $HEADER$
20+
*/
21+
22+
#include "ompi_config.h"
23+
24+
#include "ompi/mpi/fortran/mpif-h/bindings.h"
25+
#include "ompi/mpi/fortran/use-mpi-f08/cdesc/bindings.h"
26+
#include "ompi/mpi/fortran/base/constants.h"
27+
28+
void ompi_ibsend_cdesc(CFI_cdesc_t* x, MPI_Fint *count, MPI_Fint *datatype,
29+
MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm,
30+
MPI_Fint *request, MPI_Fint *ierr)
31+
{
32+
int c_ierr;
33+
MPI_Datatype c_datatype, c_type = PMPI_Type_f2c(*datatype);
34+
MPI_Request c_req;
35+
MPI_Comm c_comm;
36+
void *buf = x->base_addr;
37+
int c_count = OMPI_FINT_2_INT(*count);
38+
39+
c_comm = PMPI_Comm_f2c (*comm);
40+
41+
c_datatype = c_type;
42+
if (x->rank != 0 && !CFI_is_contiguous(x)) {
43+
c_ierr = cdesc_create_datatype(x, c_count, c_type, &c_datatype);
44+
if (MPI_SUCCESS != c_ierr) {
45+
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
46+
return;
47+
}
48+
c_count = 1;
49+
}
50+
c_ierr = PMPI_Ibsend(OMPI_F2C_BOTTOM(buf), c_count,
51+
c_datatype, OMPI_FINT_2_INT(*dest),
52+
OMPI_FINT_2_INT(*tag),
53+
c_comm, &c_req);
54+
if (c_datatype != c_type) {
55+
ompi_datatype_destroy(&c_datatype);
56+
}
57+
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
58+
59+
if (MPI_SUCCESS == c_ierr) {
60+
*request = PMPI_Request_c2f(c_req);
61+
}
62+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
! Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
6-
! Copyright (c) 2018 Research Organization for Information Science
6+
! Copyright (c) 2018-2019 Research Organization for Information Science
77
! and Technology (RIST). All rights reserved.
88
! $COPYRIGHT$
99

@@ -13,7 +13,7 @@ subroutine MPI_Ibsend_f08(buf,count,datatype,dest,tag,comm,request,ierror)
1313
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
1414
use :: ompi_mpifh_bindings, only : ompi_ibsend_f
1515
implicit none
16-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
16+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: buf
1717
INTEGER, INTENT(IN) :: count, dest, tag
1818
TYPE(MPI_Datatype), INTENT(IN) :: datatype
1919
TYPE(MPI_Comm), INTENT(IN) :: comm

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ subroutine MPI_Bsend_f08(buf,count,datatype,dest,tag,comm,ierror)
2626
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
2727
implicit none
2828
!DEC$ ATTRIBUTES NO_ARG_CHECK :: buf
29-
!GCC$ ATTRIBUTES NO_ARG_CHECK :: buf
29+
OMPI_F08_GCC_ATTRIBUTES(buf)
3030
!$PRAGMA IGNORE_TKR buf
3131
!DIR$ IGNORE_TKR buf
3232
!IBM* IGNORE_TKR buf
33-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
33+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: buf
3434
INTEGER, INTENT(IN) :: count, dest, tag
3535
TYPE(MPI_Datatype), INTENT(IN) :: datatype
3636
TYPE(MPI_Comm), INTENT(IN) :: comm
@@ -43,11 +43,11 @@ subroutine MPI_Bsend_init_f08(buf,count,datatype,dest,tag,comm,request,ierror)
4343
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
4444
implicit none
4545
!DEC$ ATTRIBUTES NO_ARG_CHECK :: buf
46-
!GCC$ ATTRIBUTES NO_ARG_CHECK :: buf
46+
OMPI_F08_GCC_ATTRIBUTES(buf)
4747
!$PRAGMA IGNORE_TKR buf
4848
!DIR$ IGNORE_TKR buf
4949
!IBM* IGNORE_TKR buf
50-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: buf
50+
OMPI_F08_IGNORE_TKR_TYPE :: buf
5151
INTEGER, INTENT(IN) :: count, dest, tag
5252
TYPE(MPI_Datatype), INTENT(IN) :: datatype
5353
TYPE(MPI_Comm), INTENT(IN) :: comm
@@ -105,11 +105,11 @@ subroutine MPI_Ibsend_f08(buf,count,datatype,dest,tag,comm,request,ierror)
105105
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
106106
implicit none
107107
!DEC$ ATTRIBUTES NO_ARG_CHECK :: buf
108-
!GCC$ ATTRIBUTES NO_ARG_CHECK :: buf
108+
OMPI_F08_GCC_ATTRIBUTES(buf)
109109
!$PRAGMA IGNORE_TKR buf
110110
!DIR$ IGNORE_TKR buf
111111
!IBM* IGNORE_TKR buf
112-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
112+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: buf
113113
INTEGER, INTENT(IN) :: count, dest, tag
114114
TYPE(MPI_Datatype), INTENT(IN) :: datatype
115115
TYPE(MPI_Comm), INTENT(IN) :: comm

0 commit comments

Comments
 (0)