Merge pull request pmodels#7336 from dalcinl/fix-pack-ext32

datatype: Fix pack external by using the MPIR layer

Approved-by: Hui Zhou

Author: hzhou

src/include/mpir_datatype.h

@@ -416,6 +416,17 @@ void MPII_Datatype_printf(MPI_Datatype type, int depth, MPI_Aint displacement, i
     } \
 } while (0)
 
+#define MPIR_Datatype_is_complex(a, is_complex) do { \
+    MPI_Datatype basic_type; \
+    MPIR_Datatype_get_basic_type(a, basic_type); \
+    int type = basic_type & MPIR_TYPE_TYPE_MASK; \
+    if (type == MPIR_TYPE_COMPLEX || type == MPIR_TYPE_ALT_COMPLEX) { \
+        is_complex = true; \
+    } else { \
+        is_complex = false; \
+    } \
+} while (0)
+
 #define MPIR_Datatype_get_ptr(a,ptr)   MPIR_Getb_ptr(Datatype,DATATYPE,a,0x000000ff,ptr)
 
 /* Note: Probably there is some clever way to build all of these from a macro.

src/mpi/datatype/typerep/dataloop/looputil.c

@@ -102,12 +102,16 @@ static int contig_pack_to_iov(MPI_Aint * blocks_p,
 
 static inline int is_float_type(MPI_Datatype el_type)
 {
-    return ((el_type == MPI_FLOAT) || (el_type == MPI_DOUBLE) ||
-            (el_type == MPI_LONG_DOUBLE) ||
-            (el_type == MPI_DOUBLE_PRECISION) ||
-            (el_type == MPI_COMPLEX) || (el_type == MPI_DOUBLE_COMPLEX));
-/*             (el_type == MPI_REAL4) || (el_type == MPI_REAL8) || */
-/*             (el_type == MPI_REAL16)); */
+    bool is_float;
+    MPIR_Datatype_is_float(el_type, is_float);
+    return is_float;
+}
+
+static inline int is_complex_type(MPI_Datatype el_type)
+{
+    bool is_complex;
+    MPIR_Datatype_is_complex(el_type, is_complex);
+    return is_complex;
 }
 
 static int external32_basic_convert(char *dest_buf,
@@ -683,7 +687,7 @@ static int contig_pack_external32_to_buf(MPI_Aint * blocks_p,
     /* TODO: DEAL WITH CASE WHERE ALL DATA DOESN'T FIT! */
     if ((src_el_size == dest_el_size) && (src_el_size == 1)) {
         MPIR_Memcpy(paramp->u.pack.pack_buffer, ((char *) bufp) + rel_off, *blocks_p);
-    } else if (MPII_Typerep_basic_type_is_complex(el_type)) {
+    } else if (is_complex_type(el_type)) {
         /* treat as 2x floating point */
         external32_float_convert(paramp->u.pack.pack_buffer,
                                  ((char *) bufp) + rel_off,