Skip to content

Commit e1f8860

Browse files
hjelmnhjelmn
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 642656a commit e1f8860

Some content is hidden

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

48 files changed

+265
-3193
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: 3 additions & 6 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,16 +91,13 @@
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
*/
100-
#define OMPI_DATATYPE_MPI_COUNT 0x2E
97+
#define OMPI_DATATYPE_MPI_COUNT 0x2C
10198

10299
/* This should __ALWAYS__ stay last */
103-
#define OMPI_DATATYPE_MPI_UNAVAILABLE 0x2F
100+
#define OMPI_DATATYPE_MPI_UNAVAILABLE 0x2D
104101

105102

106103
#define OMPI_DATATYPE_MPI_MAX_PREDEFINED (OMPI_DATATYPE_MPI_UNAVAILABLE+1)

‎ompi/datatype/ompi_datatype_module.c‎

Lines changed: 71 additions & 78 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,88 +540,86 @@ 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);
550-
MOOG(character, 5);
551-
MOOG(logical, 6);
552-
MOOG(integer, 7);
553-
MOOG(integer1, 8);
554-
MOOG(integer2, 9);
555-
MOOG(integer4, 10);
556-
MOOG(integer8, 11);
557-
MOOG(integer16, 12);
558-
MOOG(real, 13);
559-
MOOG(real4, 14);
560-
MOOG(real8, 15);
561-
MOOG(real16, 16);
562-
MOOG(dblprec, 17);
563-
MOOG(cplex, 18);
564-
MOOG(complex8, 19);
565-
MOOG(complex16, 20);
566-
MOOG(complex32, 21);
567-
MOOG(dblcplex, 22);
568-
MOOG(2real, 23);
569-
MOOG(2dblprec, 24);
570-
MOOG(2integer, 25);
571-
MOOG(2cplex, 26);
572-
MOOG(2dblcplex, 27);
573-
MOOG(real2, 28);
574-
MOOG(logical1, 29);
575-
MOOG(logical2, 30);
576-
MOOG(logical4, 31);
577-
MOOG(logical8, 32);
543+
MOOG(character, 3);
544+
MOOG(logical, 4);
545+
MOOG(integer, 5);
546+
MOOG(integer1, 6);
547+
MOOG(integer2, 7);
548+
MOOG(integer4, 8);
549+
MOOG(integer8, 9);
550+
MOOG(integer16, 10);
551+
MOOG(real, 11);
552+
MOOG(real4, 12);
553+
MOOG(real8, 13);
554+
MOOG(real16, 14);
555+
MOOG(dblprec, 15);
556+
MOOG(cplex, 16);
557+
MOOG(complex8, 17);
558+
MOOG(complex16, 18);
559+
MOOG(complex32, 19);
560+
MOOG(dblcplex, 20);
561+
MOOG(2real, 21);
562+
MOOG(2dblprec, 22);
563+
MOOG(2integer, 23);
564+
MOOG(2cplex, 24);
565+
MOOG(2dblcplex, 25);
566+
MOOG(real2, 26);
567+
MOOG(logical1, 27);
568+
MOOG(logical2, 28);
569+
MOOG(logical4, 29);
570+
MOOG(logical8, 30);
578571

579572
/* Now the C types */
580573

581-
MOOG(wchar, 33);
582-
MOOG(char, 34);
583-
MOOG(unsigned_char, 35);
584-
MOOG(signed_char, 36);
585-
MOOG(short, 37);
586-
MOOG(unsigned_short, 38);
587-
MOOG(int, 39);
588-
MOOG(unsigned, 40);
589-
MOOG(long, 41);
590-
MOOG(unsigned_long, 42);
591-
MOOG(long_long_int, 43);
592-
MOOG(unsigned_long_long, 44);
593-
594-
MOOG(float, 45);
595-
MOOG(double, 46);
596-
MOOG(long_double, 47);
597-
598-
MOOG(float_int, 48);
599-
MOOG(double_int, 49);
600-
MOOG(longdbl_int, 50);
601-
MOOG(long_int, 51);
602-
MOOG(2int, 52);
603-
MOOG(short_int, 53);
574+
MOOG(wchar, 31);
575+
MOOG(char, 32);
576+
MOOG(unsigned_char, 33);
577+
MOOG(signed_char, 34);
578+
MOOG(short, 35);
579+
MOOG(unsigned_short, 36);
580+
MOOG(int, 37);
581+
MOOG(unsigned, 38);
582+
MOOG(long, 39);
583+
MOOG(unsigned_long, 40);
584+
MOOG(long_long_int, 41);
585+
MOOG(unsigned_long_long, 42);
586+
587+
MOOG(float, 43);
588+
MOOG(double, 44);
589+
MOOG(long_double, 45);
590+
591+
MOOG(float_int, 46);
592+
MOOG(double_int, 47);
593+
MOOG(longdbl_int, 48);
594+
MOOG(long_int, 49);
595+
MOOG(2int, 50);
596+
MOOG(short_int, 51);
604597

605598
/* C++ types */
606599

607-
MOOG(cxx_bool, 54);
608-
MOOG(cxx_cplex, 55);
609-
MOOG(cxx_dblcplex, 56);
610-
MOOG(cxx_ldblcplex, 57);
600+
MOOG(cxx_bool, 52);
601+
MOOG(cxx_cplex, 53);
602+
MOOG(cxx_dblcplex, 54);
603+
MOOG(cxx_ldblcplex, 55);
611604

612605
/* MPI 2.2 types */
613-
MOOG(int8_t, 58);
614-
MOOG(uint8_t, 59);
615-
MOOG(int16_t, 60);
616-
MOOG(uint16_t, 61);
617-
MOOG(int32_t, 62);
618-
MOOG(uint32_t, 63);
619-
MOOG(int64_t, 64);
620-
MOOG(uint64_t, 65);
621-
MOOG(aint, 66);
622-
MOOG(offset, 67);
623-
MOOG(c_bool, 68);
624-
MOOG(c_float_complex, 69);
625-
MOOG(c_double_complex, 70);
626-
MOOG(c_long_double_complex, 71);
606+
MOOG(int8_t, 56);
607+
MOOG(uint8_t, 57);
608+
MOOG(int16_t, 58);
609+
MOOG(uint16_t, 59);
610+
MOOG(int32_t, 60);
611+
MOOG(uint32_t, 61);
612+
MOOG(int64_t, 62);
613+
MOOG(uint64_t, 63);
614+
MOOG(aint, 64);
615+
MOOG(offset, 65);
616+
MOOG(c_bool, 66);
617+
MOOG(c_float_complex, 67);
618+
MOOG(c_double_complex, 68);
619+
MOOG(c_long_double_complex, 69);
627620

628621
/* MPI 3.0 types */
629-
MOOG(count, 72);
622+
MOOG(count, 70);
630623

631624
/**
632625
* Now make sure all non-contiguous types are marked as such.

0 commit comments

Comments
 (0)