Incorporated review comments

Changed the default acoll priority back to 0.

Signed-off-by: Manu Shantharam <[email protected]>

Author: mshanthagit

ompi/mca/coll/acoll/coll_acoll.h

@@ -33,6 +33,7 @@ BEGIN_C_DECLS
 OMPI_DECLSPEC extern const mca_coll_base_component_3_0_0_t mca_coll_acoll_component;
 extern int mca_coll_acoll_priority;
 extern int mca_coll_acoll_max_comms;
+extern int mca_coll_acoll_comm_size_thresh;
 extern int mca_coll_acoll_sg_size;
 extern int mca_coll_acoll_sg_scale;
 extern int mca_coll_acoll_node_size;
@@ -85,7 +86,6 @@ int mca_coll_acoll_barrier_intra(struct ompi_communicator_t *comm, mca_coll_base
 
 END_C_DECLS
 
-#define MCA_COLL_ACOLL_MIN_COMM_SIZE 16
 #define MCA_COLL_ACOLL_ROOT_CHANGE_THRESH 10
 #define MCA_COLL_ACOLL_SPLIT_FACTOR_LIST_LEN 6
 #define MCA_COLL_ACOLL_SPLIT_FACTOR_LIST {2, 4, 8, 16, 32, 64}

ompi/mca/coll/acoll/coll_acoll_component.c

@@ -26,6 +26,7 @@ const char *mca_coll_acoll_component_version_string
  */
 int mca_coll_acoll_priority = 0;
 int mca_coll_acoll_max_comms = 10;
+int mca_coll_acoll_comm_size_thresh = 16;
 int mca_coll_acoll_sg_size = 8;
 int mca_coll_acoll_sg_scale = 1;
 int mca_coll_acoll_node_size = 128;
@@ -94,13 +95,19 @@ MCA_BASE_COMPONENT_INIT(ompi, coll, acoll)
 static int acoll_register(void)
 {
     /* Use a low priority, but allow other components to be lower */
-    mca_coll_acoll_priority = 40;
+    mca_coll_acoll_priority = 0;
     (void) mca_base_component_var_register(&mca_coll_acoll_component.collm_version, "priority",
                                            "Priority of the acoll coll component",
                                            MCA_BASE_VAR_TYPE_INT, NULL, 0, 0, OPAL_INFO_LVL_9,
                                            MCA_BASE_VAR_SCOPE_READONLY, &mca_coll_acoll_priority);
 
     /* Defaults on topology */
+    (void)
+        mca_base_component_var_register(&mca_coll_acoll_component.collm_version, "comm_size_thresh",
+                                        "Disable acoll below this communicator size threshold",
+                                        MCA_BASE_VAR_TYPE_INT, NULL, 0, 0, OPAL_INFO_LVL_9,
+                                        MCA_BASE_VAR_SCOPE_READONLY, &mca_coll_acoll_comm_size_thresh);
+
     (void)
         mca_base_component_var_register(&mca_coll_acoll_component.collm_version, "max_comms",
                                         "Maximum no. of communicators using subgroup based algorithms",

ompi/mca/coll/acoll/coll_acoll_module.c

@@ -64,7 +64,7 @@ mca_coll_base_module_t *mca_coll_acoll_comm_query(struct ompi_communicator_t *co
         *priority = 0;
         return NULL;
     }
-    if (OMPI_COMM_IS_INTRA(comm) && ompi_comm_size(comm) < MCA_COLL_ACOLL_MIN_COMM_SIZE) {
+    if (ompi_comm_size(comm) < mca_coll_acoll_comm_size_thresh) {
         *priority = 0;
         return NULL;
     }
@@ -135,7 +135,7 @@ mca_coll_base_module_t *mca_coll_acoll_comm_query(struct ompi_communicator_t *co
     // Check SMSC availability (currently only for XPMEM)
     if (!mca_smsc_base_has_feature(MCA_SMSC_FEATURE_CAN_MAP)) {
         opal_output_verbose(MCA_BASE_VERBOSE_ERROR, ompi_coll_base_framework.framework_output,
-                            "coll:acoll: Error: SMSC's xpmem component is not available. "
+                            "coll:acoll: Error: SMSC's MAP feature is not available. "
                             "SMSC will be disabled for this communicator irrespective of "
                             "the mca parameters.");
         acoll_module->has_smsc = 0;