Skip to content

Commit 4b9c01d

Browse files
ggouaillardetggouaillardet
committed
fortran/use-mpi/f08: rsend/irsend/rsend_init
Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
1 parent 92cd6a9 commit 4b9c01d

File tree

14 files changed

+224
-30
lines changed

14 files changed

+224
-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
@@ -244,9 +244,9 @@ subroutine ompi_irecv_f(buf,count,datatype,source,tag,comm,request,ierror) &
244244
end subroutine ompi_irecv_f
245245

246246
subroutine ompi_irsend_f(buf,count,datatype,dest,tag,comm,request,ierror) &
247-
BIND(C, name="ompi_irsend_f")
247+
BIND(C, name="ompi_irsend_@OMPI_F08_BINDINGS_EXTENSION@")
248248
implicit none
249-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
249+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: buf
250250
INTEGER, INTENT(IN) :: count, dest, tag
251251
INTEGER, INTENT(IN) :: datatype
252252
INTEGER, INTENT(IN) :: comm
@@ -317,19 +317,19 @@ subroutine ompi_request_free_f(request,ierror) &
317317
end subroutine ompi_request_free_f
318318

319319
subroutine ompi_rsend_f(buf,count,datatype,dest,tag,comm,ierror) &
320-
BIND(C, name="ompi_rsend_f")
320+
BIND(C, name="ompi_rsend_@OMPI_F08_BINDINGS_EXTENSION@")
321321
implicit none
322-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
322+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: buf
323323
INTEGER, INTENT(IN) :: count, dest, tag
324324
INTEGER, INTENT(IN) :: datatype
325325
INTEGER, INTENT(IN) :: comm
326326
INTEGER, INTENT(OUT) :: ierror
327327
end subroutine ompi_rsend_f
328328

329329
subroutine ompi_rsend_init_f(buf,count,datatype,dest,tag,comm,request,ierror) &
330-
BIND(C, name="ompi_rsend_init_f")
330+
BIND(C, name="ompi_rsend_init_@OMPI_F08_BINDINGS_EXTENSION@")
331331
implicit none
332-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: buf
332+
OMPI_F08_IGNORE_TKR_TYPE :: buf
333333
INTEGER, INTENT(IN) :: count, dest, tag
334334
INTEGER, INTENT(IN) :: datatype
335335
INTEGER, INTENT(IN) :: comm

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,12 @@ libforce_usempif08_internal_cdesc_to_be_built_la_SOURCES = \
4747
bsend_init_cdesc.c \
4848
ibsend_cdesc.c \
4949
irecv_cdesc.c \
50+
irsend_cdesc.c \
5051
isend_cdesc.c \
5152
issend_cdesc.c \
5253
recv_cdesc.c \
54+
rsend_cdesc.c \
55+
rsend_init_cdesc.c \
5356
send_cdesc.c \
5457
send_init_cdesc.c \
5558
sendrecv_cdesc.c \

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ void ompi_irecv_cdesc(CFI_cdesc_t *x, MPI_Fint *count, MPI_Fint *datatype,
3333
MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm,
3434
MPI_Fint *request, MPI_Fint *ierr);
3535

36+
void ompi_irsend_cdesc(CFI_cdesc_t* x, MPI_Fint *count, MPI_Fint *datatype,
37+
MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm,
38+
MPI_Fint *request, MPI_Fint *ierr);
39+
3640
void ompi_isend_cdesc(CFI_cdesc_t *x, MPI_Fint *count, MPI_Fint *datatype,
3741
MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm,
3842
MPI_Fint *request, MPI_Fint *ierr);
@@ -45,6 +49,15 @@ void ompi_recv_cdesc(CFI_cdesc_t *x, MPI_Fint *count, MPI_Fint *datatype,
4549
MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm,
4650
MPI_Fint *status, MPI_Fint *ierr);
4751

