Skip to content

Commit 642acfb

Browse files
kawashima-fjkawashima-fj
authored
Merge pull request #1927 from kawashima-fj/pr/fortran-named-constants
fortran: Correct named constants and a datatype name
2 parents 087761c + 722e898 commit 642acfb

File tree

3 files changed

+19
-12
lines changed

3 files changed

+19
-12
lines changed

‎ompi/datatype/ompi_datatype_module.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ ompi_predefined_datatype_t ompi_mpi_cxx_bool = OMPI_DATATYPE_INIT_PREDEFIN
109109
/*
110110
* Complex datatypes for C (base types), C++, and fortran
111111
*/
112-
ompi_predefined_datatype_t ompi_mpi_c_float_complex = OMPI_DATATYPE_INIT_PREDEFINED (C_FLOAT_COMPLEX, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_COMPLEX );
112+
ompi_predefined_datatype_t ompi_mpi_c_float_complex = OMPI_DATATYPE_INIT_PREDEFINED_BASIC_TYPE (C_FLOAT_COMPLEX, C_COMPLEX, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_COMPLEX );
113113
ompi_predefined_datatype_t ompi_mpi_c_complex = OMPI_DATATYPE_INIT_PREDEFINED_BASIC_TYPE (C_FLOAT_COMPLEX, C_COMPLEX, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_COMPLEX );
114114
ompi_predefined_datatype_t ompi_mpi_c_double_complex = OMPI_DATATYPE_INIT_PREDEFINED (C_DOUBLE_COMPLEX, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_COMPLEX );
115115
#if HAVE_LONG_DOUBLE
@@ -255,7 +255,7 @@ ompi_predefined_datatype_t ompi_mpi_integer8 = OMPI_DATATYPE_INIT_UNAVAILA
255255
#if OMPI_HAVE_FORTRAN_INTEGER16
256256
ompi_predefined_datatype_t ompi_mpi_integer16 = OMPI_DATATYPE_INIT_PREDEFINED_BASIC_TYPE_FORTRAN (INT, INTEGER16, OMPI_SIZEOF_FORTRAN_INTEGER16, OMPI_ALIGNMENT_FORTRAN_INTEGER16, OMPI_DATATYPE_FLAG_DATA_INT);
257257
#else
258-
ompi_predefined_datatype_t ompi_mpi_integer16 = OMPI_DATATYPE_INIT_UNAVAILABLE (INTEGER8, OMPI_DATATYPE_FLAG_DATA_FORTRAN | OMPI_DATATYPE_FLAG_DATA_INT);
258+
ompi_predefined_datatype_t ompi_mpi_integer16 = OMPI_DATATYPE_INIT_UNAVAILABLE (INTEGER16, OMPI_DATATYPE_FLAG_DATA_FORTRAN | OMPI_DATATYPE_FLAG_DATA_INT);
259259
#endif
260260

261261
/*
@@ -533,7 +533,7 @@ int32_t ompi_datatype_init( void )
533533
}
534534

535535
/*
536-
* This MUST match the order of ompi/include/mpif-common.h
536+
* This MUST match the order of ompi/include/mpif-values.pl
537537
* Any change will break binary compatibility of Fortran programs.
538538
*/
539539
MOOG(datatype_null, 0);
@@ -614,7 +614,7 @@ int32_t ompi_datatype_init( void )
614614
MOOG(uint64_t, 65);
615615
MOOG(aint, 66);
616616
MOOG(offset, 67);
617-
MOOG(c_complex, 68);
617+
MOOG(c_bool, 68);
618618
MOOG(c_float_complex, 69);
619619
MOOG(c_double_complex, 70);
620620
MOOG(c_long_double_complex, 71);

‎ompi/include/mpi.h.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,6 @@ OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_aint;
10061006
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_offset;
10071007
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_count;
10081008
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_c_bool;
1009-
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_c_complex;
10101009
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_c_float_complex;
10111010
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_c_double_complex;
10121011
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_c_long_double_complex;
@@ -1153,7 +1152,7 @@ OMPI_DECLSPEC extern MPI_Fint *MPI_F_STATUSES_IGNORE;
11531152
#define MPI_OFFSET OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_offset)
11541153
#define MPI_C_BOOL OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_c_bool)
11551154
#if HAVE_FLOAT__COMPLEX
1156-
#define MPI_C_COMPLEX OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_c_complex)
1155+
#define MPI_C_COMPLEX OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_c_float_complex)
11571156
#define MPI_C_FLOAT_COMPLEX OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_c_float_complex)
11581157
#endif
11591158
#if HAVE_DOUBLE__COMPLEX
@@ -1163,6 +1162,7 @@ OMPI_DECLSPEC extern MPI_Fint *MPI_F_STATUSES_IGNORE;
11631162
#define MPI_C_LONG_DOUBLE_COMPLEX OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_c_long_double_complex)
11641163
#endif
11651164
#define MPI_CXX_BOOL OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_cxx_bool)
1165+
#define MPI_CXX_COMPLEX OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_cxx_cplex)
11661166
#define MPI_CXX_FLOAT_COMPLEX OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_cxx_cplex)
11671167
#define MPI_CXX_DOUBLE_COMPLEX OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_cxx_dblcplex)
11681168
#define MPI_CXX_LONG_DOUBLE_COMPLEX OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_cxx_ldblcplex)

