Merge pull request #2260 from vspetrov/v2.x_hcoll_ialltoallv

coll/hcoll: ialltoallv interface

Author: jsquyres

ompi/mca/coll/hcoll/coll_hcoll.h

@@ -289,6 +289,7 @@ int mca_coll_hcoll_ialltoall(const void *sbuf, int scount,
                             ompi_request_t **req,
                             mca_coll_base_module_t *module);
 
+#if HCOLL_API >= HCOLL_VERSION(3,7)
 int mca_coll_hcoll_ialltoallv(void *sbuf, int *scounts,
                             int *sdisps,
                             struct ompi_datatype_t *sdtype,
@@ -298,6 +299,7 @@ int mca_coll_hcoll_ialltoallv(void *sbuf, int *scounts,
                             struct ompi_communicator_t *comm,
                             ompi_request_t **req,
                             mca_coll_base_module_t *module);
+#endif
 
 int mca_coll_hcoll_igatherv(const void* sbuf, int scount,
                             struct ompi_datatype_t *sdtype,

ompi/mca/coll/hcoll/coll_hcoll_module.c

@@ -399,8 +399,11 @@ mca_coll_hcoll_comm_query(struct ompi_communicator_t *comm, int *priority)
     hcoll_module->super.coll_gather = /*hcoll_collectives.coll_gather ? mca_coll_hcoll_gather :*/ NULL;
     hcoll_module->super.coll_igatherv = hcoll_collectives.coll_igatherv ? mca_coll_hcoll_igatherv : NULL;
     hcoll_module->super.coll_ialltoall = /*hcoll_collectives.coll_ialltoall ? mca_coll_hcoll_ialltoall : */ NULL;
-    hcoll_module->super.coll_ialltoallv = /*hcoll_collectives.coll_ialltoallv ? mca_coll_hcoll_ialltoallv : */ NULL;
-
+#if HCOLL_API >= HCOLL_VERSION(3,7)
+    hcoll_module->super.coll_ialltoallv = hcoll_collectives.coll_ialltoallv ? mca_coll_hcoll_ialltoallv : NULL;
+#else
+    hcoll_module->super.coll_ialltoallv = NULL;
+#endif
     *priority = cm->hcoll_priority;
     module = &hcoll_module->super;
 

ompi/mca/coll/hcoll/coll_hcoll_ops.c

@@ -685,3 +685,41 @@ int mca_coll_hcoll_igatherv(const void* sbuf, int scount,
 
 }
 
+
+#if HCOLL_API >= HCOLL_VERSION(3,7)
+int mca_coll_hcoll_ialltoallv(void *sbuf, int *scounts, int *sdisps,
+                              struct ompi_datatype_t *sdtype,
+                              void *rbuf, int *rcounts, int *rdisps,
+                              struct ompi_datatype_t *rdtype,
+                              struct ompi_communicator_t *comm,
+                              ompi_request_t ** request,
+                              mca_coll_base_module_t *module)
+{
+    dte_data_representation_t stype;
+    dte_data_representation_t rtype;
+    int rc;
+    HCOL_VERBOSE(20,"RUNNING HCOL IALLTOALLV");
+    mca_coll_hcoll_module_t *hcoll_module = (mca_coll_hcoll_module_t*)module;
+    stype = ompi_dtype_2_hcoll_dtype(sdtype, NO_DERIVED);
+    rtype = ompi_dtype_2_hcoll_dtype(rdtype, NO_DERIVED);
+    if (OPAL_UNLIKELY(HCOL_DTE_IS_ZERO(stype) || HCOL_DTE_IS_ZERO(rtype))) {
+        HCOL_VERBOSE(20,"Ompi_datatype is not supported: sdtype = %s, rdtype = %s; calling fallback ialltoallv;",
+                     sdtype->super.name,
+                     rdtype->super.name);
+        rc = hcoll_module->previous_ialltoallv(sbuf, scounts, sdisps, sdtype,
+                                               rbuf, rcounts, rdisps, rdtype,
+                                               comm, request, hcoll_module->previous_alltoallv_module);
+        return rc;
+    }
+    rc = hcoll_collectives.coll_ialltoallv((void *)sbuf, (int *)scounts, (int *)sdisps, stype,
+                                           rbuf, (int *)rcounts, (int *)rdisps, rtype,
+                                           hcoll_module->hcoll_context, (void**)request);
+    if (HCOLL_SUCCESS != rc){
+        HCOL_VERBOSE(20,"RUNNING FALLBACK IALLTOALLV");
+        rc = hcoll_module->previous_ialltoallv(sbuf, scounts, sdisps, sdtype,
+                                               rbuf, rcounts, rdisps, rdtype,
+                                               comm, request, hcoll_module->previous_alltoallv_module);
+    }
+    return rc;
+}
+#endif