52+
void ompi_rsend_cdesc(CFI_cdesc_t* x, MPI_Fint *count, MPI_Fint *datatype,
53+
MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm,
54+
MPI_Fint *ierr);
55+
56+
void ompi_rsend_init_cdesc(CFI_cdesc_t* x, MPI_Fint *count,
57+
MPI_Fint *datatype, MPI_Fint *dest,
58+
MPI_Fint *tag, MPI_Fint *comm,
59+
MPI_Fint *request, MPI_Fint *ierr);
60+
4861
void ompi_send_cdesc(CFI_cdesc_t* x, MPI_Fint *count, MPI_Fint *datatype,
4962
MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *ierr);
5063

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

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
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_irsend_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)
29+
{
30+
int c_ierr;
31+
MPI_Datatype c_datatype, c_type = PMPI_Type_f2c(*datatype);
32+
MPI_Request c_req;
33+
MPI_Comm c_comm;
34+
void *buf = x->base_addr;
35+
int c_count = OMPI_FINT_2_INT(*count);
36+
37+
c_comm = PMPI_Comm_f2c (*comm);
38+
39+
c_datatype = c_type;
40+
if (x->rank != 0 && !CFI_is_contiguous(x)) {
41+
c_ierr = cdesc_create_datatype(x, c_count, c_type, &c_datatype);
42+
if (MPI_SUCCESS != c_ierr) {
43+
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
44+
return;
45+
}
46+
c_count = 1;
47+
}
48+
c_ierr = PMPI_Irsend(OMPI_F2C_BOTTOM(buf), c_count,
49+
c_datatype, OMPI_FINT_2_INT(*dest),
50+
OMPI_FINT_2_INT(*tag), c_comm,
51+
&c_req);
52+
if (c_datatype != c_type) {
53+
ompi_datatype_destroy(&c_datatype);
54+
}
55+
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
56+
57+
if (MPI_SUCCESS == c_ierr) {
58+
*request = PMPI_Request_c2f(c_req);
59+
}
60+
}

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

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
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_rsend_cdesc(CFI_cdesc_t* x, MPI_Fint *count, MPI_Fint *datatype,
29+
MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *ierr)
30+
{
31+
int c_ierr;
32+
MPI_Datatype c_datatype, c_type = PMPI_Type_f2c(*datatype);
33+
MPI_Comm c_comm;
34+
void *buf = x->base_addr;
35+
int c_count = OMPI_FINT_2_INT(*count);
36+
37+
c_comm = PMPI_Comm_f2c (*comm);
38+
39+
c_datatype = c_type;
40+
if (x->rank != 0 && !CFI_is_contiguous(x)) {
41+
c_ierr = cdesc_create_datatype(x, c_count, c_type, &c_datatype);
42+
if (MPI_SUCCESS != c_ierr) {
43+
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
44+
return;
45+
}
46+
c_count = 1;
47+
}
48+
c_ierr = PMPI_Rsend(OMPI_F2C_BOTTOM(buf), c_count,
49+
c_datatype, OMPI_FINT_2_INT(*dest),
50+
OMPI_FINT_2_INT(*tag), c_comm);
51+
if (c_datatype != c_type) {
52+
ompi_datatype_destroy(&c_datatype);
53+
}
54+
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
55+
}

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

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
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_rsend_init_cdesc(CFI_cdesc_t* x, MPI_Fint *count,
29+
MPI_Fint *datatype, MPI_Fint *dest,
30+
MPI_Fint *tag, MPI_Fint *comm,
31+
MPI_Fint *request, MPI_Fint *ierr)
32+
{
33+
int c_ierr;
34+
MPI_Datatype c_datatype, c_type = PMPI_Type_f2c(*datatype);
35+
MPI_Request c_req;
36+
MPI_Comm c_comm;
37+
void *buf = x->base_addr;
38+
int c_count = OMPI_FINT_2_INT(*count);
39+
40+
c_comm = PMPI_Comm_f2c (*comm);
41+
42+
c_datatype = c_type;
43+
if (x->rank != 0 && !CFI_is_contiguous(x)) {
44+
c_ierr = cdesc_create_datatype(x, c_count, c_type, &c_datatype);
45+
if (MPI_SUCCESS != c_ierr) {
46+
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
47+
return;
48+
}
49+
c_count = 1;
50+
}
51+
c_ierr = PMPI_Rsend_init(OMPI_F2C_BOTTOM(buf), c_count,
52+
c_datatype, OMPI_FINT_2_INT(*dest),
53+
OMPI_FINT_2_INT(*tag),
54+
c_comm, &c_req);
55+
if (c_datatype != c_type) {
56+
ompi_datatype_destroy(&c_datatype);
57+
}
58+
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
59+
60+
if (MPI_SUCCESS == c_ierr) {
61+
*request = PMPI_Request_c2f(c_req);
62+
}
63+
}

