Merge pull request #2501 from vspetrov/v2.x_hcoll_ctx_free_detection

V2.x: hcoll ctx free detection

Author: jsquyres

config/ompi_check_libhcoll.m4

@@ -47,6 +47,15 @@ AC_DEFUN([OMPI_CHECK_HCOLL],[
                               [ompi_check_hcoll_happy="yes"],
                               [ompi_check_hcoll_happy="no"])
 
+           AS_IF([test "$ompi_check_hcoll_happy" = "yes"],
+                 [
+                     CPPFLAGS=$coll_hcoll_CPPFLAGS
+                     LDFLAGS=$coll_hcoll_LDFLAGS
+                     LIBS=$coll_hcoll_LIBS
+                     AC_CHECK_FUNCS(hcoll_context_free, [], [])
+                 ],
+                 [])
+
            CPPFLAGS=$CPPFLAGS_save
            LDFLAGS=$LDFLAGS_save
            LIBS=$LIBS_save],

ompi/mca/coll/hcoll/coll_hcoll_module.c

@@ -138,7 +138,7 @@ static void mca_coll_hcoll_module_destruct(mca_coll_hcoll_module_t *hcoll_module
         OBJ_RELEASE(hcoll_module->previous_reduce_scatter_module);
         OBJ_RELEASE(hcoll_module->previous_reduce_module);
         */
-#if HCOLL_API < HCOLL_VERSION(3,7)
+#if !defined(HAVE_HCOLL_CONTEXT_FREE)
         context_destroyed = 0;
         hcoll_destroy_context(hcoll_module->hcoll_context,
                               (rte_grp_handle_t)hcoll_module->comm,
@@ -206,7 +206,7 @@ int hcoll_comm_attr_del_fn(MPI_Comm comm, int keyval, void *attr_val, void *extr
     mca_coll_hcoll_module_t *hcoll_module;
     hcoll_module = (mca_coll_hcoll_module_t*) attr_val;
 
-#if HCOLL_API >= HCOLL_VERSION(3,7)
+#ifdef HAVE_HCOLL_CONTEXT_FREE
     hcoll_context_free(hcoll_module->hcoll_context, (rte_grp_handle_t)comm);
 #else
     hcoll_group_destroy_notify(hcoll_module->hcoll_context);