Skip to content

Commit 59d8d62

Browse files
hppritchahppritcha
authored
Merge pull request open-mpi#7116 from ggouaillardet/topic/v4.0.x/f08_bind_c_constants_revamp
v4.0.x: fortran/use-mpi-f08: revamp mpi_f08 constants
2 parents 684c180 + 02c79ac commit 59d8d62

File tree

9 files changed

+268
-85
lines changed

9 files changed

+268
-85
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ ompi/mpi/fortran/mpif-h/sizeof_f.f90
213213
ompi/mpi/fortran/mpif-h/profile/p*.c
214214
ompi/mpi/fortran/mpif-h/profile/psizeof_f.f90
215215

216+
ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-constants.h
216217
ompi/mpi/fortran/use-mpi-f08/constants.h
217218
ompi/mpi/fortran/use-mpi-f08/sizeof_f08.f90
218219
ompi/mpi/fortran/use-mpi-f08/sizeof_f08.h

‎config/ompi_setup_mpi_fortran.m4‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ dnl Copyright (c) 2006-2008 Sun Microsystems, Inc. All rights reserved.
1515
dnl Copyright (c) 2006-2007 Los Alamos National Security, LLC. All rights
1616
dnl reserved.
1717
dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
18-
dnl Copyright (c) 2014-2017 Research Organization for Information Science
19-
dnl and Technology (RIST). All rights reserved.
18+
dnl Copyright (c) 2014-2019 Research Organization for Information Science
19+
dnl and Technology (RIST). All rights reserved.
2020
dnl Copyright (c) 2016 IBM Corporation. All rights reserved.
2121
dnl $COPYRIGHT$
2222
dnl
@@ -743,8 +743,7 @@ end type test_mpi_handle],
743743
[$OMPI_FORTRAN_HAVE_PRIVATE],
744744
[For mpi-f08-types.f90 and ompi_info: whether the compiler supports the "private" keyword or not (used in MPI_Status)])
745745

746-
# For configure-fortran-output.h, mpi-f08-types.F90 (and ompi_info)
747-
AC_SUBST([OMPI_FORTRAN_HAVE_PROTECTED])
746+
# For ompi_info only
748747
AC_DEFINE_UNQUOTED([OMPI_FORTRAN_HAVE_PROTECTED],
749748
[$OMPI_FORTRAN_HAVE_PROTECTED],
750749
[For mpi-f08-types.f90 and .F90 and ompi_info: whether the compiler supports the "protected" keyword or not])

‎ompi/include/mpif-values.pl‎

