mpi: add MPI_LOGICAL{1,2,4,8,16}

This has been passed and merged by MPI Forum. Assuming the next MPI standard
will be ratified before next major mpich release, we are directly using the
MPI_ prefix rather than MPIX_ prefix.

Also add MPI_TYPECLASS_LOGICAL for MPI_Type_match_size API.

reference:
mpi-forum/mpi-issues#699
mpi-forum/mpi-standard#963

Author: hzhou

configure.ac

@@ -3571,6 +3571,11 @@ AC_DEFINE_UNQUOTED([MPIR_OFFSET_INTERNAL],[MPIR_INT$len], [Internal type for MPI
 len=`expr $MPI_SIZEOF_COUNT \* 8`
 AC_DEFINE_UNQUOTED([MPIR_COUNT_INTERNAL], [MPIR_INT$len], [Internal type for MPI_COUNT_DATATYPE])
 AC_DEFINE_UNQUOTED([MPIR_C_FLOAT16_INTERNAL], [MPIR_FLOAT16], [Internal type for MPIX_C_FLOAT16])
+AC_DEFINE_UNQUOTED([MPIR_LOGICAL1_INTERNAL],  [MPIR_FORTRAN_LOGICAL8], [Internal type for MPI_LOGICAL1])
+AC_DEFINE_UNQUOTED([MPIR_LOGICAL2_INTERNAL],  [MPIR_FORTRAN_LOGICAL16], [Internal type for MPI_LOGICAL2])
+AC_DEFINE_UNQUOTED([MPIR_LOGICAL4_INTERNAL],  [MPIR_FORTRAN_LOGICAL32], [Internal type for MPI_LOGICAL4])
+AC_DEFINE_UNQUOTED([MPIR_LOGICAL8_INTERNAL],  [MPIR_FORTRAN_LOGICAL64], [Internal type for MPI_LOGICAL8])
+AC_DEFINE_UNQUOTED([MPIR_LOGICAL16_INTERNAL], [MPIR_FORTRAN_LOGICAL128],[Internal type for MPI_LOGICAL16])
 AC_MSG_RESULT([done])
 
 # ------------------------------------------------------------------------

maint/gen_abi.py

@@ -60,8 +60,6 @@ def gen_mpi_abi_internal_h(out):
                 elif T == "MPI_Datatype":
                     idx = int(val, 0) & G.datatype_mask
                     G.abi_datatypes[idx] = name
-                    if re.match(r'MPI_LOGICAL\d+', name):
-                        G.abi_datatypes[idx] = "MPI_DATATYPE_NULL"
                 elif T == "MPI_Op":
                     idx = int(val, 0) & G.op_mask
                     G.abi_ops[idx] = name

src/include/mpi.h.in

@@ -253,6 +253,12 @@ typedef int MPI_Datatype;
 #define MPI_COUNT         ((MPI_Datatype)0x4c000845)
 /* other extension types */
 #define MPIX_C_FLOAT16    ((MPI_Datatype)0x4c000246)
+/* Fortran fixed-width logicals */
+#define MPI_LOGICAL1      ((MPI_Datatype)0x4c000147)
+#define MPI_LOGICAL2      ((MPI_Datatype)0x4c000248)
+#define MPI_LOGICAL4      ((MPI_Datatype)0x4c000449)
+#define MPI_LOGICAL8      ((MPI_Datatype)0x4c00084a)
+#define MPI_LOGICAL16     ((MPI_Datatype)0x4c00104b)
 
 /* Communicators */
 typedef int MPI_Comm;
@@ -568,6 +574,7 @@ extern int * const MPI_WEIGHTS_EMPTY MPICH_API_PUBLIC;
 #define MPI_TYPECLASS_REAL 1
 #define MPI_TYPECLASS_INTEGER 2
 #define MPI_TYPECLASS_COMPLEX 3
+#define MPI_TYPECLASS_LOGICAL 4
 
 #define MPI_LOCK_EXCLUSIVE  234
 #define MPI_LOCK_SHARED     235

src/include/mpir_objects.h

@@ -217,7 +217,7 @@ const char *MPIR_Handle_get_kind_str(int kind);
 #define MPIR_GROUP_PREALLOC 8
 #endif
 
-#define MPIR_DATATYPE_N_BUILTIN 71
+#define MPIR_DATATYPE_N_BUILTIN 76      /* 0x4c - must be in sync with mpi.h.in */
 #ifdef MPID_DATATYPE_PREALLOC
 #define MPIR_DATATYPE_PREALLOC MPID_DATATYPE_PREALLOC
 #else

src/mpi/datatype/datatype_impl.c

@@ -317,6 +317,9 @@ int MPIR_Type_match_size_impl(int typeclass, int size, MPI_Datatype * datatype)
     static MPI_Datatype complex_types[] = {
         MPI_COMPLEX4, MPI_COMPLEX8, MPI_COMPLEX16, MPI_COMPLEX32,
     };
+    static MPI_Datatype logical_types[] = {
+        MPI_LOGICAL1, MPI_LOGICAL2, MPI_LOGICAL4, MPI_LOGICAL8, MPI_LOGICAL16,
+    };
 
     /* The following implementation follows the suggestion in the
      * MPI-2 standard.
@@ -353,6 +356,13 @@ int MPIR_Type_match_size_impl(int typeclass, int size, MPI_Datatype * datatype)
             matched_datatype = type_match_size(complex_types, n, size);
 #ifdef HAVE_ERROR_CHECKING
             tname = "MPI_TYPECLASS_COMPLEX";
+#endif
+            break;
+        case MPI_TYPECLASS_LOGICAL:
+            n = sizeof(logical_types) / sizeof(MPI_Datatype);
+            matched_datatype = type_match_size(logical_types, n, size);
+#ifdef HAVE_ERROR_CHECKING
+            tname = "MPI_TYPECLASS_LOGICAL";
 #endif
             break;
         default:

src/mpi/datatype/typeutil.c

@@ -98,6 +98,11 @@ struct MPIR_Datatype_builtin_entry MPIR_Internal_types[] = {
     type_name_entry(OFFSET,             MULTI),           /* 0x44 */
     type_name_entry(COUNT,              MULTI),           /* 0x45 */
     type_name_x(C_FLOAT16,              FLOATING_POINT),  /* 0x46 */
+    type_name_entry(LOGICAL1,           LOGICAL),         /* 0x47 */
+    type_name_entry(LOGICAL2,           LOGICAL),         /* 0x48 */
+    type_name_entry(LOGICAL4,           LOGICAL),         /* 0x49 */
+    type_name_entry(LOGICAL8,           LOGICAL),         /* 0x4a */
+    type_name_entry(LOGICAL16,          LOGICAL),         /* 0x4b */
     /* *INDENT-ON* */
 };