Coll/han Bull

* first import of Bull specific modifications to HAN

* Cleaning, renaming and compilation fixing Changed all future into han.

* Import BULL specific modifications in coll/tuned and coll/base

* Fixed compilation issues in Han

* Changed han_output to directly point to coll framework output.

* The verbosity MCA parameter was removed as a duplicated of coll verbosity

* Add fallback in han reduce when op cannot commute and ppn are imbalanced

* Added fallback wfor han bcast when nodes do not have the same number of process

* Add fallback in han scatter when ppn are imbalanced

+ fixed missing scatter_fn pointer in the module interface

Signed-off-by: Brelle Emmanuel <emmanuel.brelle@atos.net>
Co-authored-by: a700850 <pierre.lemarinier@atos.net>
Co-authored-by: germainf <florent.germain@atos.net>

Author: 3 people

ompi/mca/coll/base/coll_base_comm_select.c

@@ -21,6 +21,7 @@
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2016-2017 IBM Corporation.  All rights reserved.
  * Copyright (c) 2017      FUJITSU LIMITED.  All rights reserved.
+ * Copyright (c) 2020      BULL S.A.S. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -44,20 +45,12 @@
 #include "opal/mca/base/base.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/base.h"
-
+#include "ompi/mca/coll/base/coll_base_util.h"
 
 /*
- * Local types
+ * Stuff for the OBJ interface
  */
