Skip to content

Remove some more symbols removed in MPI 3.0 #6625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Remove some more symbols removed in MPI 3.0 #6625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6cf32ca
fortran: remove unused files related to removed interfaces
ggouaillardet May 2, 2019
6d823b3
fortran: remove all references to MPI_Address (removed in MPI 3.0)
ggouaillardet Apr 30, 2019
06bf36d
fortran: remove all references to MPI_Errhandler_create (removed in M…
ggouaillardet Apr 30, 2019
88ebb37
fortran: remove all references to MPI_Errhandler_get (removed in MPI …
ggouaillardet Apr 30, 2019
5eed846
fortran: remove all references to MPI_Errhandler_set (removed in MPI …
ggouaillardet Apr 30, 2019
f1c8e16
fortran: remove all references to MPI_Type_extent (removed in MPI 3.0)
ggouaillardet Apr 30, 2019
f0b7523
fortran: remove all references to MPI_Type_hindexed (removed in MPI 3.0)
ggouaillardet Apr 30, 2019
e0190b3
fortran: remove all references to MPI_Type_hvector (removed in MPI 3.0)
ggouaillardet Apr 30, 2019
a01054a
fortran: remove all references to MPI_Type_lb (removed in MPI 3.0)
ggouaillardet Apr 30, 2019
2a16bfa
fortran: remove all references to MPI_Type_struct (removed in MPI 3.0)
ggouaillardet Apr 30, 2019
24b71ee
fortran: remove all references to MPI_Type_ub (removed in MPI 3.0)
ggouaillardet Apr 30, 2019
954f9ab
mpi: remove references to symbols removed in MPI 3.0
ggouaillardet Apr 30, 2019
522ad12
mpi: remove references to MPI_LB and MPI_UB (removed in MPI 3.0)
ggouaillardet Apr 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions ompi/datatype/ompi_datatype_args.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ int32_t ompi_datatype_set_args( ompi_datatype_t* pData,
pArgs->i[2] = i[2][0];
break;

case MPI_COMBINER_HVECTOR_INTEGER:
case MPI_COMBINER_HVECTOR:
pArgs->i[0] = i[0][0];
pArgs->i[1] = i[1][0];
Expand All @@ -152,7 +151,6 @@ int32_t ompi_datatype_set_args( ompi_datatype_t* pData,
memcpy( pArgs->i + pos, i[2], i[0][0] * sizeof(int) );
break;

case MPI_COMBINER_HINDEXED_INTEGER:
case MPI_COMBINER_HINDEXED:
pArgs->i[0] = i[0][0];
memcpy( pArgs->i + 1, i[1], i[0][0] * sizeof(int) );
Expand All @@ -164,7 +162,6 @@ int32_t ompi_datatype_set_args( ompi_datatype_t* pData,
memcpy( pArgs->i + 2, i[2], i[0][0] * sizeof(int) );
break;

case MPI_COMBINER_STRUCT_INTEGER:
case MPI_COMBINER_STRUCT:
pArgs->i[0] = i[0][0];
memcpy( pArgs->i + 1, i[1], i[0][0] * sizeof(int) );
Expand Down Expand Up @@ -707,7 +704,6 @@ static ompi_datatype_t* __ompi_datatype_create_from_args( int32_t* i, MPI_Aint*
}
break;
/******************************************************************/
case MPI_COMBINER_HVECTOR_INTEGER:
case MPI_COMBINER_HVECTOR:
ompi_datatype_create_hvector( i[0], i[1], a[0], d[0], &datatype );
{
Expand All @@ -724,7 +720,6 @@ static ompi_datatype_t* __ompi_datatype_create_from_args( int32_t* i, MPI_Aint*
}
break;
/******************************************************************/
case MPI_COMBINER_HINDEXED_INTEGER:
case MPI_COMBINER_HINDEXED:
ompi_datatype_create_hindexed( i[0], &(i[1]), a, d[0], &datatype );
{
Expand All @@ -741,7 +736,6 @@ static ompi_datatype_t* __ompi_datatype_create_from_args( int32_t* i, MPI_Aint*
}
break;
/******************************************************************/
case MPI_COMBINER_STRUCT_INTEGER:
case MPI_COMBINER_STRUCT:
ompi_datatype_create_struct( i[0], &(i[1]), a, d, &datatype );
{
Expand Down
2 changes: 1 addition & 1 deletion ompi/datatype/ompi_datatype_create_darray.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ cyclic(const int *gsize_array, int dim, int ndims, int nprocs,

if (rem) {
/* if the last block is of size less than blksize, include
it separately using MPI_Type_struct */
it separately using MPI_Type_create_struct */

types [0] = *type_new; types [1] = type_old;
disps [0] = 0; disps [1] = count*stride;
Expand Down
6 changes: 0 additions & 6 deletions ompi/datatype/ompi_datatype_create_subarray.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,6 @@ int32_t ompi_datatype_create_subarray(int ndims,
int32_t i, step, end_loop;
MPI_Aint size, displ, extent;

/**
* If the oldtype contains the original MPI_LB and MPI_UB markers then we
* are forced to follow the MPI standard suggestion and reset these 2
* markers (MPI 3.0 page 96 line 37). Otherwise we can simply resize the
* datatype.
*/
ompi_datatype_type_extent( oldtype, &extent );

/* If the ndims is zero then return the NULL datatype */
Expand Down
3 changes: 0 additions & 3 deletions ompi/datatype/ompi_datatype_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,6 @@
#define OMPI_DATATYPE_MPI_C_DOUBLE_COMPLEX 0x2B
#define OMPI_DATATYPE_MPI_C_LONG_DOUBLE_COMPLEX 0x2C

#define OMPI_DATATYPE_MPI_LB 0x2D
#define OMPI_DATATYPE_MPI_UB 0x2E

/*
* Datatypes from the MPI 3.0 standard
*/
Expand Down
155 changes: 74 additions & 81 deletions ompi/datatype/ompi_datatype_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ ompi_predefined_datatype_t ompi_mpi_datatype_null =

ompi_predefined_datatype_t ompi_mpi_unavailable = OMPI_DATATYPE_INIT_PREDEFINED (UNAVAILABLE, 0);

ompi_predefined_datatype_t ompi_mpi_lb = OMPI_DATATYPE_INIT_PREDEFINED (LB, 0);
ompi_predefined_datatype_t ompi_mpi_ub = OMPI_DATATYPE_INIT_PREDEFINED (UB, 0);
ompi_predefined_datatype_t ompi_mpi_char = OMPI_DATATYPE_INIT_PREDEFINED (CHAR, OMPI_DATATYPE_FLAG_DATA_C);
ompi_predefined_datatype_t ompi_mpi_signed_char = OMPI_DATATYPE_INIT_PREDEFINED (SIGNED_CHAR, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT );
ompi_predefined_datatype_t ompi_mpi_unsigned_char = OMPI_DATATYPE_INIT_PREDEFINED (UNSIGNED_CHAR, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT );
Expand Down Expand Up @@ -363,9 +361,6 @@ const ompi_datatype_t* ompi_datatype_basicDatatypes[OMPI_DATATYPE_MPI_MAX_PREDEF
[OMPI_DATATYPE_MPI_C_DOUBLE_COMPLEX] = &ompi_mpi_c_double_complex.dt,
[OMPI_DATATYPE_MPI_C_LONG_DOUBLE_COMPLEX] = &ompi_mpi_c_long_double_complex.dt,

[OMPI_DATATYPE_MPI_LB] = &ompi_mpi_lb.dt,
[OMPI_DATATYPE_MPI_UB] = &ompi_mpi_ub.dt,

/* MPI 3.0 types */
[OMPI_DATATYPE_MPI_COUNT] = &ompi_mpi_count.dt,

Expand Down Expand Up @@ -557,98 +552,96 @@ int32_t ompi_datatype_init( void )
MOOG(datatype_null, 0);
MOOG(byte, 1);
MOOG(packed, 2);
MOOG(ub, 3);
MOOG(lb, 4);
MOOG(character, 5);
MOOG(logical, 6);
MOOG(integer, 7);
MOOG(integer1, 8);
MOOG(integer2, 9);
MOOG(integer4, 10);
MOOG(integer8, 11);
MOOG(integer16, 12);
MOOG(real, 13);
MOOG(real4, 14);
MOOG(real8, 15);
MOOG(real16, 16);
MOOG(dblprec, 17);
MOOG(cplex, 18);
MOOG(complex8, 19);
MOOG(complex16, 20);
MOOG(complex32, 21);
MOOG(dblcplex, 22);
MOOG(2real, 23);
MOOG(2dblprec, 24);
MOOG(2integer, 25);
MOOG(2cplex, 26);
MOOG(2dblcplex, 27);
MOOG(real2, 28);
MOOG(logical1, 29);
MOOG(logical2, 30);
MOOG(logical4, 31);
MOOG(logical8, 32);
MOOG(character, 3);
MOOG(logical, 4);
MOOG(integer, 5);
MOOG(integer1, 6);
MOOG(integer2, 7);
MOOG(integer4, 8);
MOOG(integer8, 9);
MOOG(integer16, 10);
MOOG(real, 11);
MOOG(real4, 12);
MOOG(real8, 13);
MOOG(real16, 14);
MOOG(dblprec, 15);
MOOG(cplex, 16);
MOOG(complex8, 17);
MOOG(complex16, 18);
MOOG(complex32, 19);
MOOG(dblcplex, 20);
MOOG(2real, 21);
MOOG(2dblprec, 22);
MOOG(2integer, 23);
MOOG(2cplex, 24);
MOOG(2dblcplex, 25);
MOOG(real2, 26);
MOOG(logical1, 27);
MOOG(logical2, 28);
MOOG(logical4, 29);
MOOG(logical8, 30);

/* Now the C types */

MOOG(wchar, 33);
MOOG(char, 34);
MOOG(unsigned_char, 35);
MOOG(signed_char, 36);
MOOG(short, 37);
MOOG(unsigned_short, 38);
MOOG(int, 39);
MOOG(unsigned, 40);
MOOG(long, 41);
MOOG(unsigned_long, 42);
MOOG(long_long_int, 43);
MOOG(unsigned_long_long, 44);

MOOG(float, 45);
MOOG(double, 46);
MOOG(long_double, 47);

MOOG(float_int, 48);
MOOG(double_int, 49);
MOOG(longdbl_int, 50);
MOOG(long_int, 51);
MOOG(2int, 52);
MOOG(short_int, 53);
MOOG(wchar, 31);
MOOG(char, 32);
MOOG(unsigned_char, 33);
MOOG(signed_char, 34);
MOOG(short, 35);
MOOG(unsigned_short, 36);
MOOG(int, 37);
MOOG(unsigned, 38);
MOOG(long, 39);
MOOG(unsigned_long, 40);
MOOG(long_long_int, 41);
MOOG(unsigned_long_long, 42);

MOOG(float, 43);
MOOG(double, 44);
MOOG(long_double, 45);

MOOG(float_int, 46);
MOOG(double_int, 47);
MOOG(longdbl_int, 48);
MOOG(long_int, 49);
MOOG(2int, 50);
MOOG(short_int, 51);

/* C++ types */

MOOG(cxx_bool, 54);
MOOG(cxx_cplex, 55);
MOOG(cxx_dblcplex, 56);
MOOG(cxx_ldblcplex, 57);
MOOG(cxx_bool, 52);
MOOG(cxx_cplex, 53);
MOOG(cxx_dblcplex, 54);
MOOG(cxx_ldblcplex, 55);

/* MPI 2.2 types */
MOOG(int8_t, 58);
MOOG(uint8_t, 59);
MOOG(int16_t, 60);
MOOG(uint16_t, 61);
MOOG(int32_t, 62);
MOOG(uint32_t, 63);
MOOG(int64_t, 64);
MOOG(uint64_t, 65);
MOOG(aint, 66);
MOOG(offset, 67);
MOOG(c_bool, 68);
MOOG(c_float_complex, 69);
MOOG(c_double_complex, 70);
MOOG(c_long_double_complex, 71);
MOOG(int8_t, 56);
MOOG(uint8_t, 57);
MOOG(int16_t, 58);
MOOG(uint16_t, 59);
MOOG(int32_t, 60);
MOOG(uint32_t, 61);
MOOG(int64_t, 62);
MOOG(uint64_t, 63);
MOOG(aint, 64);
MOOG(offset, 65);
MOOG(c_bool, 66);
MOOG(c_float_complex, 67);
MOOG(c_double_complex, 68);
MOOG(c_long_double_complex, 69);

/* MPI 3.0 types */
MOOG(count, 72);
MOOG(count, 70);

/* Datatype missing in old Open MPI */
MOOG(complex4, 73);
MOOG(complex4, 71);

/* Datatypes proposed to the MPI Forum in June 2017 for proposal in
* the MPI 4.0 standard. As of February 2019, it is not accepted yet.
* See https://github.com/mpi-forum/mpi-issues/issues/65 */
MOOG(short_float, 74);
MOOG(c_short_float_complex, 75);
MOOG(cxx_sfltcplex, 76);
MOOG(short_float, 72);
MOOG(c_short_float_complex, 73);
MOOG(cxx_sfltcplex, 74);

/**
* Now make sure all non-contiguous types are marked as such.
Expand Down
7 changes: 2 additions & 5 deletions ompi/include/mpi.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
* reserved.
* Copyright (c) 2011-2013 INRIA. All rights reserved.
* Copyright (c) 2015 University of Houston. All rights reserved.
* Copyright (c) 2015-2018 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2015-2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2017-2019 IBM Corporation. All rights reserved.
* Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
* $COPYRIGHT$
Expand Down Expand Up @@ -630,13 +630,10 @@ enum {
MPI_COMBINER_DUP,
MPI_COMBINER_CONTIGUOUS,
MPI_COMBINER_VECTOR,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we associate values we can cope with the holes in the enum.

MPI_COMBINER_HVECTOR_INTEGER,
MPI_COMBINER_HVECTOR,
MPI_COMBINER_INDEXED,
MPI_COMBINER_HINDEXED_INTEGER,
MPI_COMBINER_HINDEXED,
MPI_COMBINER_INDEXED_BLOCK,
MPI_COMBINER_STRUCT_INTEGER,
MPI_COMBINER_STRUCT,
MPI_COMBINER_SUBARRAY,
MPI_COMBINER_DARRAY,
Expand Down
Loading