Merge pull request open-mpi#10458 from gkatev/main

coll/HAN: Don't DQ HAN dynamic @ intra-node subcomm + typo fixes

Author: awlauria

ompi/mca/coll/han/coll_han_allreduce.c

@@ -110,7 +110,7 @@ mca_coll_han_allreduce_intra(const void *sbuf,
         /* HAN cannot work with this communicator so fallback on all collectives */
         HAN_LOAD_FALLBACK_COLLECTIVES(han_module, comm);
         return comm->c_coll->coll_allreduce(sbuf, rbuf, count, dtype, op,
-                                            comm, comm->c_coll->coll_reduce_module);
+                                            comm, comm->c_coll->coll_allreduce_module);
     }
 
     ptrdiff_t extent, lb;
@@ -444,7 +444,7 @@ mca_coll_han_allreduce_intra_simple(const void *sbuf,
         /* HAN cannot work with this communicator so fallback on all collectives */
         HAN_LOAD_FALLBACK_COLLECTIVES(han_module, comm);
         return comm->c_coll->coll_allreduce(sbuf, rbuf, count, dtype, op,
-                                            comm, comm->c_coll->coll_reduce_module);
+                                            comm, comm->c_coll->coll_allreduce_module);
     }
 
     low_comm = han_module->sub_comm[INTRA_NODE];

ompi/mca/coll/han/coll_han_module.c

@@ -199,13 +199,6 @@ mca_coll_han_comm_query(struct ompi_communicator_t * comm, int *priority)
                             ompi_comm_print_cid(comm), comm->c_name);
         return NULL;
     }
-    if( !ompi_group_have_remote_peers(comm->c_local_group) ) {
-        /* The group only contains local processes. Disable HAN for now */
-        opal_output_verbose(10, ompi_coll_base_framework.framework_output,
-                            "coll:han:comm_query (%s/%s): comm has only local processes; disqualifying myself",
-                            ompi_comm_print_cid(comm), comm->c_name);
-        return NULL;
-    }
     /* Get the priority level attached to this module. If priority is less
      * than or equal to 0, then the module is unavailable. */
     *priority = mca_coll_han_component.han_priority;
@@ -240,6 +233,17 @@ mca_coll_han_comm_query(struct ompi_communicator_t * comm, int *priority)
         }
     }
 
+    if( !ompi_group_have_remote_peers(comm->c_local_group)
+            && INTRA_NODE != han_module->topologic_level ) {
+        /* The group only contains local processes, and this is not a
+         * intra-node subcomm we created. Disable HAN for now */
+        opal_output_verbose(10, ompi_coll_base_framework.framework_output,
+                            "coll:han:comm_query (%s/%s): comm has only local processes; disqualifying myself",
+                            ompi_comm_print_cid(comm), comm->c_name);
+        OBJ_RELEASE(han_module);
+        return NULL;
+    }
+
     han_module->super.coll_module_enable = han_module_enable;
     han_module->super.coll_alltoall   = NULL;
     han_module->super.coll_alltoallv  = NULL;