Skip to content

Commit 487f1b4

Browse files
committed
ompi: remove MPI functions and datatypes removed in MPI-3.0
This commit removes the functions that were removed from MPI-3.0 back in 2012. Signed-off-by: Nathan Hjelm <[email protected]>
1 parent 093b55a commit 487f1b4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+124
-3049
lines changed

ompi/datatype/ompi_datatype_args.c

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Copyright (c) 2004-2006 The Regents of the University of California.
1212
* All rights reserved.
1313
* Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
14-
* Copyright (c) 2013-2017 Los Alamos National Security, LLC. All rights
14+
* Copyright (c) 2013-2018 Los Alamos National Security, LLC. All rights
1515
* reserved.
1616
* Copyright (c) 2015-2017 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
@@ -839,19 +839,17 @@ ompi_datatype_t* ompi_datatype_get_single_predefined_type_from_args( ompi_dataty
839839
return NULL;
840840
}
841841
}
842-
if (current_predef != MPI_LB && current_predef != MPI_UB) {
843-
if( NULL == predef ) { /* This is the first iteration */
844-
predef = current_predef;
845-
} else {
846-
/**
847-
* What exactly should we consider as identical types?
848-
* If they are the same MPI level type, or if they map
849-
* to the same OPAL datatype? In other words, MPI_FLOAT
850-
* and MPI_REAL4 are they identical?
851-
*/
852-
if( predef != current_predef ) {
853-
return NULL;
854-
}
842+
if( NULL == predef ) { /* This is the first iteration */
843+
predef = current_predef;
844+
} else {
845+
/**
846+
* What exactly should we consider as identical types?
847+
* If they are the same MPI level type, or if they map
848+
* to the same OPAL datatype? In other words, MPI_FLOAT
849+
* and MPI_REAL4 are they identical?
850+
*/
851+
if( predef != current_predef ) {
852+
return NULL;
855853
}
856854
}
857855
}

ompi/datatype/ompi_datatype_internal.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* reserved.
66
* Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
77
* Copyright (c) 2010-2012 Cisco Systems, Inc. All rights reserved.
8-
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
8+
* Copyright (c) 2013-2018 Los Alamos National Security, LLC. All rights
99
* reserved.
1010
* Copyright (c) 2015-2018 Research Organization for Information Science
1111
* and Technology (RIST). All rights reserved.
@@ -91,9 +91,6 @@
9191
#define OMPI_DATATYPE_MPI_C_DOUBLE_COMPLEX 0x2A
9292
#define OMPI_DATATYPE_MPI_C_LONG_DOUBLE_COMPLEX 0x2B
9393

94-
#define OMPI_DATATYPE_MPI_LB 0x2C
95-
#define OMPI_DATATYPE_MPI_UB 0x2D
96-
9794
/*
9895
* Datatypes from the MPI 3.0 standard
9996
*/

ompi/datatype/ompi_datatype_module.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved.
1414
* Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
1515
* Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
16-
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
16+
* Copyright (c) 2013-2018 Los Alamos National Security, LLC. All rights
1717
* reserved.
1818
* Copyright (c) 2015-2018 Research Organization for Information Science
1919
* and Technology (RIST). All rights reserved.
@@ -67,8 +67,6 @@ ompi_predefined_datatype_t ompi_mpi_datatype_null =
6767

6868
ompi_predefined_datatype_t ompi_mpi_unavailable = OMPI_DATATYPE_INIT_PREDEFINED (UNAVAILABLE, 0);
6969

70-
ompi_predefined_datatype_t ompi_mpi_lb = OMPI_DATATYPE_INIT_PREDEFINED (LB, 0);
71-
ompi_predefined_datatype_t ompi_mpi_ub = OMPI_DATATYPE_INIT_PREDEFINED (UB, 0);
7270
ompi_predefined_datatype_t ompi_mpi_char = OMPI_DATATYPE_INIT_PREDEFINED (CHAR, OMPI_DATATYPE_FLAG_DATA_C);
7371
ompi_predefined_datatype_t ompi_mpi_signed_char = OMPI_DATATYPE_INIT_PREDEFINED (SIGNED_CHAR, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT );
7472
ompi_predefined_datatype_t ompi_mpi_unsigned_char = OMPI_DATATYPE_INIT_PREDEFINED (UNSIGNED_CHAR, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT );
@@ -357,9 +355,6 @@ const ompi_datatype_t* ompi_datatype_basicDatatypes[OMPI_DATATYPE_MPI_MAX_PREDEF
357355
[OMPI_DATATYPE_MPI_C_DOUBLE_COMPLEX] = &ompi_mpi_c_double_complex.dt,
358356
[OMPI_DATATYPE_MPI_C_LONG_DOUBLE_COMPLEX] = &ompi_mpi_c_long_double_complex.dt,
359357

360-
[OMPI_DATATYPE_MPI_LB] = &ompi_mpi_lb.dt,
361-
[OMPI_DATATYPE_MPI_UB] = &ompi_mpi_ub.dt,
362-
363358
/* MPI 3.0 types */
364359
[OMPI_DATATYPE_MPI_COUNT] = &ompi_mpi_count.dt,
365360

@@ -545,8 +540,6 @@ int32_t ompi_datatype_init( void )
545540
MOOG(datatype_null, 0);
546541
MOOG(byte, 1);
547542
MOOG(packed, 2);
548-
MOOG(ub, 3);
549-
MOOG(lb, 4);
550543
MOOG(character, 5);
551544
MOOG(logical, 6);
552545
MOOG(integer, 7);

0 commit comments

Comments
 (0)