‎ompi/include/mpif-values.pl‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved.
44
# Copyright (c) 2016 Research Organization for Information Science
55
# and Technology (RIST). All rights reserved.
6+
# Copyright (c) 2016 FUJITSU LIMITED. All rights reserved.
67
# $COPYRIGHT$
78
#
89
# Additional copyrights may follow
@@ -105,6 +106,7 @@ sub write_file {
105106
$handles->{MPI_MAXLOC} = 11;
106107
$handles->{MPI_MINLOC} = 12;
107108
$handles->{MPI_REPLACE} = 13;
109+
$handles->{MPI_NO_OP} = 14;
108110

109111
$handles->{MPI_COMM_NULL} = 2;
110112
$handles->{MPI_DATATYPE_NULL} = 0;
@@ -160,20 +162,22 @@ sub write_file {
160162
$handles->{MPI_LONG} = 41;
161163
$handles->{MPI_UNSIGNED_LONG} = 42;
162164
$handles->{MPI_LONG_LONG_INT} = 43;
165+
$handles->{MPI_LONG_LONG} = $handles->{MPI_LONG_LONG_INT};
163166
$handles->{MPI_UNSIGNED_LONG_LONG} = 44;
164167
$handles->{MPI_FLOAT} = 45;
165168
$handles->{MPI_DOUBLE} = 46;
166169
$handles->{MPI_LONG_DOUBLE} = 47;
167170
$handles->{MPI_FLOAT_INT} = 48;
168171
$handles->{MPI_DOUBLE_INT} = 49;
169-
$handles->{MPI_LONGDBL_INT} = 50;
172+
$handles->{MPI_LONG_DOUBLE_INT} = 50;
170173
$handles->{MPI_LONG_INT} = 51;
171174
$handles->{MPI_2INT} = 52;
172175
$handles->{MPI_SHORT_INT} = 53;
173176
$handles->{MPI_CXX_BOOL} = 54;
174-
$handles->{MPI_CXX_CPLEX} = 55;
175-
$handles->{MPI_CXX_DBLCPLEX} = 56;
176-
$handles->{MPI_CXX_LDBLCPLEX} = 57;
177+
$handles->{MPI_CXX_FLOAT_COMPLEX} = 55;
178+
$handles->{MPI_CXX_COMPLEX} = $handles->{MPI_CXX_FLOAT_COMPLEX};
179+
$handles->{MPI_CXX_DOUBLE_COMPLEX} = 56;
180+
$handles->{MPI_CXX_LONG_DOUBLE_COMPLEX} = 57;
177181
$handles->{MPI_INT8_T} = 58;
178182
$handles->{MPI_UINT8_T} = 59;
179183
$handles->{MPI_INT16_T} = 60;
@@ -184,8 +188,9 @@ sub write_file {
184188
$handles->{MPI_UINT64_T} = 65;
185189
$handles->{MPI_AINT} = 66;
186190
$handles->{MPI_OFFSET} = 67;
187-
$handles->{MPI_C_COMPLEX} = 68;
188-
$handles->{MPI_C_FLOAT_COMPLEX} = 69;
191+
$handles->{MPI_C_BOOL} = 68;
192+
$handles->{MPI_C_COMPLEX} = 69;
193+
$handles->{MPI_C_FLOAT_COMPLEX} = $handles->{MPI_C_COMPLEX};
189194
$handles->{MPI_C_DOUBLE_COMPLEX} = 70;
190195
$handles->{MPI_C_LONG_DOUBLE_COMPLEX} = 71;
191196
$handles->{MPI_COUNT} = 72;
@@ -235,6 +240,8 @@ sub write_file {
235240
$constants->{MPI_WIN_FLAVOR_ALLOCATE} = 2;
236241
$constants->{MPI_WIN_FLAVOR_DYNAMIC} = 3;
237242
$constants->{MPI_WIN_FLAVOR_SHARED} = 4;
243+
$constants->{MPI_WIN_UNIFIED} = 0;
244+
$constants->{MPI_WIN_SEPARATE} = 1;
238245

239246
$constants->{MPI_BSEND_OVERHEAD} = 128;
240247
$constants->{MPI_ORDER_C} = 0;

0 commit comments

Comments
 (0)