Lines changed: 60 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env perl
22
#
33
# Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved.
4-
# Copyright (c) 2016-2017 Research Organization for Information Science
5-
# and Technology (RIST). All rights reserved.
4+
# Copyright (c) 2016-2019 Research Organization for Information Science
5+
# and Technology (RIST). All rights reserved.
66
# Copyright (c) 2016 FUJITSU LIMITED. All rights reserved.
77
# $COPYRIGHT$
88
#
@@ -526,4 +526,62 @@ sub write_fortran_file {
526526

527527
write_file("$topdir/ompi/mpi/fortran/use-mpi-f08/constants.h", $output);
528528

529+
$output = '! WARNING! THIS IS A GENERATED FILE!!
530+
! ANY EDITS YOU PUT HERE WILL BE LOST!
531+
! Instead, edit topdir/ompi/include/mpif-values.pl
532+
!
533+
534+
!
535+
! Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
536+
! University Research and Technology
537+
! Corporation. All rights reserved.
538+
! Copyright (c) 2004-2006 The University of Tennessee and The University
539+
! of Tennessee Research Foundation. All rights
540+
! reserved.
541+
! Copyright (c) 2004-2007 High Performance Computing Center Stuttgart,
542+
! University of Stuttgart. All rights reserved.
543+
! Copyright (c) 2004-2005 The Regents of the University of California.
544+
! All rights reserved.
545+
! Copyright (c) 2007-2009 Cisco Systems, Inc. All rights reserved.
546+
! Copyright (c) 2008-2009 Sun Microsystems, Inc. All rights reserved.
547+
! Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
548+
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
549+
! All rights reserved.
550+
! Copyright (c) 2016-2019 Research Organization for Information Science
551+
! and Technology (RIST). All rights reserved.
552+
! $COPYRIGHT$
553+
!
554+
! Additional copyrights may follow
555+
!
556+
! $HEADER$
557+
!
558+
559+
#ifndef USE_MPI_F08_CONSTANTS_H
560+
#define USE_MPI_F08_CONSTANTS_H
561+
562+
';
563+
564+
foreach my $key (sort(keys(%{$constants}))) {
565+
$output .= "#define OMPI_$key $constants->{$key}\n";
566+
}
567+
$output .= "\n";
568+
foreach my $key (sort(keys(%{$handles}))) {
569+
$output .= "#define OMPI_$key $handles->{$key}\n";
570+
}
571+
572+
foreach my $key (sort(keys(%{$io_constants}))) {
573+
$output .= "#define OMPI_$key $io_constants->{$key}\n";
574+
}
575+
foreach my $key (sort(keys(%{$lio_constants}))) {
576+
$output .= "#define OMPI_$key $lio_constants->{$key}\n";
577+
}
578+
$output .= "\n";
579+
foreach my $key (sort(keys(%{$io_handles}))) {
580+
$output .= "#define OMPI_$key $io_handles->{$key}\n";
581+
}
582+
$output .= "\n";
583+
$output .= "#endif\n";
584+
585+
write_file("$topdir/ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-constants.h", $output);
586+
529587
exit(0);

‎ompi/mpi/fortran/common_sym_whitelist.txt‎

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,54 @@
33
ompi_f08_mpi_2complex
44
ompi_f08_mpi_2double_complex
55
ompi_f08_mpi_2double_precision
6+
ompi_f08_mpi_2int
67
ompi_f08_mpi_2integer
78
ompi_f08_mpi_2real
89
ompi_f08_mpi_aint
910
ompi_f08_mpi_band
1011
ompi_f08_mpi_bor
1112
ompi_f08_mpi_bxor
1213
ompi_f08_mpi_byte
14+
ompi_f08_mpi_c_bool
15+
ompi_f08_mpi_c_complex
16+
ompi_f08_mpi_count
17+
ompi_f08_mpi_c_double_complex
18+
ompi_f08_mpi_c_float_complex
19+
ompi_f08_mpi_char
1320
ompi_f08_mpi_character
21+
ompi_f08_mpi_c_long_double_complex
1422
ompi_f08_mpi_comm_null
1523
ompi_f08_mpi_comm_self
1624
ompi_f08_mpi_comm_world
1725
ompi_f08_mpi_complex
18-
ompi_f08_mpi_complex8
1926
ompi_f08_mpi_complex16
2027
ompi_f08_mpi_complex32
28+
ompi_f08_mpi_complex8
29+
ompi_f08_mpi_cxx_bool
30+
ompi_f08_mpi_cxx_complex
31+
ompi_f08_mpi_cxx_double_complex
32+
ompi_f08_mpi_cxx_float_complex
33+
ompi_f08_mpi_cxx_long_double_complex
2134
ompi_f08_mpi_datatype_null
35+
ompi_f08_mpi_double
2236
ompi_f08_mpi_double_complex
37+
ompi_f08_mpi_double_int
2338
ompi_f08_mpi_double_precision
2439
ompi_f08_mpi_errhandler_null
2540
ompi_f08_mpi_errors_are_fatal
2641
ompi_f08_mpi_errors_return
2742
ompi_f08_mpi_file_null
43+
ompi_f08_mpi_float
44+
ompi_f08_mpi_float_int
2845
ompi_f08_mpi_group_empty
2946
ompi_f08_mpi_group_null
3047
ompi_f08_mpi_info_env
3148
ompi_f08_mpi_info_null
49+
ompi_f08_mpi_int
50+
ompi_f08_mpi_int16
51+
ompi_f08_mpi_int32
52+
ompi_f08_mpi_int64
53+
ompi_f08_mpi_int8
3254
ompi_f08_mpi_integer
3355
ompi_f08_mpi_integer1
3456
ompi_f08_mpi_integer16
@@ -42,6 +64,12 @@ ompi_f08_mpi_logical1
4264
ompi_f08_mpi_logical2
4365
ompi_f08_mpi_logical4
4466
ompi_f08_mpi_logical8
67+
ompi_f08_mpi_long
68+
ompi_f08_mpi_long_double
69+
ompi_f08_mpi_long_double_int
70+
ompi_f08_mpi_long_int
71+
ompi_f08_mpi_long_long
72+
ompi_f08_mpi_long_long_int
4573
ompi_f08_mpi_lor
4674
ompi_f08_mpi_lxor
4775
ompi_f08_mpi_max
@@ -50,6 +78,8 @@ ompi_f08_mpi_message_no_proc
5078
ompi_f08_mpi_message_null
5179
ompi_f08_mpi_min
5280
ompi_f08_mpi_minloc
81+
ompi_f08_mpi_no_op
82+
ompi_f08_mpi_offset
5383
ompi_f08_mpi_op_null
5484
ompi_f08_mpi_packed
5585
ompi_f08_mpi_prod
@@ -60,6 +90,19 @@ ompi_f08_mpi_real4
6090
ompi_f08_mpi_real8
6191
ompi_f08_mpi_replace
6292
ompi_f08_mpi_request_null
93+
ompi_f08_mpi_short
94+
ompi_f08_mpi_short_int
95+
ompi_f08_mpi_signed_char
6396
ompi_f08_mpi_sum
6497
ompi_f08_mpi_ub
98+
ompi_f08_mpi_uint16
99+
ompi_f08_mpi_uint32
100+
ompi_f08_mpi_uint64
101+
ompi_f08_mpi_uint8
102+
ompi_f08_mpi_unsigned
103+
ompi_f08_mpi_unsigned_char
104+
ompi_f08_mpi_unsigned_long
105+
ompi_f08_mpi_unsigned_long_long
106+
ompi_f08_mpi_unsigned_short
107+
ompi_f08_mpi_wchar
65108
ompi_f08_mpi_win_null

‎ompi/mpi/fortran/configure-fortran-output-bottom.h‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
! Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved.
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
6+
! Copyright (c) 2019 Research Organization for Information Science
7+
! and Technology (RIST). All rights reserved.
68
!
79
! $COPYRIGHT$
810
!
@@ -38,11 +40,4 @@
3840
#define OMPI_PRIVATE
3941
#endif
4042
41-
! PROTECTED or not
42-
#if OMPI_FORTRAN_HAVE_PROTECTED
43-
#define OMPI_PROTECTED , PROTECTED
44-
#else
45-
#define OMPI_PROTECTED
46-
#endif
47-
4843
#endif

‎ompi/mpi/fortran/configure-fortran-output.h.in‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
! Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved.
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
6-
! Copyright (c) 2017-2018 Research Organization for Information Science
7-
! and Technology (RIST). All rights reserved.
6+
! Copyright (c) 2017-2019 Research Organization for Information Science
7+
! and Technology (RIST). All rights reserved.
88
!
99
! $COPYRIGHT$
1010
!
@@ -25,9 +25,6 @@
2525
! Whether we have PRIVATE or not
2626
#define OMPI_FORTRAN_HAVE_PRIVATE @OMPI_FORTRAN_HAVE_PRIVATE@
2727
28-
! Whether we have PROTECTED or not
29-
#define OMPI_FORTRAN_HAVE_PROTECTED @OMPI_FORTRAN_HAVE_PROTECTED@
30-
3128
! Whether we have ABSTRACT or not
3229
#define OMPI_FORTRAN_HAVE_ABSTRACT @OMPI_FORTRAN_HAVE_ABSTRACT@
3330

‎ompi/mpi/fortran/use-mpi-f08/constants.c‎

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
/*
22
* Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
3-
* Copyright (c) 2015-2017 Research Organization for Information Science
3+
* Copyright (c) 2015-2018 Research Organization for Information Science
44
* and Technology (RIST). All rights reserved.
55
*
6+
* Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
67
* $COPYRIGHT$
78
*
89
* This file provides symbols for the derived type values needed
@@ -49,6 +50,7 @@ OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_bxor
4950
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_maxloc = {OMPI_MPI_MAXLOC};
5051
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_minloc = {OMPI_MPI_MINLOC};
5152
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_replace = {OMPI_MPI_REPLACE};
53+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_no_op = {OMPI_MPI_NO_OP};
5254

5355
/*
5456
* NULL "handles" (indices)
@@ -72,26 +74,64 @@ OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_byte
7274
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_packed = {OMPI_MPI_PACKED};
7375
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_ub = {OMPI_MPI_UB};
7476
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_lb = {OMPI_MPI_LB};
77+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_char = {OMPI_MPI_CHAR};
78+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_signed_char = {OMPI_MPI_SIGNED_CHAR};
79+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_unsigned_char = {OMPI_MPI_UNSIGNED_CHAR};
80+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_wchar = {OMPI_MPI_WCHAR};
7581
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_character = {OMPI_MPI_CHARACTER};
7682
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_logical = {OMPI_MPI_LOGICAL};
83+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_int = {OMPI_MPI_INT};
84+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_int16 = {OMPI_MPI_INT16_T};
85+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_int32 = {OMPI_MPI_INT32_T};
86+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_int64 = {OMPI_MPI_INT64_T};
87+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_int8 = {OMPI_MPI_INT8_T};
88+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_uint16 = {OMPI_MPI_UINT16_T};
89+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_uint32 = {OMPI_MPI_UINT32_T};
90+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_uint64 = {OMPI_MPI_UINT64_T};
91+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_uint8 = {OMPI_MPI_UINT8_T};
92+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_short = {OMPI_MPI_SHORT};
93+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_unsigned_short = {OMPI_MPI_UNSIGNED_SHORT};
94+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_unsigned = {OMPI_MPI_UNSIGNED};
95+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_long = {OMPI_MPI_LONG};
96+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_unsigned_long = {OMPI_MPI_UNSIGNED_LONG};
97+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_long_long = {OMPI_MPI_LONG_LONG};
98+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_unsigned_long_long = {OMPI_MPI_UNSIGNED_LONG_LONG};
99+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_long_long_int = {OMPI_MPI_LONG_LONG_INT};
77100
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_integer = {OMPI_MPI_INTEGER};
78101
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_integer1 = {OMPI_MPI_INTEGER1};
79102
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_integer2 = {OMPI_MPI_INTEGER2};
80103
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_integer4 = {OMPI_MPI_INTEGER4};
81104
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_integer8 = {OMPI_MPI_INTEGER8};
82105
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_integer16 = {OMPI_MPI_INTEGER16};
106+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_float = {OMPI_MPI_FLOAT};
107+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_double = {OMPI_MPI_DOUBLE};
108+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_long_double = {OMPI_MPI_LONG_DOUBLE};
83109
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_real = {OMPI_MPI_REAL};
84110
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_real4 = {OMPI_MPI_REAL4};
85111
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_real8 = {OMPI_MPI_REAL8};
86112
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_real16 = {OMPI_MPI_REAL16};
87113
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_double_precision = {OMPI_MPI_DOUBLE_PRECISION};
114+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_c_complex = {OMPI_MPI_C_COMPLEX};
115+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_c_float_complex = {OMPI_MPI_C_FLOAT_COMPLEX};
116+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_c_double_complex = {OMPI_MPI_C_DOUBLE_COMPLEX};
117+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_c_long_double_complex = {OMPI_MPI_C_LONG_DOUBLE_COMPLEX};
118+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_cxx_complex = {OMPI_MPI_CXX_COMPLEX};
119+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_cxx_float_complex = {OMPI_MPI_CXX_FLOAT_COMPLEX};
120+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_cxx_double_complex = {OMPI_MPI_CXX_DOUBLE_COMPLEX};
121+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_cxx_long_double_complex = {OMPI_MPI_CXX_LONG_DOUBLE_COMPLEX};
88122
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_complex = {OMPI_MPI_COMPLEX};
89123
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_complex8 = {OMPI_MPI_COMPLEX8};
90124
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_complex16 = {OMPI_MPI_COMPLEX16};
91125
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_complex32 = {OMPI_MPI_COMPLEX32};
92126
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_double_complex = {OMPI_MPI_DOUBLE_COMPLEX};
127+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_float_int = {OMPI_MPI_FLOAT_INT};
128+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_double_int = {OMPI_MPI_DOUBLE_INT};
93129
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_2real = {OMPI_MPI_2REAL};
94130
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_2double_precision = {OMPI_MPI_2DOUBLE_PRECISION};
131+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_2int = {OMPI_MPI_2INT};
132+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_short_int = {OMPI_MPI_SHORT_INT};
133+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_long_int = {OMPI_MPI_LONG_INT};
134+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_long_double_int = {OMPI_MPI_LONG_DOUBLE_INT};
95135
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_2integer = {OMPI_MPI_2INTEGER};
96136
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_2complex = {OMPI_MPI_2COMPLEX};
97137
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_2double_complex = {OMPI_MPI_2DOUBLE_COMPLEX};
@@ -100,3 +140,7 @@ OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_logi
100140
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_logical2 = {OMPI_MPI_LOGICAL2};
101141
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_logical4 = {OMPI_MPI_LOGICAL4};
102142
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_logical8 = {OMPI_MPI_LOGICAL8};
143+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_c_bool = {OMPI_MPI_C_BOOL};
144+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_cxx_bool = {OMPI_MPI_CXX_BOOL};
145+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_count = {OMPI_MPI_COUNT};
146+
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_offset = {OMPI_MPI_OFFSET};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ libforce_usempif08_internal_modules_to_be_built_la_SOURCES = \
4848
mpi-f08-interfaces.F90 \
4949
mpi-f08-interfaces-callbacks.F90 \
5050
mpi-f08-callbacks.F90 \
51+
mpi-f08-constants.h \
5152
pmpi-f08-interfaces.F90
5253

5354
config_h = \

0 commit comments

Comments
 (0)