datatype: Remove #if HAVE_[TYPE] for C99 types
Now Open MPI requires a C99 compiler. Checking availability of the following types is no more needed. - `long long` (`signed` and `unsigned`) - `long double` - `float _Complex` - `double _Complex` - `long double _Complex` Furthermore, the `#if HAVE_[TYPE]` style checking is not correct. Availability of C types is checked by `AC_CHECK_TYPES` in `configure.ac`. `AC_CHECK_TYPES` defines macro `HAVE_[TYPE]` as `1` in `opal_config.h` if the `[TYPE]` is available. But it does not define `HAVE_[TYPE]` (instead of defining as `0`) if it is not available. So even if we need `HAVE_[TYPE]` checking, it should be `#if defined(HAVE_[TYPE])`. I didn't remove `AC_CHECK_TYPES` for these types in `configure.ac` since someone may use `HAVE_[TYPE]` macros somewhere. Signed-off-by: KAWASHIMA Takahiro <t-kawashima@jp.fujitsu.com>
Этот коммит содержится в:
KAWASHIMA Takahiro
родитель
592e2cc0d9
Коммит
cacd6f389c
@ -559,8 +559,6 @@ extern const ompi_datatype_t* ompi_datatype_basicDatatypes[OMPI_DATATYPE_MPI_MAX
|
||||
#define OMPI_DATATYPE_INITIALIZER_UNSIGNED_LONG OPAL_DATATYPE_INITIALIZER_UINT16
|
||||
#endif
|
||||
|
||||
|
||||
#if HAVE_LONG_LONG
|
||||
#if SIZEOF_LONG_LONG == 4
|
||||
#define OMPI_DATATYPE_INITIALIZER_LONG_LONG_INT OPAL_DATATYPE_INITIALIZER_INT4
|
||||
#define OMPI_DATATYPE_INITIALIZER_UNSIGNED_LONG_LONG OPAL_DATATYPE_INITIALIZER_UINT4
|
||||
@ -572,13 +570,6 @@ extern const ompi_datatype_t* ompi_datatype_basicDatatypes[OMPI_DATATYPE_MPI_MAX
|
||||
#define OMPI_DATATYPE_INITIALIZER_UNSIGNED_LONG_LONG OPAL_DATATYPE_INITIALIZER_UINT16
|
||||
#endif
|
||||
|
||||
#else /* HAVE_LONG_LONG */
|
||||
|
||||
#define OMPI_DATATYPE_INITIALIZER_LONG_LONG_INT OPAL_DATATYPE_INIT_UNAVAILABLE (LONG_LONG_INT, OMPI_DATATYPE_FLAG_DATA_C)
|
||||
#define OMPI_DATATYPE_INITIALIZER_UNSIGNED_LONG_LONG OPAL_DATATYPE_INIT_UNAVAILABLE (UNSIGNED_LONG_LONG, OMPI_DATATYPE_FLAG_DATA_C)
|
||||
|
||||
#endif /* HAVE_LONG_LONG */
|
||||
|
||||
#if SIZEOF_FLOAT == 2
|
||||
#define OMPI_DATATYPE_INITIALIZER_FLOAT OPAL_DATATYPE_INITIALIZER_FLOAT2
|
||||
#elif SIZEOF_FLOAT == 4
|
||||
@ -587,7 +578,6 @@ extern const ompi_datatype_t* ompi_datatype_basicDatatypes[OMPI_DATATYPE_MPI_MAX
|
||||
#define OMPI_DATATYPE_INITIALIZER_FLOAT OPAL_DATATYPE_INITIALIZER_FLOAT8
|
||||
#endif
|
||||
|
||||
|
||||
#if SIZEOF_DOUBLE == 4
|
||||
#define OMPI_DATATYPE_INITIALIZER_DOUBLE OPAL_DATATYPE_INITIALIZER_FLOAT4
|
||||
#elif SIZEOF_DOUBLE == 8
|
||||
@ -598,8 +588,6 @@ extern const ompi_datatype_t* ompi_datatype_basicDatatypes[OMPI_DATATYPE_MPI_MAX
|
||||
#define OMPI_DATATYPE_INITIALIZER_DOUBLE OPAL_DATATYPE_INITIALIZER_FLOAT16
|
||||
#endif
|
||||
|
||||
|
||||
#if HAVE_LONG_DOUBLE
|
||||
#if SIZEOF_LONG_DOUBLE == 4
|
||||
#define OMPI_DATATYPE_INITIALIZER_LONG_DOUBLE OPAL_DATATYPE_INITIALIZER_FLOAT4
|
||||
#elif SIZEOF_LONG_DOUBLE == 8
|
||||
@ -610,12 +598,6 @@ extern const ompi_datatype_t* ompi_datatype_basicDatatypes[OMPI_DATATYPE_MPI_MAX
|
||||
#define OMPI_DATATYPE_INITIALIZER_LONG_DOUBLE OPAL_DATATYPE_INITIALIZER_FLOAT16
|
||||
#endif
|
||||
|
||||
#else /* HAVE_LONG_DOUBLE */
|
||||
|
||||
#define OMPI_DATATYPE_INITIALIZER_LONG_DOUBLE OMPI_DATATYPE_INIT_UNAVAILABLE(LONG_DOUBLE, OMPI_DATATYPE_FLAG_DATA_C)
|
||||
|
||||
#endif /* HAVE_LONG_DOUBLE */
|
||||
|
||||
#define OMPI_DATATYPE_INITIALIZER_PACKED OPAL_DATATYPE_INITIALIZER_UINT1
|
||||
|
||||
#define OMPI_DATATYPE_INITIALIZER_BOOL OPAL_DATATYPE_INITIALIZER_BOOL
|
||||
|
||||
@ -80,20 +80,11 @@ ompi_predefined_datatype_t ompi_mpi_int = OMPI_DATATYPE_INIT_PREDEFIN
|
||||
ompi_predefined_datatype_t ompi_mpi_unsigned = OMPI_DATATYPE_INIT_PREDEFINED (UNSIGNED, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT );
|
||||
ompi_predefined_datatype_t ompi_mpi_long = OMPI_DATATYPE_INIT_PREDEFINED (LONG, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT );
|
||||
ompi_predefined_datatype_t ompi_mpi_unsigned_long = OMPI_DATATYPE_INIT_PREDEFINED (UNSIGNED_LONG, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT );
|
||||
#if HAVE_LONG_LONG
|
||||
ompi_predefined_datatype_t ompi_mpi_long_long_int = OMPI_DATATYPE_INIT_PREDEFINED (LONG_LONG_INT, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT );
|
||||
ompi_predefined_datatype_t ompi_mpi_unsigned_long_long = OMPI_DATATYPE_INIT_PREDEFINED (UNSIGNED_LONG_LONG, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT );
|
||||
#else
|
||||
ompi_predefined_datatype_t ompi_mpi_long_long_int = OMPI_DATATYPE_INIT_UNAVAILABLE (LONG_LONG_INT, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT );
|
||||
ompi_predefined_datatype_t ompi_mpi_unsigned_long_long = OMPI_DATATYPE_INIT_UNAVAILABLE (UNSIGNED_LONG_LONG, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT);
|
||||
#endif /* HAVE_LONG_LONG */
|
||||
ompi_predefined_datatype_t ompi_mpi_float = OMPI_DATATYPE_INIT_PREDEFINED (FLOAT, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_FLOAT );
|
||||
ompi_predefined_datatype_t ompi_mpi_double = OMPI_DATATYPE_INIT_PREDEFINED (DOUBLE, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_FLOAT );
|
||||
#if HAVE_LONG_DOUBLE
|
||||
ompi_predefined_datatype_t ompi_mpi_long_double = OMPI_DATATYPE_INIT_PREDEFINED (LONG_DOUBLE, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_FLOAT );
|
||||
#else
|
||||
ompi_predefined_datatype_t ompi_mpi_long_double = OMPI_DATATYPE_INIT_UNAVAILABLE (LONG_DOUBLE, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_FLOAT );
|
||||
#endif /* HAVE_LONG_DOUBLE */
|
||||
#if defined(OPAL_ALIGNMENT_WCHAR) && OPAL_ALIGNMENT_WCHAR != 0
|
||||
ompi_predefined_datatype_t ompi_mpi_wchar = OMPI_DATATYPE_INIT_PREDEFINED (WCHAR, OMPI_DATATYPE_FLAG_DATA_C );
|
||||
#else
|
||||
@ -113,11 +104,7 @@ ompi_predefined_datatype_t ompi_mpi_cxx_bool = OMPI_DATATYPE_INIT_PREDEFIN
|
||||
ompi_predefined_datatype_t ompi_mpi_c_float_complex = OMPI_DATATYPE_INIT_PREDEFINED_BASIC_TYPE (C_FLOAT_COMPLEX, C_COMPLEX, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_COMPLEX );
|
||||
ompi_predefined_datatype_t ompi_mpi_c_complex = OMPI_DATATYPE_INIT_PREDEFINED_BASIC_TYPE (C_FLOAT_COMPLEX, C_COMPLEX, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_COMPLEX );
|
||||
ompi_predefined_datatype_t ompi_mpi_c_double_complex = OMPI_DATATYPE_INIT_PREDEFINED (C_DOUBLE_COMPLEX, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_COMPLEX );
|
||||
#if HAVE_LONG_DOUBLE
|
||||
ompi_predefined_datatype_t ompi_mpi_c_long_double_complex = OMPI_DATATYPE_INIT_PREDEFINED (C_LONG_DOUBLE_COMPLEX, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_COMPLEX );
|
||||
#else
|
||||
ompi_predefined_datatype_t ompi_mpi_c_long_double_complex = OMPI_DATATYPE_INIT_UNAVAILABLE (C_LONG_DOUBLE_COMPLEX, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_COMPLEX );
|
||||
#endif /* HAVE_LONG_DOUBLE */
|
||||
|
||||
/* The C++ complex datatypes are the same as the C datatypes */
|
||||
ompi_predefined_datatype_t ompi_mpi_cxx_cplex = OMPI_DATATYPE_INIT_PREDEFINED_BASIC_TYPE (C_FLOAT_COMPLEX, CXX_FLOAT_COMPLEX, OMPI_DATATYPE_FLAG_DATA_CPP | OMPI_DATATYPE_FLAG_DATA_COMPLEX );
|
||||
@ -137,7 +124,7 @@ ompi_predefined_datatype_t ompi_mpi_dblcplex = OMPI_DATATYPE_INIT_UNAVAILA
|
||||
#endif
|
||||
|
||||
/* In Fortran, there does not exist a type LONG DOUBLE COMPLEX, but DOUBLE COMPLEX(KIND=8) may require this */
|
||||
#if HAVE_LONG_DOUBLE && OMPI_HAVE_FORTRAN_DOUBLE_COMPLEX
|
||||
#if OMPI_HAVE_FORTRAN_DOUBLE_COMPLEX
|
||||
ompi_predefined_datatype_t ompi_mpi_ldblcplex = OMPI_DATATYPE_INIT_PREDEFINED_BASIC_TYPE (C_LONG_DOUBLE_COMPLEX, LONG_DOUBLE_COMPLEX, OMPI_DATATYPE_FLAG_DATA_FORTRAN | OMPI_DATATYPE_FLAG_DATA_COMPLEX );
|
||||
#else
|
||||
ompi_predefined_datatype_t ompi_mpi_ldblcplex = OMPI_DATATYPE_INIT_UNAVAILABLE (LONG_DOUBLE_COMPLEX, OMPI_DATATYPE_FLAG_DATA_FORTRAN | OMPI_DATATYPE_FLAG_DATA_COMPLEX );
|
||||
@ -174,11 +161,7 @@ ompi_predefined_datatype_t ompi_mpi_dblprec = OMPI_DATATYPE_INIT_PREDEFIN
|
||||
/* Aggregate struct datatypes are not const */
|
||||
ompi_predefined_datatype_t ompi_mpi_float_int = OMPI_DATATYPE_INIT_DEFER (FLOAT_INT, OMPI_DATATYPE_FLAG_DATA_C );
|
||||
ompi_predefined_datatype_t ompi_mpi_double_int = OMPI_DATATYPE_INIT_DEFER (DOUBLE_INT, OMPI_DATATYPE_FLAG_DATA_C );
|
||||
#if HAVE_LONG_DOUBLE
|
||||
ompi_predefined_datatype_t ompi_mpi_longdbl_int = OMPI_DATATYPE_INIT_DEFER (LONG_DOUBLE_INT, OMPI_DATATYPE_FLAG_DATA_C );
|
||||
#else
|
||||
ompi_predefined_datatype_t ompi_mpi_longdbl_int = OMPI_DATATYPE_INIT_UNAVAILABLE (LONG_DOUBLE_INT, OMPI_DATATYPE_FLAG_DATA_C );
|
||||
#endif /* HAVE_LONG_DOUBLE */
|
||||
|
||||
ompi_predefined_datatype_t ompi_mpi_2int = OMPI_DATATYPE_INIT_DEFER (2INT, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT );
|
||||
ompi_predefined_datatype_t ompi_mpi_short_int = OMPI_DATATYPE_INIT_DEFER (SHORT_INT, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT );
|
||||
|
||||
@ -139,9 +139,7 @@ FUNC_FUNC(max, fortran_integer16, ompi_fortran_integer16_t)
|
||||
/* Floating point */
|
||||
FUNC_FUNC(max, float, float)
|
||||
FUNC_FUNC(max, double, double)
|
||||
#if HAVE_LONG_DOUBLE
|
||||
FUNC_FUNC(max, long_double, long double)
|
||||
#endif
|
||||
#if OMPI_HAVE_FORTRAN_REAL
|
||||
FUNC_FUNC(max, fortran_real, ompi_fortran_real_t)
|
||||
#endif
|
||||
@ -199,9 +197,7 @@ FUNC_FUNC(min, fortran_integer16, ompi_fortran_integer16_t)
|
||||
/* Floating point */
|
||||
FUNC_FUNC(min, float, float)
|
||||
FUNC_FUNC(min, double, double)
|
||||
#if HAVE_LONG_DOUBLE
|
||||
FUNC_FUNC(min, long_double, long double)
|
||||
#endif
|
||||
#if OMPI_HAVE_FORTRAN_REAL
|
||||
FUNC_FUNC(min, fortran_real, ompi_fortran_real_t)
|
||||
#endif
|
||||
@ -256,9 +252,7 @@ OP_FUNC(sum, fortran_integer16, ompi_fortran_integer16_t, +=)
|
||||
/* Floating point */
|
||||
OP_FUNC(sum, float, float, +=)
|
||||
OP_FUNC(sum, double, double, +=)
|
||||
#if HAVE_LONG_DOUBLE
|
||||
OP_FUNC(sum, long_double, long double, +=)
|
||||
#endif
|
||||
#if OMPI_HAVE_FORTRAN_REAL
|
||||
OP_FUNC(sum, fortran_real, ompi_fortran_real_t, +=)
|
||||
#endif
|
||||
@ -278,15 +272,9 @@ OP_FUNC(sum, fortran_real8, ompi_fortran_real8_t, +=)
|
||||
OP_FUNC(sum, fortran_real16, ompi_fortran_real16_t, +=)
|
||||
#endif
|
||||
/* Complex */
|
||||
#if HAVE_FLOAT__COMPLEX
|
||||
OP_FUNC(sum, c_float_complex, float _Complex, +=)
|
||||
#endif
|
||||
#if HAVE_DOUBLE__COMPLEX
|
||||
OP_FUNC(sum, c_double_complex, double _Complex, +=)
|
||||
#endif
|
||||
#if HAVE_LONG_DOUBLE__COMPLEX
|
||||
OP_FUNC(sum, c_long_double_complex, long double _Complex, +=)
|
||||
#endif
|
||||
|
||||
/*************************************************************************
|
||||
* Product
|
||||
@ -323,9 +311,7 @@ OP_FUNC(prod, fortran_integer16, ompi_fortran_integer16_t, *=)
|
||||
/* Floating point */
|
||||
OP_FUNC(prod, float, float, *=)
|
||||
OP_FUNC(prod, double, double, *=)
|
||||
#if HAVE_LONG_DOUBLE
|
||||
OP_FUNC(prod, long_double, long double, *=)
|
||||
#endif
|
||||
#if OMPI_HAVE_FORTRAN_REAL
|
||||
OP_FUNC(prod, fortran_real, ompi_fortran_real_t, *=)
|
||||
#endif
|
||||
@ -345,15 +331,9 @@ OP_FUNC(prod, fortran_real8, ompi_fortran_real8_t, *=)
|
||||
OP_FUNC(prod, fortran_real16, ompi_fortran_real16_t, *=)
|
||||
#endif
|
||||
/* Complex */
|
||||
#if HAVE_FLOAT__COMPLEX
|
||||
OP_FUNC(prod, c_float_complex, float _Complex, *=)
|
||||
#endif
|
||||
#if HAVE_DOUBLE__COMPLEX
|
||||
OP_FUNC(prod, c_double_complex, double _Complex, *=)
|
||||
#endif
|
||||
#if HAVE_LONG_DOUBLE__COMPLEX
|
||||
OP_FUNC(prod, c_long_double_complex, long double _Complex, *=)
|
||||
#endif
|
||||
|
||||
/*************************************************************************
|
||||
* Logical AND
|
||||
@ -550,9 +530,7 @@ LOC_STRUCT(double_int, double, int)
|
||||
LOC_STRUCT(long_int, long, int)
|
||||
LOC_STRUCT(2int, int, int)
|
||||
LOC_STRUCT(short_int, short, int)
|
||||
#if HAVE_LONG_DOUBLE
|
||||
LOC_STRUCT(long_double_int, long double, int)
|
||||
#endif
|
||||
|
||||
/*************************************************************************
|
||||
* Max location
|
||||
@ -572,9 +550,7 @@ LOC_FUNC(maxloc, double_int, >)
|
||||
LOC_FUNC(maxloc, long_int, >)
|
||||
LOC_FUNC(maxloc, 2int, >)
|
||||
LOC_FUNC(maxloc, short_int, >)
|
||||
#if HAVE_LONG_DOUBLE
|
||||
LOC_FUNC(maxloc, long_double_int, >)
|
||||
#endif
|
||||
|
||||
/*************************************************************************
|
||||
* Min location
|
||||
@ -594,9 +570,7 @@ LOC_FUNC(minloc, double_int, <)
|
||||
LOC_FUNC(minloc, long_int, <)
|
||||
LOC_FUNC(minloc, 2int, <)
|
||||
LOC_FUNC(minloc, short_int, <)
|
||||
#if HAVE_LONG_DOUBLE
|
||||
LOC_FUNC(minloc, long_double_int, <)
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
@ -719,9 +693,7 @@ FUNC_FUNC_3BUF(max, fortran_integer16, ompi_fortran_integer16_t)
|
||||
/* Floating point */
|
||||
FUNC_FUNC_3BUF(max, float, float)
|
||||
FUNC_FUNC_3BUF(max, double, double)
|
||||
#if HAVE_LONG_DOUBLE
|
||||
FUNC_FUNC_3BUF(max, long_double, long double)
|
||||
#endif
|
||||
#if OMPI_HAVE_FORTRAN_REAL
|
||||
FUNC_FUNC_3BUF(max, fortran_real, ompi_fortran_real_t)
|
||||
#endif
|
||||
@ -779,9 +751,7 @@ FUNC_FUNC_3BUF(min, fortran_integer16, ompi_fortran_integer16_t)
|
||||
/* Floating point */
|
||||
FUNC_FUNC_3BUF(min, float, float)
|
||||
FUNC_FUNC_3BUF(min, double, double)
|
||||
#if HAVE_LONG_DOUBLE
|
||||
FUNC_FUNC_3BUF(min, long_double, long double)
|
||||
#endif
|
||||
#if OMPI_HAVE_FORTRAN_REAL
|
||||
FUNC_FUNC_3BUF(min, fortran_real, ompi_fortran_real_t)
|
||||
#endif
|
||||
@ -836,9 +806,7 @@ OP_FUNC_3BUF(sum, fortran_integer16, ompi_fortran_integer16_t, +)
|
||||
/* Floating point */
|
||||
OP_FUNC_3BUF(sum, float, float, +)
|
||||
OP_FUNC_3BUF(sum, double, double, +)
|
||||
#if HAVE_LONG_DOUBLE
|
||||
OP_FUNC_3BUF(sum, long_double, long double, +)
|
||||
#endif
|
||||
#if OMPI_HAVE_FORTRAN_REAL
|
||||
OP_FUNC_3BUF(sum, fortran_real, ompi_fortran_real_t, +)
|
||||
#endif
|
||||
@ -858,15 +826,9 @@ OP_FUNC_3BUF(sum, fortran_real8, ompi_fortran_real8_t, +)
|
||||
OP_FUNC_3BUF(sum, fortran_real16, ompi_fortran_real16_t, +)
|
||||
#endif
|
||||
/* Complex */
|
||||
#if HAVE_FLOAT__COMPLEX
|
||||
OP_FUNC_3BUF(sum, c_float_complex, float _Complex, +)
|
||||
#endif
|
||||
#if HAVE_DOUBLE__COMPLEX
|
||||
OP_FUNC_3BUF(sum, c_double_complex, double _Complex, +)
|
||||
#endif
|
||||
#if HAVE_LONG_DOUBLE__COMPLEX
|
||||
OP_FUNC_3BUF(sum, c_long_double_complex, long double _Complex, +)
|
||||
#endif
|
||||
|
||||
/*************************************************************************
|
||||
* Product
|
||||
@ -903,9 +865,7 @@ OP_FUNC_3BUF(prod, fortran_integer16, ompi_fortran_integer16_t, *)
|
||||
/* Floating point */
|
||||
OP_FUNC_3BUF(prod, float, float, *)
|
||||
OP_FUNC_3BUF(prod, double, double, *)
|
||||
#if HAVE_LONG_DOUBLE
|
||||
OP_FUNC_3BUF(prod, long_double, long double, *)
|
||||
#endif
|
||||
#if OMPI_HAVE_FORTRAN_REAL
|
||||
OP_FUNC_3BUF(prod, fortran_real, ompi_fortran_real_t, *)
|
||||
#endif
|
||||
@ -925,15 +885,9 @@ OP_FUNC_3BUF(prod, fortran_real8, ompi_fortran_real8_t, *)
|
||||
OP_FUNC_3BUF(prod, fortran_real16, ompi_fortran_real16_t, *)
|
||||
#endif
|
||||
/* Complex */
|
||||
#if HAVE_FLOAT__COMPLEX
|
||||
OP_FUNC_3BUF(prod, c_float_complex, float _Complex, *)
|
||||
#endif
|
||||
#if HAVE_DOUBLE__COMPLEX
|
||||
OP_FUNC_3BUF(prod, c_double_complex, double _Complex, *)
|
||||
#endif
|
||||
#if HAVE_LONG_DOUBLE__COMPLEX
|
||||
OP_FUNC_3BUF(prod, c_long_double_complex, long double _Complex, *)
|
||||
#endif
|
||||
|
||||
/*************************************************************************
|
||||
* Logical AND
|
||||
@ -1131,9 +1085,7 @@ LOC_STRUCT_3BUF(double_int, double, int)
|
||||
LOC_STRUCT_3BUF(long_int, long, int)
|
||||
LOC_STRUCT_3BUF(2int, int, int)
|
||||
LOC_STRUCT_3BUF(short_int, short, int)
|
||||
#if HAVE_LONG_DOUBLE
|
||||
LOC_STRUCT_3BUF(long_double_int, long double, int)
|
||||
#endif
|
||||
*/
|
||||
|
||||
/*************************************************************************
|
||||
@ -1154,9 +1106,7 @@ LOC_FUNC_3BUF(maxloc, double_int, >)
|
||||
LOC_FUNC_3BUF(maxloc, long_int, >)
|
||||
LOC_FUNC_3BUF(maxloc, 2int, >)
|
||||
LOC_FUNC_3BUF(maxloc, short_int, >)
|
||||
#if HAVE_LONG_DOUBLE
|
||||
LOC_FUNC_3BUF(maxloc, long_double_int, >)
|
||||
#endif
|
||||
|
||||
/*************************************************************************
|
||||
* Min location
|
||||
@ -1176,9 +1126,7 @@ LOC_FUNC_3BUF(minloc, double_int, <)
|
||||
LOC_FUNC_3BUF(minloc, long_int, <)
|
||||
LOC_FUNC_3BUF(minloc, 2int, <)
|
||||
LOC_FUNC_3BUF(minloc, short_int, <)
|
||||
#if HAVE_LONG_DOUBLE
|
||||
LOC_FUNC_3BUF(minloc, long_double_int, <)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Helpful defines, because there's soooo many names!
|
||||
|
||||
@ -127,12 +127,10 @@ ompi_osc_portals4_get_dt(struct ompi_datatype_t *dt, ptl_datatype_t *ptl_dt)
|
||||
return get_sized_type(false, sizeof(long), ptl_dt);
|
||||
} else if (MPI_UNSIGNED == base_dt) {
|
||||
return get_sized_type(false, sizeof(int), ptl_dt);
|
||||
#if OPAL_HAVE_LONG_LONG
|
||||
} else if (MPI_LONG_LONG_INT == base_dt) {
|
||||
return get_sized_type(true, sizeof(long long int), ptl_dt);
|
||||
} else if (MPI_LONG_LONG == base_dt) {
|
||||
return get_sized_type(true, sizeof(long long), ptl_dt);
|
||||
#endif
|
||||
} else if (MPI_INT8_T == base_dt) {
|
||||
*ptl_dt = PTL_INT8_T;
|
||||
} else if (MPI_UINT8_T == base_dt) {
|
||||
@ -149,20 +147,14 @@ ompi_osc_portals4_get_dt(struct ompi_datatype_t *dt, ptl_datatype_t *ptl_dt)
|
||||
*ptl_dt = PTL_INT64_T;
|
||||
} else if (MPI_UINT64_T == base_dt) {
|
||||
*ptl_dt = PTL_UINT64_T;
|
||||
#if HAVE_FLOAT__COMPLEX
|
||||
} else if (MPI_C_COMPLEX == base_dt) {
|
||||
*ptl_dt = PTL_DOUBLE_COMPLEX;
|
||||
} else if (MPI_C_FLOAT_COMPLEX == base_dt) {
|
||||
*ptl_dt = PTL_FLOAT_COMPLEX;
|
||||
#endif
|
||||
#if HAVE_DOUBLE__COMPLEX
|
||||
} else if (MPI_C_DOUBLE_COMPLEX == base_dt) {
|
||||
*ptl_dt = PTL_DOUBLE_COMPLEX;
|
||||
#endif
|
||||
#if HAVE_LONG_DOUBLE__COMPLEX
|
||||
} else if (MPI_C_LONG_DOUBLE_COMPLEX == base_dt) {
|
||||
*ptl_dt = PTL_LONG_DOUBLE_COMPLEX;
|
||||
#endif
|
||||
} else if (MPI_AINT == base_dt) {
|
||||
if (sizeof(MPI_Aint) == 2) {
|
||||
*ptl_dt = PTL_UINT16_T;
|
||||
|
||||
@ -155,7 +155,7 @@ COPY_CONTIGUOUS_BYTES( bytes, 16 )
|
||||
COPY_TYPE( float_2, float, 1 )
|
||||
#elif SIZEOF_DOUBLE == 2
|
||||
COPY_TYPE( float_2, double, 1 )
|
||||
#elif HAVE_LONG_DOUBLE && SIZEOF_LONG_DOUBLE == 2
|
||||
#elif SIZEOF_LONG_DOUBLE == 2
|
||||
COPY_TYPE( float_2, long double, 1 )
|
||||
#else
|
||||
/* #error No basic type for copy function for opal_datatype_float2 found */
|
||||
@ -166,7 +166,7 @@ COPY_TYPE( float_2, long double, 1 )
|
||||
COPY_TYPE( float_4, float, 1 )
|
||||
#elif SIZEOF_DOUBLE == 4
|
||||
COPY_TYPE( float_4, double, 1 )
|
||||
#elif HAVE_LONG_DOUBLE && SIZEOF_LONG_DOUBLE == 4
|
||||
#elif SIZEOF_LONG_DOUBLE == 4
|
||||
COPY_TYPE( float_4, long double, 1 )
|
||||
#else
|
||||
#error No basic type for copy function for opal_datatype_float4 found
|
||||
@ -176,7 +176,7 @@ COPY_TYPE( float_4, long double, 1 )
|
||||
COPY_TYPE( float_8, float, 1 )
|
||||
#elif SIZEOF_DOUBLE == 8
|
||||
COPY_TYPE( float_8, double, 1 )
|
||||
#elif HAVE_LONG_DOUBLE && SIZEOF_LONG_DOUBLE == 8
|
||||
#elif SIZEOF_LONG_DOUBLE == 8
|
||||
COPY_TYPE( float_8, long double, 1 )
|
||||
#else
|
||||
#error No basic type for copy function for opal_datatype_float8 found
|
||||
@ -186,7 +186,7 @@ COPY_TYPE( float_8, long double, 1 )
|
||||
COPY_TYPE( float_12, float, 1 )
|
||||
#elif SIZEOF_DOUBLE == 12
|
||||
COPY_TYPE( float_12, double, 1 )
|
||||
#elif HAVE_LONG_DOUBLE && SIZEOF_LONG_DOUBLE == 12
|
||||
#elif SIZEOF_LONG_DOUBLE == 12
|
||||
COPY_TYPE( float_12, long double, 1 )
|
||||
#else
|
||||
/* #error No basic type for copy function for opal_datatype_float12 found */
|
||||
@ -197,33 +197,18 @@ COPY_TYPE( float_12, long double, 1 )
|
||||
COPY_TYPE( float_16, float, 1 )
|
||||
#elif SIZEOF_DOUBLE == 16
|
||||
COPY_TYPE( float_16, double, 1 )
|
||||
#elif HAVE_LONG_DOUBLE && SIZEOF_LONG_DOUBLE == 16
|
||||
#elif SIZEOF_LONG_DOUBLE == 16
|
||||
COPY_TYPE( float_16, long double, 1 )
|
||||
#else
|
||||
/* #error No basic type for copy function for opal_datatype_float16 found */
|
||||
#define copy_float_16 NULL
|
||||
#endif
|
||||
|
||||
#if HAVE_FLOAT__COMPLEX
|
||||
COPY_TYPE ( float_complex, float _Complex, 1)
|
||||
#else
|
||||
/* #error No basic type for copy function for opal_datatype_float_complex found */
|
||||
#define copy_float_complex NULL
|
||||
#endif
|
||||
|
||||
#if HAVE_DOUBLE__COMPLEX
|
||||
COPY_TYPE ( double_complex, double _Complex, 1)
|
||||
#else
|
||||
/* #error No basic type for copy function for opal_datatype_double_complex found */
|
||||
#define copy_double_complex NULL
|
||||
#endif
|
||||
|
||||
#if HAVE_LONG_DOUBLE__COMPLEX
|
||||
COPY_TYPE ( long_double_complex, long double _Complex, 1)
|
||||
#else
|
||||
/* #error No basic type for copy function for opal_datatype_long_double_complex found */
|
||||
#define copy_long_double_complex NULL
|
||||
#endif
|
||||
|
||||
#if SIZEOF__BOOL == SIZEOF_CHAR
|
||||
COPY_TYPE (bool, char, 1)
|
||||
|
||||
@ -373,7 +373,7 @@ COPY_TYPE_HETEROGENEOUS(int16, int128_t)
|
||||
COPY_TYPE_HETEROGENEOUS( float2, float )
|
||||
#elif SIZEOF_DOUBLE == 2
|
||||
COPY_TYPE_HETEROGENEOUS( float2, double )
|
||||
#elif HAVE_LONG_DOUBLE && SIZEOF_LONG_DOUBLE == 2
|
||||
#elif SIZEOF_LONG_DOUBLE == 2
|
||||
COPY_TYPE_HETEROGENEOUS( float2, long double )
|
||||
#else
|
||||
/* #error No basic type for copy function for opal_datatype_float2 found */
|
||||
@ -384,7 +384,7 @@ COPY_TYPE_HETEROGENEOUS( float2, long double )
|
||||
COPY_TYPE_HETEROGENEOUS( float4, float )
|
||||
#elif SIZEOF_DOUBLE == 4
|
||||
COPY_TYPE_HETEROGENEOUS( float4, double )
|
||||
#elif HAVE_LONG_DOUBLE && SIZEOF_LONG_DOUBLE == 4
|
||||
#elif SIZEOF_LONG_DOUBLE == 4
|
||||
COPY_TYPE_HETEROGENEOUS( float4, long double )
|
||||
#else
|
||||
/* #error No basic type for copy function for opal_datatype_float4 found */
|
||||
@ -395,7 +395,7 @@ COPY_TYPE_HETEROGENEOUS( float4, long double )
|
||||
COPY_TYPE_HETEROGENEOUS( float8, float )
|
||||
#elif SIZEOF_DOUBLE == 8
|
||||
COPY_TYPE_HETEROGENEOUS( float8, double )
|
||||
#elif HAVE_LONG_DOUBLE && SIZEOF_LONG_DOUBLE == 8
|
||||
#elif SIZEOF_LONG_DOUBLE == 8
|
||||
COPY_TYPE_HETEROGENEOUS( float8, long double )
|
||||
#else
|
||||
/* #error No basic type for copy function for opal_datatype_float8 found */
|
||||
@ -406,7 +406,7 @@ COPY_TYPE_HETEROGENEOUS( float8, long double )
|
||||
COPY_TYPE_HETEROGENEOUS( float12, float )
|
||||
#elif SIZEOF_DOUBLE == 12
|
||||
COPY_TYPE_HETEROGENEOUS( float12, double )
|
||||
#elif HAVE_LONG_DOUBLE && SIZEOF_LONG_DOUBLE == 12
|
||||
#elif SIZEOF_LONG_DOUBLE == 12
|
||||
COPY_TYPE_HETEROGENEOUS( float12, long double )
|
||||
#else
|
||||
/* #error No basic type for copy function for opal_datatype_float12 found */
|
||||
@ -417,33 +417,18 @@ COPY_TYPE_HETEROGENEOUS( float12, long double )
|
||||
COPY_TYPE_HETEROGENEOUS( float16, float )
|
||||
#elif SIZEOF_DOUBLE == 16
|
||||
COPY_TYPE_HETEROGENEOUS( float16, double )
|
||||
#elif HAVE_LONG_DOUBLE && SIZEOF_LONG_DOUBLE == 16
|
||||
#elif SIZEOF_LONG_DOUBLE == 16
|
||||
COPY_TYPE_HETEROGENEOUS_INTERNAL( float16, long double, 1)
|
||||
#else
|
||||
/* #error No basic type for copy function for opal_datatype_float16 found */
|
||||
#define copy_float16_heterogeneous NULL
|
||||
#endif
|
||||
|
||||
#if HAVE_FLOAT__COMPLEX
|
||||
COPY_2SAMETYPE_HETEROGENEOUS( float_complex, float )
|
||||
#else
|
||||
/* #error No basic type for copy function for opal_datatype_float_complex found */
|
||||
#define copy_float_complex_heterogeneous NULL
|
||||
#endif
|
||||
|
||||
#if HAVE_DOUBLE__COMPLEX
|
||||
COPY_2SAMETYPE_HETEROGENEOUS( double_complex, double )
|
||||
#else
|
||||
/* #error No basic type for copy function for opal_datatype_double_complex found */
|
||||
#define copy_double_complex_heterogeneous NULL
|
||||
#endif
|
||||
|
||||
#if HAVE_LONG_DOUBLE__COMPLEX
|
||||
COPY_2SAMETYPE_HETEROGENEOUS_INTERNAL( long_double_complex, long double, 1)
|
||||
#else
|
||||
/* #error No basic type for copy function for opal_datatype_long_double_complex found */
|
||||
#define copy_long_double_complex_heterogeneous NULL
|
||||
#endif
|
||||
|
||||
COPY_TYPE_HETEROGENEOUS (wchar, wchar_t)
|
||||
|
||||
|
||||
@ -355,7 +355,7 @@ struct opal_datatype_t;
|
||||
#define OPAL_DATATYPE_INITIALIZER_FLOAT2(FLAGS) OPAL_DATATYPE_INIT_BASIC_DATATYPE( float, OPAL_ALIGNMENT_FLOAT, FLOAT2, FLAGS )
|
||||
#elif SIZEOF_DOUBLE == 2
|
||||
#define OPAL_DATATYPE_INITIALIZER_FLOAT2(FLAGS) OPAL_DATATYPE_INIT_BASIC_DATATYPE( double, OPAL_ALIGNMENT_DOUBLE, FLOAT2, FLAGS )
|
||||
#elif HAVE_LONG_DOUBLE && SIZEOF_LONG_DOUBLE == 2
|
||||
#elif SIZEOF_LONG_DOUBLE == 2
|
||||
#define OPAL_DATATYPE_INITIALIZER_FLOAT2(FLAGS) OPAL_DATATYPE_INIT_BASIC_DATATYPE( long double, OPAL_ALIGNMENT_LONG_DOUBLE, FLOAT2, FLAGS )
|
||||
#else
|
||||
#define OPAL_DATATYPE_INITIALIZER_FLOAT2(FLAGS) OPAL_DATATYPE_INITIALIZER_UNAVAILABLE_NAMED( FLOAT2, FLAGS )
|
||||
@ -365,7 +365,7 @@ struct opal_datatype_t;
|
||||
#define OPAL_DATATYPE_INITIALIZER_FLOAT4(FLAGS) OPAL_DATATYPE_INIT_BASIC_DATATYPE( float, OPAL_ALIGNMENT_FLOAT, FLOAT4, FLAGS )
|
||||
#elif SIZEOF_DOUBLE == 4
|
||||
#define OPAL_DATATYPE_INITIALIZER_FLOAT4(FLAGS) OPAL_DATATYPE_INIT_BASIC_DATATYPE( double, OPAL_ALIGNMENT_DOUBLE, FLOAT4, FLAGS )
|
||||
#elif HAVE_LONG_DOUBLE && SIZEOF_LONG_DOUBLE == 4
|
||||
#elif SIZEOF_LONG_DOUBLE == 4
|
||||
#define OPAL_DATATYPE_INITIALIZER_FLOAT4(FLAGS) OPAL_DATATYPE_INIT_BASIC_DATATYPE( long double, OPAL_ALIGNMENT_LONG_DOUBLE, FLOAT4, FLAGS )
|
||||
#else
|
||||
#define OPAL_DATATYPE_INITIALIZER_FLOAT4(FLAGS) OPAL_DATATYPE_INITIALIZER_UNAVAILABLE_NAMED( FLOAT4, FLAGS )
|
||||
@ -375,7 +375,7 @@ struct opal_datatype_t;
|
||||
#define OPAL_DATATYPE_INITIALIZER_FLOAT8(FLAGS) OPAL_DATATYPE_INIT_BASIC_DATATYPE( float, OPAL_ALIGNMENT_FLOAT, FLOAT8, FLAGS )
|
||||
#elif SIZEOF_DOUBLE == 8
|
||||
#define OPAL_DATATYPE_INITIALIZER_FLOAT8(FLAGS) OPAL_DATATYPE_INIT_BASIC_DATATYPE( double, OPAL_ALIGNMENT_DOUBLE, FLOAT8, FLAGS )
|
||||
#elif HAVE_LONG_DOUBLE && SIZEOF_LONG_DOUBLE == 8
|
||||
#elif SIZEOF_LONG_DOUBLE == 8
|
||||
#define OPAL_DATATYPE_INITIALIZER_FLOAT8(FLAGS) OPAL_DATATYPE_INIT_BASIC_DATATYPE( long double, OPAL_ALIGNMENT_LONG_DOUBLE, FLOAT8, FLAGS )
|
||||
#else
|
||||
#define OPAL_DATATYPE_INITIALIZER_FLOAT8(FLAGS) OPAL_DATATYPE_INITIALIZER_UNAVAILABLE_NAMED( FLOAT8, FLAGS )
|
||||
@ -385,7 +385,7 @@ struct opal_datatype_t;
|
||||
#define OPAL_DATATYPE_INITIALIZER_FLOAT12(FLAGS) OPAL_DATATYPE_INIT_BASIC_DATATYPE( float, OPAL_ALIGNMENT_FLOAT, FLOAT12, FLAGS )
|
||||
#elif SIZEOF_DOUBLE == 12
|
||||
#define OPAL_DATATYPE_INITIALIZER_FLOAT12(FLAGS) OPAL_DATATYPE_INIT_BASIC_DATATYPE( double, OPAL_ALIGNMENT_DOUBLE, FLOAT12, FLAGS )
|
||||
#elif HAVE_LONG_DOUBLE && SIZEOF_LONG_DOUBLE == 12
|
||||
#elif SIZEOF_LONG_DOUBLE == 12
|
||||
#define OPAL_DATATYPE_INITIALIZER_FLOAT12(FLAGS) OPAL_DATATYPE_INIT_BASIC_DATATYPE( long double, OPAL_ALIGNMENT_LONG_DOUBLE, FLOAT12, FLAGS )
|
||||
#else
|
||||
#define OPAL_DATATYPE_INITIALIZER_FLOAT12(FLAGS) OPAL_DATATYPE_INITIALIZER_UNAVAILABLE_NAMED( FLOAT12, FLAGS )
|
||||
@ -395,29 +395,17 @@ struct opal_datatype_t;
|
||||
#define OPAL_DATATYPE_INITIALIZER_FLOAT16(FLAGS) OPAL_DATATYPE_INIT_BASIC_DATATYPE( float, OPAL_ALIGNMENT_FLOAT, FLOAT16, FLAGS )
|
||||
#elif SIZEOF_DOUBLE == 16
|
||||
#define OPAL_DATATYPE_INITIALIZER_FLOAT16(FLAGS) OPAL_DATATYPE_INIT_BASIC_DATATYPE( double, OPAL_ALIGNMENT_DOUBLE, FLOAT16, FLAGS )
|
||||
#elif HAVE_LONG_DOUBLE && SIZEOF_LONG_DOUBLE == 16
|
||||
#elif SIZEOF_LONG_DOUBLE == 16
|
||||
#define OPAL_DATATYPE_INITIALIZER_FLOAT16(FLAGS) OPAL_DATATYPE_INIT_BASIC_DATATYPE( long double, OPAL_ALIGNMENT_LONG_DOUBLE, FLOAT16, FLAGS )
|
||||
#else
|
||||
#define OPAL_DATATYPE_INITIALIZER_FLOAT16(FLAGS) OPAL_DATATYPE_INITIALIZER_UNAVAILABLE_NAMED( FLOAT16, FLAGS )
|
||||
#endif
|
||||
|
||||
#if HAVE_FLOAT__COMPLEX
|
||||
#define OPAL_DATATYPE_INITIALIZER_FLOAT_COMPLEX(FLAGS) OPAL_DATATYPE_INIT_BASIC_DATATYPE( float _Complex, OPAL_ALIGNMENT_FLOAT_COMPLEX, FLOAT_COMPLEX, FLAGS )
|
||||
#else
|
||||
#define OPAL_DATATYPE_INITIALIZER_FLOAT_COMPLEX(FLAGS) OPAL_DATATYPE_INITIALIZER_UNAVAILABLE_NAMED( FLOAT_COMPLEX, FLAGS)
|
||||
#endif
|
||||
|
||||
#if HAVE_DOUBLE__COMPLEX
|
||||
#define OPAL_DATATYPE_INITIALIZER_DOUBLE_COMPLEX(FLAGS) OPAL_DATATYPE_INIT_BASIC_DATATYPE( double _Complex, OPAL_ALIGNMENT_DOUBLE_COMPLEX, DOUBLE_COMPLEX, FLAGS )
|
||||
#else
|
||||
#define OPAL_DATATYPE_INITIALIZER_DOUBLE_COMPLEX(FLAGS) OPAL_DATATYPE_INITIALIZER_UNAVAILABLE_NAMED( DOUBLE_COMPLEX, FLAGS)
|
||||
#endif
|
||||
|
||||
#if HAVE_LONG_DOUBLE__COMPLEX
|
||||
#define OPAL_DATATYPE_INITIALIZER_LONG_DOUBLE_COMPLEX(FLAGS) OPAL_DATATYPE_INIT_BASIC_DATATYPE( long double _Complex, OPAL_ALIGNMENT_LONG_DOUBLE_COMPLEX, LONG_DOUBLE_COMPLEX, FLAGS )
|
||||
#else
|
||||
#define OPAL_DATATYPE_INITIALIZER_LONG_DOUBLE_COMPLEX(FLAGS) OPAL_DATATYPE_INITIALIZER_UNAVAILABLE_NAMED( LONG_DOUBLE_COMPLEX, FLAGS)
|
||||
#endif
|
||||
|
||||
#define OPAL_DATATYPE_INITIALIZER_BOOL(FLAGS) OPAL_DATATYPE_INIT_BASIC_DATATYPE( _Bool, OPAL_ALIGNMENT_BOOL, BOOL, FLAGS )
|
||||
|
||||
|
||||
@ -95,7 +95,7 @@ typedef signed long intptr_t;
|
||||
typedef unsigned long uintptr_t;
|
||||
#endif
|
||||
|
||||
#elif HAVE_LONG_LONG && SIZEOF_VOID_P == SIZEOF_LONG_LONG
|
||||
#elif SIZEOF_VOID_P == SIZEOF_LONG_LONG
|
||||
|
||||
#ifndef HAVE_INTPTR_T
|
||||
typedef signed long long intptr_t;
|
||||
|
||||
@ -373,10 +373,8 @@ static bool setup_mpit_pvar_type(void)
|
||||
pvar_type = MCA_BASE_VAR_TYPE_UNSIGNED_INT;
|
||||
} else if (sizeof(uint64_t) == sizeof(unsigned long)) {
|
||||
pvar_type = MCA_BASE_VAR_TYPE_UNSIGNED_LONG;
|
||||
#ifdef HAVE_UNSIGNED_LONG_LONG
|
||||
} else if (sizeof(uint64_t) == sizeof(unsigned long long)) {
|
||||
pvar_type = MCA_BASE_VAR_TYPE_UNSIGNED_LONG_LONG;
|
||||
#endif
|
||||
}
|
||||
|
||||
/* Let the caller know if we found a compatible type or not */
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user