Skip to content

Commit b205aea

Browse files
ggouaillardetjsquyres
authored andcommitted
use-mpi-f08: add MPI_F08_STATUS[ES]_IGNORE C constants
Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp> (cherry picked from commit 0606b99)
1 parent f355c4f commit b205aea

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

ompi/include/mpi.h.in

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* reserved.
1818
* Copyright (c) 2011-2013 INRIA. All rights reserved.
1919
* Copyright (c) 2015 University of Houston. All rights reserved.
20-
* Copyright (c) 2015-2020 Research Organization for Information Science
20+
* Copyright (c) 2015-2021 Research Organization for Information Science
2121
* and Technology (RIST). All rights reserved.
2222
* Copyright (c) 2017-2019 IBM Corporation. All rights reserved.
2323
* Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
@@ -1086,6 +1086,9 @@ OMPI_DECLSPEC extern struct ompi_predefined_info_t ompi_mpi_info_env;
10861086
OMPI_DECLSPEC extern MPI_Fint *MPI_F_STATUS_IGNORE;
10871087
OMPI_DECLSPEC extern MPI_Fint *MPI_F_STATUSES_IGNORE;
10881088

1089+
OMPI_DECLSPEC extern MPI_Fint *MPI_F08_STATUS_IGNORE;
1090+
OMPI_DECLSPEC extern MPI_Fint *MPI_F08_STATUSES_IGNORE;
1091+
10891092
/*
10901093
* Removed datatypes. These datatypes are only available if Open MPI
10911094
* was configured with --enable-mpi1-compatibility.

ompi/runtime/ompi_mpi_init.c

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
* Copyright (c) 2011 Sandia National Laboratories. All rights reserved.
1919
* Copyright (c) 2012-2013 Inria. All rights reserved.
2020
* Copyright (c) 2014-2020 Intel, Inc. All rights reserved.
21-
* Copyright (c) 2014-2016 Research Organization for Information Science
22-
* and Technology (RIST). All rights reserved.
21+
* Copyright (c) 2014-2021 Research Organization for Information Science
22+
* and Technology (RIST). All rights reserved.
2323
* Copyright (c) 2016-2018 Mellanox Technologies Ltd. All rights reserved.
2424
*
2525
* Copyright (c) 2016-2017 IBM Corporation. All rights reserved.
@@ -216,21 +216,31 @@ struct ompi_status_public_t *ompi_mpi_statuses_ignore_addr =
216216
# if OMPI_FORTRAN_CAPS
217217
MPI_Fint *MPI_F_STATUS_IGNORE = (MPI_Fint*) &MPI_FORTRAN_STATUS_IGNORE;
218218
MPI_Fint *MPI_F_STATUSES_IGNORE = (MPI_Fint*) &MPI_FORTRAN_STATUSES_IGNORE;
219+
MPI_Fint *MPI_F08_STATUS_IGNORE = (MPI_Fint*) &MPI_FORTRAN_STATUS_IGNORE;
220+
MPI_Fint *MPI_F08_STATUSES_IGNORE = (MPI_Fint*) &MPI_FORTRAN_STATUSES_IGNORE;
219221
# elif OMPI_FORTRAN_PLAIN
220222
MPI_Fint *MPI_F_STATUS_IGNORE = (MPI_Fint*) &mpi_fortran_status_ignore;
221223
MPI_Fint *MPI_F_STATUSES_IGNORE = (MPI_Fint*) &mpi_fortran_statuses_ignore;
224+
MPI_Fint *MPI_F08_STATUS_IGNORE = (MPI_Fint*) &mpi_fortran_status_ignore;
225+
MPI_Fint *MPI_F08_STATUSES_IGNORE = (MPI_Fint*) &mpi_fortran_statuses_ignore;
222226
# elif OMPI_FORTRAN_SINGLE_UNDERSCORE
223227
MPI_Fint *MPI_F_STATUS_IGNORE = (MPI_Fint*) &mpi_fortran_status_ignore_;
224228
MPI_Fint *MPI_F_STATUSES_IGNORE = (MPI_Fint*) &mpi_fortran_statuses_ignore_;
229+
MPI_Fint *MPI_F08_STATUS_IGNORE = (MPI_Fint*) &mpi_fortran_status_ignore_;
230+
MPI_Fint *MPI_F08_STATUSES_IGNORE = (MPI_Fint*) &mpi_fortran_statuses_ignore_;
225231
# elif OMPI_FORTRAN_DOUBLE_UNDERSCORE
226232
MPI_Fint *MPI_F_STATUS_IGNORE = (MPI_Fint*) &mpi_fortran_status_ignore__;
227233
MPI_Fint *MPI_F_STATUSES_IGNORE = (MPI_Fint*) &mpi_fortran_statuses_ignore__;
234+
MPI_Fint *MPI_F08_STATUS_IGNORE = (MPI_Fint*) &mpi_fortran_status_ignore__;
235+
MPI_Fint *MPI_F08_STATUSES_IGNORE = (MPI_Fint*) &mpi_fortran_statuses_ignore__;
228236
# else
229237
# error Unrecognized Fortran name mangling scheme
230238
# endif
231239
#else
232240
MPI_Fint *MPI_F_STATUS_IGNORE = NULL;
233241
MPI_Fint *MPI_F_STATUSES_IGNORE = NULL;
242+
MPI_Fint *MPI_F08_STATUS_IGNORE = NULL;
243+
MPI_Fint *MPI_F08_STATUSES_IGNORE = NULL;
234244
#endif /* OMPI_BUILD_FORTRAN_BINDINGS */
235245

236246

0 commit comments

Comments
 (0)