‎ompi/mpi/fortran/use-mpi-f08/irsend_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_Irsend_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_irsend_f
1515
implicit none
16-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: buf
16+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: 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
@@ -153,11 +153,11 @@ subroutine MPI_Irsend_f08(buf,count,datatype,dest,tag,comm,request,ierror)
153153
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
154154
implicit none
155155
!DEC$ ATTRIBUTES NO_ARG_CHECK :: buf
156-
!GCC$ ATTRIBUTES NO_ARG_CHECK :: buf
156+
OMPI_F08_GCC_ATTRIBUTES(buf)
157157
!$PRAGMA IGNORE_TKR buf
158158
!DIR$ IGNORE_TKR buf
159159
!IBM* IGNORE_TKR buf
160-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
160+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: buf
161161
INTEGER, INTENT(IN) :: count, dest, tag
162162
TYPE(MPI_Datatype), INTENT(IN) :: datatype
163163
TYPE(MPI_Comm), INTENT(IN) :: comm
@@ -274,11 +274,11 @@ subroutine MPI_Rsend_f08(buf,count,datatype,dest,tag,comm,ierror)
274274
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
275275
implicit none
276276
!DEC$ ATTRIBUTES NO_ARG_CHECK :: buf
277-
!GCC$ ATTRIBUTES NO_ARG_CHECK :: buf
277+
OMPI_F08_GCC_ATTRIBUTES(buf)
278278
!$PRAGMA IGNORE_TKR buf
279279
!DIR$ IGNORE_TKR buf
280280
!IBM* IGNORE_TKR buf
281-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
281+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: buf
282282
INTEGER, INTENT(IN) :: count, dest, tag
283283
TYPE(MPI_Datatype), INTENT(IN) :: datatype
284284
TYPE(MPI_Comm), INTENT(IN) :: comm
@@ -291,11 +291,11 @@ subroutine MPI_Rsend_init_f08(buf,count,datatype,dest,tag,comm,request,ierror)
291291
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
292292
implicit none
293293
!DEC$ ATTRIBUTES NO_ARG_CHECK :: buf
294-
!GCC$ ATTRIBUTES NO_ARG_CHECK :: buf
294+
OMPI_F08_GCC_ATTRIBUTES(buf)
295295
!$PRAGMA IGNORE_TKR buf
296296
!DIR$ IGNORE_TKR buf
297297
!IBM* IGNORE_TKR buf
298-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: buf
298+
OMPI_F08_IGNORE_TKR_TYPE :: buf
299299
INTEGER, INTENT(IN) :: count, dest, tag
300300
TYPE(MPI_Datatype), INTENT(IN) :: datatype
301301
TYPE(MPI_Comm), INTENT(IN) :: comm

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,11 @@ subroutine PMPI_Irsend_f08(buf,count,datatype,dest,tag,comm,request,ierror)
153153
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
154154
implicit none
155155
!DEC$ ATTRIBUTES NO_ARG_CHECK :: buf
156-
!GCC$ ATTRIBUTES NO_ARG_CHECK :: buf
156+
OMPI_F08_GCC_ATTRIBUTES(buf)
157157
!$PRAGMA IGNORE_TKR buf
158158
!DIR$ IGNORE_TKR buf
159159
!IBM* IGNORE_TKR buf
160-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
160+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: buf
161161
INTEGER, INTENT(IN) :: count, dest, tag
162162
TYPE(MPI_Datatype), INTENT(IN) :: datatype
163163
TYPE(MPI_Comm), INTENT(IN) :: comm
@@ -274,11 +274,11 @@ subroutine PMPI_Rsend_f08(buf,count,datatype,dest,tag,comm,ierror)
274274
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
275275
implicit none
276276
!DEC$ ATTRIBUTES NO_ARG_CHECK :: buf
277-
!GCC$ ATTRIBUTES NO_ARG_CHECK :: buf
277+
OMPI_F08_GCC_ATTRIBUTES(buf)
278278
!$PRAGMA IGNORE_TKR buf
279279
!DIR$ IGNORE_TKR buf
280280
!IBM* IGNORE_TKR buf
281-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
281+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: buf
282282
INTEGER, INTENT(IN) :: count, dest, tag
283283
TYPE(MPI_Datatype), INTENT(IN) :: datatype
284284
TYPE(MPI_Comm), INTENT(IN) :: comm
@@ -291,11 +291,11 @@ subroutine PMPI_Rsend_init_f08(buf,count,datatype,dest,tag,comm,request,ierror)
291291
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
292292
implicit none
293293
!DEC$ ATTRIBUTES NO_ARG_CHECK :: buf
294-
!GCC$ ATTRIBUTES NO_ARG_CHECK :: buf
294+
OMPI_F08_GCC_ATTRIBUTES(buf)
295295
!$PRAGMA IGNORE_TKR buf
296296
!DIR$ IGNORE_TKR buf
297297
!IBM* IGNORE_TKR buf
298-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: buf
298+
OMPI_F08_IGNORE_TKR_TYPE :: buf
299299
INTEGER, INTENT(IN) :: count, dest, tag
300300
TYPE(MPI_Datatype), INTENT(IN) :: datatype
301301
TYPE(MPI_Comm), INTENT(IN) :: comm

‎ompi/mpi/fortran/use-mpi-f08/profile/pirsend_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 PMPI_Irsend_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_irsend_f
1515
implicit none
16-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: buf
16+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: buf
1717
INTEGER, INTENT(IN) :: count, dest, tag
1818
TYPE(MPI_Datatype), INTENT(IN) :: datatype
1919
TYPE(MPI_Comm), INTENT(IN) :: comm

0 commit comments

Comments
 (0)