diff --git a/cmake/config.cmake b/cmake/config.cmake index 25c0588c..74d4f6de 100644 --- a/cmake/config.cmake +++ b/cmake/config.cmake @@ -216,9 +216,8 @@ endif() check_type_size(int SC_SIZEOF_INT BUILTIN_TYPES_ONLY) check_type_size("unsigned int" SC_SIZEOF_UNSIGNED_INT BUILTIN_TYPES_ONLY) check_type_size(long SC_SIZEOF_LONG BUILTIN_TYPES_ONLY) -check_type_size("long long" SC_SIZEOF_LONG_LONG BUILTIN_TYPES_ONLY) check_type_size("unsigned long" SC_SIZEOF_UNSIGNED_LONG BUILTIN_TYPES_ONLY) -check_type_size("unsigned long long" SC_SIZEOF_UNSIGNED_LONG_LONG BUILTIN_TYPES_ONLY) +check_type_size("long long" SC_SIZEOF_LONG_LONG BUILTIN_TYPES_ONLY) set(SC_SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P}) if(CMAKE_BUILD_TYPE MATCHES "Debug") diff --git a/cmake/sc_config.h.in b/cmake/sc_config.h.in index 481e9ff9..d4d05f49 100644 --- a/cmake/sc_config.h.in +++ b/cmake/sc_config.h.in @@ -213,14 +213,11 @@ #ifndef SC_SIZEOF_LONG #define SC_SIZEOF_LONG @SC_SIZEOF_LONG@ #endif -#ifndef SC_SIZEOF_LONG_LONG -#define SC_SIZEOF_LONG_LONG @SC_SIZEOF_LONG_LONG@ -#endif #ifndef SC_SIZEOF_UNSIGNED_LONG #define SC_SIZEOF_UNSIGNED_LONG @SC_SIZEOF_UNSIGNED_LONG@ #endif -#ifndef SC_SIZEOF_UNSIGNED_LONG_LONG -#define SC_SIZEOF_UNSIGNED_LONG_LONG @SC_SIZEOF_UNSIGNED_LONG_LONG@ +#ifndef SC_SIZEOF_LONG_LONG +#define SC_SIZEOF_LONG_LONG @SC_SIZEOF_LONG_LONG@ #endif /* The size of `void *', as computed by sizeof. */ diff --git a/configure.ac b/configure.ac index f543dba7..3135c2bd 100644 --- a/configure.ac +++ b/configure.ac @@ -66,9 +66,8 @@ AC_C_RESTRICT AC_CHECK_SIZEOF([int]) AC_CHECK_SIZEOF([unsigned int]) AC_CHECK_SIZEOF([long]) -AC_CHECK_SIZEOF([long long]) AC_CHECK_SIZEOF([unsigned long]) -AC_CHECK_SIZEOF([unsigned long long]) +AC_CHECK_SIZEOF([long long]) AC_CHECK_SIZEOF([void *]) AC_TYPE_SIZE_T AC_TYPE_SSIZE_T diff --git a/src/sc3_mpi_types.h b/src/sc3_mpi_types.h index e7fcdc85..b8285544 100644 --- a/src/sc3_mpi_types.h +++ b/src/sc3_mpi_types.h @@ -63,7 +63,6 @@ typedef MPI_Op sc3_MPI_Op_t; #define SC3_MPI_LONG_LONG MPI_LONG_LONG_INT #define SC3_MPI_FLOAT MPI_FLOAT #define SC3_MPI_DOUBLE MPI_DOUBLE -#define SC3_MPI_DOUBLE_INT MPI_DOUBLE_INT #define SC3_MPI_OP_NULL MPI_OP_NULL #define SC3_MPI_MIN MPI_MIN @@ -166,14 +165,12 @@ typedef enum sc3_MPI_Datatype * It is preferred over MPI_CHAR since the latter * may amount to multiple bytes for wide chars. */ SC3_MPI_INT, /**< Same as in original MPI. System int type. */ - SC3_MPI_INT8_T, /**< Same as in original MPI. System int8 type. */ SC3_MPI_2INT, /**< Same as in original MPI. Two system ints. */ SC3_MPI_UNSIGNED, /**< Same as in original MPI. System unsigned. */ SC3_MPI_LONG, /**< Same as in original MPI. System long type. */ SC3_MPI_LONG_LONG, /**< Same as in original MPI. System long long. */ SC3_MPI_FLOAT, /**< Same as in original MPI. */ SC3_MPI_DOUBLE, /**< Same as in original MPI. */ - SC3_MPI_DOUBLE_INT /**< Same as in original MPI. Double and int. */ } sc3_MPI_Datatype_t; diff --git a/src/sc_mpi.c b/src/sc_mpi.c index a9d9e228..393a7481 100644 --- a/src/sc_mpi.c +++ b/src/sc_mpi.c @@ -747,22 +747,18 @@ sc_MPI_Error_string (int errorcode, char *string, int *resultlen) size_t sc_mpi_sizeof (sc_MPI_Datatype t) { - if (t == sc_MPI_CHAR) - return sizeof (char); - if (t == sc_MPI_BYTE) + if (t == sc_MPI_BYTE || t == sc_MPI_INT8_T) return 1; + if (t == sc_MPI_CHAR || t == sc_MPI_UNSIGNED_CHAR) + return sizeof (char); if (t == sc_MPI_SHORT || t == sc_MPI_UNSIGNED_SHORT) return sizeof (short); if (t == sc_MPI_INT || t == sc_MPI_UNSIGNED) return sizeof (int); - if (t == sc_MPI_INT8_T) - return sizeof (int8_t); if (t == sc_MPI_LONG || t == sc_MPI_UNSIGNED_LONG) return sizeof (long); - if (t == sc_MPI_LONG_LONG_INT) + if (t == sc_MPI_LONG_LONG_INT || t == sc_MPI_UNSIGNED_LONG_LONG) return sizeof (long long); - if (t == sc_MPI_UNSIGNED_LONG_LONG) - return sizeof (unsigned long long); if (t == sc_MPI_FLOAT) return sizeof (float); if (t == sc_MPI_DOUBLE) diff --git a/src/sc_mpi.h b/src/sc_mpi.h index 29e5926c..ad6eef31 100644 --- a/src/sc_mpi.h +++ b/src/sc_mpi.h @@ -185,23 +185,22 @@ sc_MPI_IO_Errorcode_t; #define sc_MPI_REQUEST_NULL MPI_REQUEST_NULL #define sc_MPI_DATATYPE_NULL MPI_DATATYPE_NULL +#define sc_MPI_BYTE MPI_BYTE +#define sc_MPI_INT8_T MPI_BYTE #define sc_MPI_CHAR MPI_CHAR -#define sc_MPI_SIGNED_CHAR MPI_SIGNED_CHAR #define sc_MPI_UNSIGNED_CHAR MPI_UNSIGNED_CHAR -#define sc_MPI_BYTE MPI_BYTE #define sc_MPI_SHORT MPI_SHORT #define sc_MPI_UNSIGNED_SHORT MPI_UNSIGNED_SHORT #define sc_MPI_INT MPI_INT -#define sc_MPI_INT8_T MPI_INT8_T -#define sc_MPI_2INT MPI_2INT #define sc_MPI_UNSIGNED MPI_UNSIGNED #define sc_MPI_LONG MPI_LONG #define sc_MPI_UNSIGNED_LONG MPI_UNSIGNED_LONG #define sc_MPI_LONG_LONG_INT MPI_LONG_LONG_INT -#define sc_MPI_UNSIGNED_LONG_LONG MPI_UNSIGNED_LONG_LONG +#define sc_MPI_UNSIGNED_LONG_LONG MPI_LONG_LONG_INT #define sc_MPI_FLOAT MPI_FLOAT #define sc_MPI_DOUBLE MPI_DOUBLE #define sc_MPI_LONG_DOUBLE MPI_LONG_DOUBLE +#define sc_MPI_2INT MPI_2INT #define sc_MPI_PACKED MPI_PACKED #define sc_MPI_OP_NULL MPI_OP_NULL @@ -356,13 +355,12 @@ sc_MPI_IO_Errorcode_t; #define sc_MPI_DATATYPE_NULL SC3_MPI_DATATYPE_NULL #define sc_MPI_CHAR ((sc_MPI_Datatype) 0x4c000101) -#define sc_MPI_SIGNED_CHAR ((sc_MPI_Datatype) 0x4c000118) #define sc_MPI_UNSIGNED_CHAR ((sc_MPI_Datatype) 0x4c000102) #define sc_MPI_BYTE SC3_MPI_BYTE +#define sc_MPI_INT8_T ((sc_MPI_Datatype) 0x4c000202) #define sc_MPI_SHORT ((sc_MPI_Datatype) 0x4c000203) #define sc_MPI_UNSIGNED_SHORT ((sc_MPI_Datatype) 0x4c000204) #define sc_MPI_INT SC3_MPI_INT -#define sc_MPI_INT8_T SC3_MPI_INT8_T #define sc_MPI_2INT SC3_MPI_2INT #define sc_MPI_UNSIGNED SC3_MPI_UNSIGNED #define sc_MPI_LONG SC3_MPI_LONG @@ -371,7 +369,6 @@ sc_MPI_IO_Errorcode_t; #define sc_MPI_UNSIGNED_LONG_LONG ((sc_MPI_Datatype) 0x4c000409) #define sc_MPI_FLOAT SC3_MPI_FLOAT #define sc_MPI_DOUBLE SC3_MPI_DOUBLE -#define sc_MPI_DOUBLE_INT SC3_MPI_DOUBLE_INT #define sc_MPI_LONG_DOUBLE ((sc_MPI_Datatype) 0x4c000c0c) #define sc_MPI_PACKED ((sc_MPI_Datatype) 0x4c001001)