Commit 1c821cb2 authored by William Gropp's avatar William Gropp
Browse files

[svn-r7005] Remove support for the MPI-1.0 only datatypes MPI_2COMPLEX and...

[svn-r7005] Remove support for the MPI-1.0 only datatypes MPI_2COMPLEX and MPI_2DOUBLE_COMPLEX (support and be reenable by defining MPICH_DEFINE_2COMPLEX in case we have any users that really need it)
parent 3f6232c3
......@@ -66,8 +66,17 @@ typedef int MPI_Datatype;
#define MPI_DOUBLE_PRECISION ((MPI_Datatype)@MPI_DOUBLE_PRECISION@)
#define MPI_INTEGER ((MPI_Datatype)@MPI_INTEGER@)
#define MPI_2INTEGER ((MPI_Datatype)@MPI_2INTEGER@)
/*
* MPI_2COMPLEX and MPI_2DOUBLE_COMPLEX were defined by accident in
* MPI 1.0 and removed in MPI 1.1.
*
* This definition provides backward compatibility. These definitions
* will be removed in a subsequent MPICH release
*/
#ifdef MPICH_DEFINE_2COMPLEX
#define MPI_2COMPLEX ((MPI_Datatype)@MPI_2COMPLEX@)
#define MPI_2DOUBLE_COMPLEX ((MPI_Datatype)@MPI_2DOUBLE_COMPLEX@)
#endif
#define MPI_2REAL ((MPI_Datatype)@MPI_2REAL@)
#define MPI_2DOUBLE_PRECISION ((MPI_Datatype)@MPI_2DOUBLE_PRECISION@)
#define MPI_CHARACTER ((MPI_Datatype)@MPI_CHARACTER@)
......
......@@ -74,8 +74,10 @@ static mpi_names_t mpi_names[] = {
type_name_entry(MPI_DOUBLE_PRECISION),
type_name_entry(MPI_INTEGER),
type_name_entry(MPI_2INTEGER),
#ifdef MPICH_DEFINE_2COMPLEX
type_name_entry(MPI_2COMPLEX),
type_name_entry(MPI_2DOUBLE_COMPLEX),
#endif
type_name_entry(MPI_2REAL),
type_name_entry(MPI_2DOUBLE_PRECISION),
type_name_entry(MPI_CHARACTER),
......
......@@ -85,14 +85,16 @@ static MPI_Datatype mpi_dtypes[] = {
MPI_DOUBLE_PRECISION,
MPI_INTEGER,
MPI_2INTEGER,
#ifdef MPICH_DEFINE_2COMPLEX
MPI_2COMPLEX,
MPI_2DOUBLE_COMPLEX,
#endif
MPI_2REAL,
MPI_2DOUBLE_PRECISION,
MPI_CHARACTER,
#ifdef HAVE_FORTRAN_BINDING
/* Size-specific types; these are in section 10.2.4 (Extended Fortran Support)
as well as optional in MPI-1
/* Size-specific types; these are in section 10.2.4 (Extended Fortran
Support) as well as optional in MPI-1
*/
MPI_REAL4,
MPI_REAL8,
......
......@@ -321,8 +321,10 @@ char *MPIDU_Datatype_builtin_to_string(MPI_Datatype type)
static char t_doubleprecision[] = "MPI_DOUBLE_PRECISION";
static char t_integer[] = "MPI_INTEGER";
static char t_2integer[] = "MPI_2INTEGER";
#ifdef MPICH_DEFINE_2COMPLEX
static char t_2complex[] = "MPI_2COMPLEX";
static char t_2doublecomplex[] = "MPI_2DOUBLE_COMPLEX";
#endif
static char t_2real[] = "MPI_2REAL";
static char t_2doubleprecision[] = "MPI_2DOUBLE_PRECISION";
static char t_character[] = "MPI_CHARACTER";
......@@ -363,8 +365,10 @@ char *MPIDU_Datatype_builtin_to_string(MPI_Datatype type)
if (type == MPI_DOUBLE_PRECISION) return t_doubleprecision;
if (type == MPI_INTEGER) return t_integer;
if (type == MPI_2INTEGER) return t_2integer;
#ifdef MPICH_DEFINE_2COMPLEX
if (type == MPI_2COMPLEX) return t_2complex;
if (type == MPI_2DOUBLE_COMPLEX) return t_2doublecomplex;
#endif
if (type == MPI_2REAL) return t_2real;
if (type == MPI_2DOUBLE_PRECISION) return t_2doubleprecision;
if (type == MPI_CHARACTER) return t_character;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment