Remove all unneeded defines.
This commit was SVN r21802.
Этот коммит содержится в:
родитель
79f3f847ca
Коммит
cb6c9268ca
@ -216,39 +216,21 @@ extern const ompi_datatype_t* ompi_datatype_basicDatatypes[OMPI_DATATYPE_MPI_MAX
|
||||
*/
|
||||
|
||||
#define OMPI_DATATYPE_INITIALIZER_LB OPAL_DATATYPE_INITIALIZER_LB
|
||||
#define OMPI_DATATYPE_LB OPAL_DATATYPE_LB
|
||||
|
||||
#define OMPI_DATATYPE_INITIALIZER_UB OPAL_DATATYPE_INITIALIZER_UB
|
||||
#define OMPI_DATATYPE_UB OPAL_DATATYPE_UB
|
||||
|
||||
#define OMPI_DATATYPE_INITIALIZER_CHAR OPAL_DATATYPE_INITIALIZER_INT1
|
||||
#define OMPI_DATATYPE_CHAR OPAL_DATATYPE_INT1 /* MPI-2.1: p28 signed char; vs. unspecified in C99 ISO/IEC 9899:1999: 5.2.4.2.2 and 6.2.6 */
|
||||
|
||||
#define OMPI_DATATYPE_INITIALIZER_UNSIGNED_CHAR OPAL_DATATYPE_INITIALIZER_UINT1
|
||||
#define OMPI_DATATYPE_UNSIGNED_CHAR OPAL_DATATYPE_UINT1
|
||||
|
||||
#define OMPI_DATATYPE_INITIALIZER_SIGNED_CHAR OPAL_DATATYPE_INITIALIZER_INT1
|
||||
#define OMPI_DATATYPE_SIGNED_CHAR OPAL_DATATYPE_INT1
|
||||
|
||||
#define OMPI_DATATYPE_INITIALIZER_BYTE OPAL_DATATYPE_INITIALIZER_UINT1
|
||||
#define OMPI_DATATYPE_BYTE OPAL_DATATYPE_UINT1
|
||||
|
||||
|
||||
#if SIZEOF_SHORT == 2
|
||||
#define OMPI_DATATYPE_INITIALIZER_SHORT OPAL_DATATYPE_INITIALIZER_INT2
|
||||
#define OMPI_DATATYPE_INITIALIZER_UNSIGNED_SHORT OPAL_DATATYPE_INITIALIZER_UINT2
|
||||
#define OMPI_DATATYPE_SHORT OPAL_DATATYPE_INT2
|
||||
#define OMPI_DATATYPE_UNSIGNED_SHORT OPAL_DATATYPE_UINT2
|
||||
#elif SIZEOF_SHORT == 4
|
||||
#define OMPI_DATATYPE_INITIALIZER_SHORT OPAL_DATATYPE_INITIALIZER_INT4
|
||||
#define OMPI_DATATYPE_INITIALIZER_UNSIGNED_SHORT OPAL_DATATYPE_INITIALIZER_UINT4
|
||||
#define OMPI_DATATYPE_SHORT OPAL_DATATYPE_INT4
|
||||
#define OMPI_DATATYPE_UNSIGNED_SHORT OPAL_DATATYPE_UINT4
|
||||
#elif SIZEOF_SHORT == 8
|
||||
#define OMPI_DATATYPE_INITIALIZER_SHORT OPAL_DATATYPE_INITIALIZER_INT8
|
||||
#define OMPI_DATATYPE_INITIALIZER_UNSIGNED_SHORT OPAL_DATATYPE_INITIALIZER_UINT8
|
||||
#define OMPI_DATATYPE_SHORT OPAL_DATATYPE_INT8
|
||||
#define OMPI_DATATYPE_UNSIGNED_SHORT OPAL_DATATYPE_UINT8
|
||||
#endif
|
||||
|
||||
/*
|
||||
@ -264,35 +246,23 @@ extern const ompi_datatype_t* ompi_datatype_basicDatatypes[OMPI_DATATYPE_MPI_MAX
|
||||
#if SIZEOF_INT == 2
|
||||
#define OMPI_DATATYPE_INITIALIZER_INT OPAL_DATATYPE_INITIALIZER_INT2
|
||||
#define OMPI_DATATYPE_INITIALIZER_UNSIGNED_INT OPAL_DATATYPE_INITIALIZER_UINT2
|
||||
#define OMPI_DATATYPE_INT OPAL_DATATYPE_INT2
|
||||
#define OMPI_DATATYPE_UNSIGNED_INT OPAL_DATATYPE_UINT2
|
||||
#elif SIZEOF_INT == 4
|
||||
#define OMPI_DATATYPE_INITIALIZER_INT OPAL_DATATYPE_INITIALIZER_INT4
|
||||
#define OMPI_DATATYPE_INITIALIZER_UNSIGNED_INT OPAL_DATATYPE_INITIALIZER_UINT4
|
||||
#define OMPI_DATATYPE_INT OPAL_DATATYPE_INT4
|
||||
#define OMPI_DATATYPE_UNSIGNED_INT OPAL_DATATYPE_UINT4
|
||||
#elif SIZEOF_INT == 8
|
||||
#define OMPI_DATATYPE_INITIALIZER_INT OPAL_DATATYPE_INITIALIZER_INT8
|
||||
#define OMPI_DATATYPE_INITIALIZER_UNSIGNED_INT OPAL_DATATYPE_INITIALIZER_UINT8
|
||||
#define OMPI_DATATYPE_INT OPAL_DATATYPE_INT8
|
||||
#define OMPI_DATATYPE_UNSIGNED_INT OPAL_DATATYPE_UINT8
|
||||
#endif
|
||||
|
||||
#if SIZEOF_LONG == 4
|
||||
#define OMPI_DATATYPE_INITIALIZER_LONG OPAL_DATATYPE_INITIALIZER_INT4
|
||||
#define OMPI_DATATYPE_INITIALIZER_UNSIGNED_LONG OPAL_DATATYPE_INITIALIZER_UINT4
|
||||
#define OMPI_DATATYPE_LONG OPAL_DATATYPE_INT4
|
||||
#define OMPI_DATATYPE_UNSIGNED_LONG OPAL_DATATYPE_UINT4
|
||||
#elif SIZEOF_LONG == 8
|
||||
#define OMPI_DATATYPE_INITIALIZER_LONG OPAL_DATATYPE_INITIALIZER_INT8
|
||||
#define OMPI_DATATYPE_INITIALIZER_UNSIGNED_LONG OPAL_DATATYPE_INITIALIZER_UINT8
|
||||
#define OMPI_DATATYPE_LONG OPAL_DATATYPE_INT8
|
||||
#define OMPI_DATATYPE_UNSIGNED_LONG OPAL_DATATYPE_UINT8
|
||||
#elif SIZEOF_LONG == 16
|
||||
#define OMPI_DATATYPE_INITIALIZER_LONG OPAL_DATATYPE_INITIALIZER_INT16
|
||||
#define OMPI_DATATYPE_INITIALIZER_UNSIGNED_LONG OPAL_DATATYPE_INITIALIZER_UINT16
|
||||
#define OMPI_DATATYPE_LONG OPAL_DATATYPE_INT16
|
||||
#define OMPI_DATATYPE_UNSIGNED_LONG OPAL_DATATYPE_UINT16
|
||||
#endif
|
||||
|
||||
|
||||
@ -300,140 +270,63 @@ extern const ompi_datatype_t* ompi_datatype_basicDatatypes[OMPI_DATATYPE_MPI_MAX
|
||||
#if SIZEOF_LONG_LONG == 4
|
||||
#define OMPI_DATATYPE_INITIALIZER_LONG_LONG OPAL_DATATYPE_INITIALIZER_INT4
|
||||
#define OMPI_DATATYPE_INITIALIZER_UNSIGNED_LONG_LONG OPAL_DATATYPE_INITIALIZER_UINT4
|
||||
#define OMPI_DATATYPE_LONG_LONG OPAL_DATATYPE_INT4
|
||||
#define OMPI_DATATYPE_UNSIGNED_LONG_LONG OPAL_DATATYPE_UINT4
|
||||
#elif SIZEOF_LONG_LONG == 8
|
||||
#define OMPI_DATATYPE_INITIALIZER_LONG_LONG OPAL_DATATYPE_INITIALIZER_INT8
|
||||
#define OMPI_DATATYPE_INITIALIZER_UNSIGNED_LONG_LONG OPAL_DATATYPE_INITIALIZER_UINT8
|
||||
#define OMPI_DATATYPE_LONG_LONG OPAL_DATATYPE_INT8
|
||||
#define OMPI_DATATYPE_UNSIGNED_LONG_LONG OPAL_DATATYPE_UINT8
|
||||
#elif SIZEOF_LONG_LONG == 16
|
||||
#define OMPI_DATATYPE_INITIALIZER_LONG_LONG OPAL_DATATYPE_INITIALIZER_INT16
|
||||
#define OMPI_DATATYPE_INITIALIZER_UNSIGNED_LONG_LONG OPAL_DATATYPE_INITIALIZER_UINT16
|
||||
#define OMPI_DATATYPE_LONG_LONG OPAL_DATATYPE_INT16
|
||||
#define OMPI_DATATYPE_UNSIGNED_LONG_LONG OPAL_DATATYPE_UINT16
|
||||
#endif
|
||||
|
||||
#else /* HAVE_LONG_LONG */
|
||||
|
||||
#define OMPI_DATATYPE_INITIALIZER_LONG_LONG OPAL_DATATYPE_INIT_UNAVAILABLE (LONG_LONG, OMPI_DATATYPE_FLAG_DATA_C)
|
||||
#define OMPI_DATATYPE_INITIALIZER_UNSIGNED_LONG_LONG OPAL_DATATYPE_INIT_UNAVAILABLE (UNSIGNED_LONG_LONG, OMPI_DATATYPE_FLAG_DATA_C)
|
||||
#define OMPI_DATATYPE_LONG_LONG OPAL_DATATYPE_UNAVAILABLE
|
||||
#define OMPI_DATATYPE_UNSIGNED_LONG_LONG OPAL_DATATYPE_UNAVAILABLE
|
||||
|
||||
#endif /* HAVE_LONG_LONG */
|
||||
|
||||
|
||||
#if SIZEOF_FLOAT == 2
|
||||
#define OMPI_DATATYPE_INITIALIZER_FLOAT OPAL_DATATYPE_INITIALIZER_FLOAT2
|
||||
#define OMPI_DATATYPE_FLOAT OPAL_DATATYPE_FLOAT2
|
||||
#elif SIZEOF_FLOAT == 4
|
||||
#define OMPI_DATATYPE_INITIALIZER_FLOAT OPAL_DATATYPE_INITIALIZER_FLOAT4
|
||||
#define OMPI_DATATYPE_FLOAT OPAL_DATATYPE_FLOAT4
|
||||
#elif SIZEOF_FLOAT == 8
|
||||
#define OMPI_DATATYPE_INITIALIZER_FLOAT OPAL_DATATYPE_INITIALIZER_FLOAT8
|
||||
#define OMPI_DATATYPE_FLOAT OPAL_DATATYPE_FLOAT8
|
||||
#endif
|
||||
|
||||
|
||||
#if SIZEOF_DOUBLE == 4
|
||||
#define OMPI_DATATYPE_INITIALIZER_DOUBLE OPAL_DATATYPE_INITIALIZER_FLOAT4
|
||||
#define OMPI_DATATYPE_DOUBLE OPAL_DATATYPE_FLOAT4
|
||||
#elif SIZEOF_DOUBLE == 8
|
||||
#define OMPI_DATATYPE_INITIALIZER_DOUBLE OPAL_DATATYPE_INITIALIZER_FLOAT8
|
||||
#define OMPI_DATATYPE_DOUBLE OPAL_DATATYPE_FLOAT8
|
||||
#elif SIZEOF_DOUBLE == 12
|
||||
#define OMPI_DATATYPE_INITIALIZER_DOUBLE OPAL_DATATYPE_INITIALIZER_FLOAT12
|
||||
#define OMPI_DATATYPE_DOUBLE OPAL_DATATYPE_FLOAT12
|
||||
#elif SIZEOF_DOUBLE == 16
|
||||
#define OMPI_DATATYPE_INITIALIZER_DOUBLE OPAL_DATATYPE_INITIALIZER_FLOAT16
|
||||
#define OMPI_DATATYPE_DOUBLE OPAL_DATATYPE_FLOAT16
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef HAVE_LONG_DOUBLE
|
||||
#if SIZEOF_LONG_DOUBLE == 4
|
||||
#define OMPI_DATATYPE_INITIALIZER_LONG_DOUBLE OPAL_DATATYPE_INITIALIZER_FLOAT4
|
||||
#define OMPI_DATATYPE_LONG_DOUBLE OPAL_DATATYPE_FLOAT4
|
||||
#elif SIZEOF_LONG_DOUBLE == 8
|
||||
#define OMPI_DATATYPE_INITIALIZER_LONG_DOUBLE OPAL_DATATYPE_INITIALIZER_FLOAT8
|
||||
#define OMPI_DATATYPE_LONG_DOUBLE OPAL_DATATYPE_FLOAT8
|
||||
#elif SIZEOF_LONG_DOUBLE == 12
|
||||
#define OMPI_DATATYPE_INITIALIZER_LONG_DOUBLE OPAL_DATATYPE_INITIALIZER_FLOAT12
|
||||
#define OMPI_DATATYPE_LONG_DOUBLE OPAL_DATATYPE_FLOAT12
|
||||
#elif SIZEOF_LONG_DOUBLE == 16
|
||||
#define OMPI_DATATYPE_INITIALIZER_LONG_DOUBLE OPAL_DATATYPE_INITIALIZER_FLOAT16
|
||||
#define OMPI_DATATYPE_LONG_DOUBLE OPAL_DATATYPE_FLOAT16
|
||||
#endif
|
||||
|
||||
#else /* HAVE_LONG_DOUBLE */
|
||||
|
||||
#define OMPI_DATATYPE_INITIALIZER_LONG_DOUBLE OMPI_DATATYPE_INIT_UNAVAILABLE(LONG_DOUBLE, OMPI_DATATYPE_FLAG_DATA_C)
|
||||
#define OMPI_DATATYPE_LONG_DOUBLE OPAL_DATATYPE_UNAVAILABLE
|
||||
|
||||
#endif /* HAVE_LONG_DOUBLE */
|
||||
|
||||
#define OMPI_DATATYPE_INITIALIZER_PACKED OPAL_DATATYPE_INITIALIZER_UINT1
|
||||
#define OMPI_DATATYPE_PACKED OPAL_DATATYPE_UINT1
|
||||
|
||||
#define OMPI_DATATYPE_INITIALIZER_BOOL OPAL_DATATYPE_INITIALIZER_BOOL
|
||||
#define OMPI_DATATYPE_BOOL OPAL_DATATYPE_BOOL
|
||||
|
||||
#define OMPI_DATATYPE_INITIALIZER_WCHAR OPAL_DATATYPE_INITIALIZER_WCHAR
|
||||
#define OMPI_DATATYPE_WCHAR OPAL_DATATYPE_WCHAR
|
||||
|
||||
/*
|
||||
* Now come the id's of the Fortran Datatypes.
|
||||
*/
|
||||
#if OMPI_SIZEOF_FORTRAN_LOGICAL == 1
|
||||
#define OMPI_DATATYPE_LOGICAL OPAL_DATATYPE_INT1
|
||||
#elif OMPI_SIZEOF_FORTRAN_LOGICAL == 2
|
||||
#define OMPI_DATATYPE_LOGICAL OPAL_DATATYPE_INT2
|
||||
#elif OMPI_SIZEOF_FORTRAN_LOGICAL == 4
|
||||
#define OMPI_DATATYPE_LOGICAL OPAL_DATATYPE_INT4
|
||||
#elif OMPI_SIZEOF_FORTRAN_LOGICAL == 8
|
||||
#define OMPI_DATATYPE_LOGICAL OPAL_DATATYPE_INT8
|
||||
#endif
|
||||
|
||||
#if OMPI_SIZEOF_FORTRAN_CHARACTER == 1
|
||||
#define OMPI_DATATYPE_CHARACTER OPAL_DATATYPE_INT1
|
||||
#elif OMPI_SIZEOF_FORTRAN_CHARACTER == 2
|
||||
#define OMPI_DATATYPE_CHARACTER OPAL_DATATYPE_INT2
|
||||
#elif OMPI_SIZEOF_FORTRAN_CHARACTER == 4
|
||||
#define OMPI_DATATYPE_CHARACTER OPAL_DATATYPE_INT4
|
||||
#elif OMPI_SIZEOF_FORTRAN_CHARACTER == 8
|
||||
#define OMPI_DATATYPE_CHARACTER OPAL_DATATYPE_INT8
|
||||
#endif
|
||||
|
||||
#if OMPI_SIZEOF_FORTRAN_INTEGER == 1
|
||||
#define OMPI_DATATYPE_INTEGER OPAL_DATATYPE_INT1
|
||||
#elif OMPI_SIZEOF_FORTRAN_INTEGER == 2
|
||||
#define OMPI_DATATYPE_INTEGER OPAL_DATATYPE_INT2
|
||||
#elif OMPI_SIZEOF_FORTRAN_INTEGER == 4
|
||||
#define OMPI_DATATYPE_INTEGER OPAL_DATATYPE_INT4
|
||||
#elif OMPI_SIZEOF_FORTRAN_INTEGER == 8
|
||||
#define OMPI_DATATYPE_INTEGER OPAL_DATATYPE_INT8
|
||||
#endif
|
||||
|
||||
#if OMPI_SIZEOF_FORTRAN_REAL == 2
|
||||
#define OMPI_DATATYPE_REAL OPAL_DATATYPE_FLOAT2
|
||||
#elif OMPI_SIZEOF_FORTRAN_REAL == 4
|
||||
#define OMPI_DATATYPE_REAL OPAL_DATATYPE_FLOAT4
|
||||
#elif OMPI_SIZEOF_FORTRAN_REAL == 8
|
||||
#define OMPI_DATATYPE_REAL OPAL_DATATYPE_FLOAT8
|
||||
#elif OMPI_SIZEOF_FORTRAN_REAL == 16
|
||||
#define OMPI_DATATYPE_REAL OPAL_DATATYPE_FLOAT16
|
||||
#endif
|
||||
|
||||
#if OMPI_SIZEOF_FORTRAN_DOUBLE_PRECISION == 2
|
||||
#define OMPI_DATATYPE_DOUBLE_PRECISION OPAL_DATATYPE_FLOAT2
|
||||
#elif OMPI_SIZEOF_FORTRAN_DOUBLE_PRECISION == 4
|
||||
#define OMPI_DATATYPE_DOUBLE_PRECISION OPAL_DATATYPE_FLOAT4
|
||||
#elif OMPI_SIZEOF_FORTRAN_DOUBLE_PRECISION == 8
|
||||
#define OMPI_DATATYPE_DOUBLE_PRECISION OPAL_DATATYPE_FLOAT8
|
||||
#elif OMPI_SIZEOF_FORTRAN_DOUBLE_PRECISION == 16
|
||||
#define OMPI_DATATYPE_DOUBLE_PRECISION OPAL_DATATYPE_FLOAT16
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Following are the structured types, that cannot be represented
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user