SQUASHME: fixes for hvector

Signed-off-by: Joseph Schuchart <joseph.schuchart@stonybrook.edu>

Author: devreal

ompi/datatype/ompi_datatype_args.c

@@ -156,6 +156,11 @@ int32_t ompi_datatype_set_args( ompi_datatype_t* pData,
     case MPI_COMBINER_HVECTOR:
         copy_count_array(1, &pi, &pl, counts[0]);
         copy_count_array(1, &pi, &pl, counts[1]);
+        if (cl > 0) {
+            // copy the stride
+            memcpy(pl, opal_count_array_ptr(counts[2]), sizeof(MPI_Count));
+            pl++;
+        }
         break;
 
     case MPI_COMBINER_INDEXED: {

ompi/mpi/c/type_create_hvector.c.in

@@ -65,13 +65,20 @@ PROTOTYPE ERROR_CLASS type_create_hvector(COUNT count,
     OMPI_ERRHANDLER_NOHANDLE_CHECK(rc, rc, FUNC_NAME );
 
     {
-        ompi_count_array_t a_i[2] = {OMPI_COUNT_ARRAY_CREATE(&count), OMPI_COUNT_ARRAY_CREATE(&blocklength)};
-        ompi_disp_array_t a_a = OMPI_DISP_ARRAY_CREATE(&stride);
+#if OMPI_BIGCOUNT_SRC
+        ompi_count_array_t a_i[3] = {OMPI_COUNT_ARRAY_CREATE(&count),
+                                     OMPI_COUNT_ARRAY_CREATE(&blocklength),
+                                     OMPI_COUNT_ARRAY_CREATE(&stride)};
 
-        ompi_datatype_set_args( *newtype,
-                                (sizeof(count) != sizeof(size_t)) ? 2 : 0,
-                                (sizeof(count) == sizeof(size_t)) ? 2 : 0,
-                                a_i, 1, a_a, 1, &oldtype, MPI_COMBINER_HVECTOR );
+        ompi_datatype_set_args( *newtype, 0, 3,
+                                a_i, 0, OMPI_DISP_ARRAY_NULL, 1, &oldtype, MPI_COMBINER_HVECTOR );
+#else
+        const ompi_count_array_t a_i[2] = {OMPI_COUNT_ARRAY_CREATE(&count),
+                                           OMPI_COUNT_ARRAY_CREATE(&blocklength)};
+
+        ompi_datatype_set_args( *newtype, 2, 0,
+                                a_i, 1, OMPI_DISP_ARRAY_CREATE(&stride), 1, &oldtype, MPI_COMBINER_HVECTOR );
+#endif
     }
 
     return MPI_SUCCESS;