Skip to content

Commit f39a3cf

Browse files
committed
mpi: remove references to MPI_LB (removed in MPI 3.0)
Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
1 parent 4f2623c commit f39a3cf

File tree

8 files changed

+1
-13
lines changed

8 files changed

+1
-13
lines changed

ompi/datatype/ompi_datatype_internal.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@
9292
#define OMPI_DATATYPE_MPI_C_DOUBLE_COMPLEX 0x2B
9393
#define OMPI_DATATYPE_MPI_C_LONG_DOUBLE_COMPLEX 0x2C
9494

95-
#define OMPI_DATATYPE_MPI_LB 0x2D
96-
9795
/*
9896
* Datatypes from the MPI 3.0 standard
9997
*/

ompi/datatype/ompi_datatype_module.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,6 @@ const ompi_datatype_t* ompi_datatype_basicDatatypes[OMPI_DATATYPE_MPI_MAX_PREDEF
363363
[OMPI_DATATYPE_MPI_C_DOUBLE_COMPLEX] = &ompi_mpi_c_double_complex.dt,
364364
[OMPI_DATATYPE_MPI_C_LONG_DOUBLE_COMPLEX] = &ompi_mpi_c_long_double_complex.dt,
365365

366-
[OMPI_DATATYPE_MPI_LB] = &ompi_mpi_lb.dt,
367-
368366
/* MPI 3.0 types */
369367
[OMPI_DATATYPE_MPI_COUNT] = &ompi_mpi_count.dt,
370368

ompi/include/mpif-values.pl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ sub write_file {
122122

123123
$handles->{MPI_BYTE} = 1;
124124
$handles->{MPI_PACKED} = 2;
125-
$handles->{MPI_LB} = 4;
126125
$handles->{MPI_CHARACTER} = 5;
127126
$handles->{MPI_LOGICAL} = 6;
128127
$handles->{MPI_INTEGER} = 7;

ompi/mca/coll/portals4/coll_portals4_component.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ ptl_datatype_t ompi_coll_portals4_atomic_datatype [OMPI_DATATYPE_MPI_MAX_PREDEFI
111111
[OMPI_DATATYPE_MPI_C_DOUBLE_COMPLEX] = COLL_PORTALS4_NO_DTYPE,
112112
[OMPI_DATATYPE_MPI_C_LONG_DOUBLE_COMPLEX] = COLL_PORTALS4_NO_DTYPE,
113113

114-
[OMPI_DATATYPE_MPI_LB] = COLL_PORTALS4_NO_DTYPE,
115-
116114
/* MPI 3.0 types */
117115
[OMPI_DATATYPE_MPI_COUNT] = COLL_PORTALS4_NO_DTYPE,
118116

ompi/mca/io/romio321/romio/test-internal/io_bounds_test.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,6 @@ int print_test_params (test_param_t *test)
191191
if (test->type_oldtypes[i] == MPI_BYTE) {
192192
printf ( "%s)\n", "MPI_BYTE");
193193
}
194-
else if (test->type_oldtypes[i] == MPI_LB) {
195-
printf ( "%s)\n", "MPI_LB");
196-
}
197194
}
198195
printf (
199196
"Expected Start offset: %lld\n"

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_file
7272
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_aint = {OMPI_MPI_AINT};
7373
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_byte = {OMPI_MPI_BYTE};
7474
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_packed = {OMPI_MPI_PACKED};
75-
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_lb = {OMPI_MPI_LB};
7675
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_char = {OMPI_MPI_CHAR};
7776
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_signed_char = {OMPI_MPI_SIGNED_CHAR};
7877
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_unsigned_char = {OMPI_MPI_UNSIGNED_CHAR};

ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-types.F90

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ module mpi_f08_types
130130
type(MPI_Datatype), bind(C, name="ompi_f08_mpi_aint") OMPI_PROTECTED :: MPI_AINT
131131
type(MPI_Datatype), bind(C, name="ompi_f08_mpi_byte") OMPI_PROTECTED :: MPI_BYTE
132132
type(MPI_Datatype), bind(C, name="ompi_f08_mpi_packed") OMPI_PROTECTED :: MPI_PACKED
133-
type(MPI_Datatype), bind(C, name="ompi_f08_mpi_lb") OMPI_PROTECTED :: MPI_LB
134133
type(MPI_Datatype), bind(C, name="ompi_f08_mpi_char") OMPI_PROTECTED :: MPI_CHAR
135134
type(MPI_Datatype), bind(C, name="ompi_f08_mpi_signed_char") OMPI_PROTECTED :: MPI_SIGNED_CHAR
136135
type(MPI_Datatype), bind(C, name="ompi_f08_mpi_unsigned_char") OMPI_PROTECTED :: MPI_UNSIGNED_CHAR

ompi/mpi/man/man3/MPI_Type_get_true_extent.3in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Fortran only: Error status (integer).
7272

7373
.SH DESCRIPTION
7474
.ft R
75-
The \fItrue_lb\fP parameter returns the offset of the lowest unit of store that is addressed by the data type, that is, the lower bound of the corresponding typemap, ignoring MPI_LB markers. The \fItrue_extent\fP parameter returns the true size of the data type, that is, the extent of the corresponding typemap, ignoring how the datatype was resized, and performing no rounding for alignment. For both functions, if either the \fItrue_lb\fP or \fItrue_extent\fP parameter cannot express the value to be returned (e.g., if the parameter is too small to hold the output value), it is set to MPI_UNDEFINED.
75+
The \fItrue_lb\fP parameter returns the offset of the lowest unit of store that is addressed by the data type, that is, the lower bound of the corresponding typemap, ignoring how it was resized. The \fItrue_extent\fP parameter returns the true size of the data type, that is, the extent of the corresponding typemap, ignoring how the datatype was resized, and performing no rounding for alignment. For both functions, if either the \fItrue_lb\fP or \fItrue_extent\fP parameter cannot express the value to be returned (e.g., if the parameter is too small to hold the output value), it is set to MPI_UNDEFINED.
7676
.sp
7777
The \fItrue_extent\fP is the minimum number of bytes of memory necessary to hold a data type, uncompressed.
7878
.sp

0 commit comments

Comments
 (0)