-struct avail_coll_t {
-    opal_list_item_t super;
-
-    int ac_priority;
-    mca_coll_base_module_2_3_0_t *ac_module;
-    const char * ac_component_name;
-};
-typedef struct avail_coll_t avail_coll_t;
-
+OBJ_CLASS_INSTANCE(mca_coll_base_avail_coll_t, opal_list_item_t, NULL, NULL);
 
 /*
  * Local functions
@@ -77,12 +70,6 @@ static int query_2_0_0(const mca_coll_base_component_2_0_0_t *
                        int *priority,
                        mca_coll_base_module_2_3_0_t ** module);
 
-/*
- * Stuff for the OBJ interface
- */
-static OBJ_CLASS_INSTANCE(avail_coll_t, opal_list_item_t, NULL, NULL);
-
-
 #define COPY(module, comm, func)                                        \
     do {                                                                \
         if (NULL != module->coll_ ## func) {                            \
@@ -138,11 +125,14 @@ int mca_coll_base_comm_select(ompi_communicator_t * comm)
     /* FIX ME - Do some kind of collective operation to find a module
        that everyone has available */
 
+    /* List to store every valid module */
+    comm->c_coll->module_list =  OBJ_NEW(opal_list_t);
+
     /* do the selection loop */
     for (item = opal_list_remove_first(selectable);
          NULL != item; item = opal_list_remove_first(selectable)) {
 
-        avail_coll_t *avail = (avail_coll_t *) item;
+        mca_coll_base_avail_coll_t *avail = (mca_coll_base_avail_coll_t *) item;
 
         /* initialize the module */
         ret = avail->ac_module->coll_module_enable(avail->ac_module, comm);
@@ -153,6 +143,9 @@ int mca_coll_base_comm_select(ompi_communicator_t * comm)
                             (OMPI_SUCCESS == ret ? "Enabled": "Disabled") );
 
         if (OMPI_SUCCESS == ret) {
+            /* Save every component that is initialized,
+             * queried and enabled successfully */
+            opal_list_append(comm->c_coll->module_list, &avail->super);
 
             /* copy over any of the pointers */
             COPY(avail->ac_module, comm, allgather);
@@ -230,10 +223,11 @@ int mca_coll_base_comm_select(ompi_communicator_t * comm)
             COPY(avail->ac_module, comm, neighbor_alltoallw_init);
 
             COPY(avail->ac_module, comm, reduce_local);
+        } else {
+            /* release the original module reference and the list item */
+            OBJ_RELEASE(avail->ac_module);
+            OBJ_RELEASE(avail);
         }
-        /* release the original module reference and the list item */
-        OBJ_RELEASE(avail->ac_module);
-        OBJ_RELEASE(avail);
     }
 
     /* Done with the list from the check_components() call so release it. */
@@ -306,8 +300,8 @@ int mca_coll_base_comm_select(ompi_communicator_t * comm)
 
 static int avail_coll_compare (opal_list_item_t **a,
                                opal_list_item_t **b) {
-    avail_coll_t *acoll = (avail_coll_t *) *a;
-    avail_coll_t *bcoll = (avail_coll_t *) *b;
+    mca_coll_base_avail_coll_t *acoll = (mca_coll_base_avail_coll_t *) *a;
+    mca_coll_base_avail_coll_t *bcoll = (mca_coll_base_avail_coll_t *) *b;
 
     if (acoll->ac_priority > bcoll->ac_priority) {
         return 1;
@@ -332,7 +326,7 @@ static opal_list_t *check_components(opal_list_t * components,
     mca_base_component_list_item_t *cli;
     mca_coll_base_module_2_3_0_t *module;
     opal_list_t *selectable;
-    avail_coll_t *avail;
+    mca_coll_base_avail_coll_t *avail;
 
     /* Make a list of the components that query successfully */
     selectable = OBJ_NEW(opal_list_t);
@@ -345,7 +339,7 @@ static opal_list_t *check_components(opal_list_t * components,
         if (priority >= 0) {
             /* We have a component that indicated that it wants to run
                by giving us a module */
-            avail = OBJ_NEW(avail_coll_t);
+            avail = OBJ_NEW(mca_coll_base_avail_coll_t);
             avail->ac_priority = priority;
             avail->ac_module = module;
             // Point to the string so we don't have to free later

ompi/mca/coll/base/coll_base_comm_unselect.c

@@ -16,6 +16,7 @@
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2017      IBM Corporation.  All rights reserved.
  * Copyright (c) 2017      FUJITSU LIMITED.  All rights reserved.
+ * Copyright (c) 2020      BULL S.A.S. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -34,6 +35,7 @@
 
 #include "ompi/communicator/communicator.h"
 #include "ompi/mca/coll/base/base.h"
+#include "ompi/mca/coll/base/coll_base_util.h"
 
 #define CLOSE(comm, func)                                        \
     do {                                                         \
@@ -50,6 +52,8 @@
 
 int mca_coll_base_comm_unselect(ompi_communicator_t * comm)
 {
+    opal_list_item_t *item;
+
     CLOSE(comm, allgather);
     CLOSE(comm, allgatherv);
     CLOSE(comm, allreduce);
@@ -124,6 +128,17 @@ int mca_coll_base_comm_unselect(ompi_communicator_t * comm)
 
     CLOSE(comm, reduce_local);
 
+    for (item = opal_list_remove_first(comm->c_coll->module_list);
+         NULL != item; item = opal_list_remove_first(comm->c_coll->module_list)) {
+        mca_coll_base_avail_coll_t *avail = (mca_coll_base_avail_coll_t *) item;
+
+        if(avail->ac_module) {
+            OBJ_RELEASE(avail->ac_module);
+        }
+        OBJ_RELEASE(avail);
+    }
+    OBJ_RELEASE(comm->c_coll->module_list);
+
     free(comm->c_coll);
     comm->c_coll = NULL;
 

ompi/mca/coll/base/coll_base_util.c

@@ -305,3 +305,39 @@ static void nbc_req_cons(ompi_coll_base_nbc_request_t *req) {
 }
 
 OBJ_CLASS_INSTANCE(ompi_coll_base_nbc_request_t, ompi_request_t, nbc_req_cons, NULL);
+
+/* File reading functions */
+static void skiptonewline (FILE *fptr, int *fileline)
+{
+    do {
+        char val;
+        int rc; 
+
+        rc = fread(&val, 1, 1, fptr);
+        if (0 == rc) return;
+        if ((1 == rc)&&('\n' == val)) {
+            (*fileline)++;
+            return;
+        }   
+    } while (1);
+}
+
+long ompi_coll_base_file_getnext (FILE *fptr, int *fileline)
+{
+    do {
+        long val;
+        int rc; 
+        char trash;
+
+        rc = fscanf(fptr, "%li", &val);
+        if (rc == EOF) return MYEOF;
+        if (1 == rc) return val;
+        /* in all other cases, skip to the end */
+        rc = fread(&trash, sizeof(char), 1, fptr);
+        if (rc == EOF) return MYEOF;
+        if ('\n' == trash) (*fileline)++;
+        if ('#' == trash) {
+            skiptonewline (fptr, fileline);
+        }   
+    } while (1);
+}

ompi/mca/coll/base/coll_base_util.h

@@ -84,6 +84,19 @@ ompi_coll_base_nbc_reserve_tags(ompi_communicator_t* comm, int32_t reserve)
 
 typedef struct ompi_coll_base_nbc_request_t ompi_coll_base_nbc_request_t;
 
+/*
+ * Structure to store an available module
+ */
+struct mca_coll_base_avail_coll_t {
+    opal_list_item_t super;
+
+    int ac_priority;
+    mca_coll_base_module_t *ac_module;
+    const char * ac_component_name;
+};
+typedef struct mca_coll_base_avail_coll_t mca_coll_base_avail_coll_t;
+OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_coll_base_avail_coll_t);
+
 /**
  * A MPI_like function doing a send and a receive simultaneously.
  * If one of the communications results in a zero-byte message the
@@ -164,5 +177,9 @@ int ompi_coll_base_retain_datatypes_w( ompi_request_t *request,
                                        ompi_datatype_t * const stypes[],
                                        ompi_datatype_t * const rtypes[]);
 
+/* File reading function */
+#define MYEOF -999
+long ompi_coll_base_file_getnext(FILE *fptr, int *fileline);
+
 END_C_DECLS
 #endif /* MCA_COLL_BASE_UTIL_EXPORT_H */

ompi/mca/coll/coll.h

@@ -19,6 +19,7 @@
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2016-2017 IBM Corporation.  All rights reserved.
  * Copyright (c) 2017      FUJITSU LIMITED.  All rights reserved.
+ * Copyright (c) 2020      BULL S.A.S. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -767,6 +768,9 @@ struct mca_coll_base_comm_coll_t {
 
     mca_coll_base_module_reduce_local_fn_t coll_reduce_local;
     mca_coll_base_module_2_3_0_t *coll_reduce_local_module;
+
+    /* List of modules initialized, queried and enabled */
+    opal_list_t *module_list;
 };
 typedef struct mca_coll_base_comm_coll_t mca_coll_base_comm_coll_t;
 

ompi/mca/coll/han/Makefile.am

@@ -12,6 +12,8 @@
 sources = \
 coll_han.h \
 coll_han_trigger.h \
+coll_han_dynamic.h \
+coll_han_dynamic_file.h \
 coll_han_bcast.c \
 coll_han_reduce.c \
 coll_han_scatter.c \
@@ -21,6 +23,10 @@ coll_han_allgather.c \
 coll_han_component.c \
 coll_han_module.c \
 coll_han_trigger.c \
+coll_han_dynamic.c \
+coll_han_dynamic_file.c \
+coll_han_topo.c \
+coll_han_subcomms.c \
 coll_han_utils.c
 
 # Make the output library in this directory, and name it either