From bcf70a2840d2bec7ed44a3248b67939bb6781365 Mon Sep 17 00:00:00 2001 From: Joseph Schuchart Date: Thu, 19 Nov 2020 19:10:09 +0100 Subject: [PATCH] coll/[sm|han|adapt]: don't disqualify on priority 0 Signed-off-by: Joseph Schuchart (cherry picked from commit 09c2f4af9437accd747e823c591927481c2103ad) --- ompi/mca/coll/adapt/coll_adapt_module.c | 6 +++--- ompi/mca/coll/han/coll_han_module.c | 2 +- ompi/mca/coll/sm/coll_sm_module.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ompi/mca/coll/adapt/coll_adapt_module.c b/ompi/mca/coll/adapt/coll_adapt_module.c index fd8c448f20..54d295294a 100644 --- a/ompi/mca/coll/adapt/coll_adapt_module.c +++ b/ompi/mca/coll/adapt/coll_adapt_module.c @@ -3,9 +3,9 @@ * of Tennessee Research Foundation. All rights * reserved. * $COPYRIGHT$ - * + * * Additional copyrights may follow - * + * * $HEADER$ */ @@ -146,7 +146,7 @@ mca_coll_base_module_t *ompi_coll_adapt_comm_query(struct ompi_communicator_t * /* 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_adapt_component.adapt_priority; - if (mca_coll_adapt_component.adapt_priority <= 0) { + if (mca_coll_adapt_component.adapt_priority < 0) { opal_output_verbose(10, ompi_coll_base_framework.framework_output, "coll:adapt:comm_query (%d/%s): priority too low; " "disqualifying myself", diff --git a/ompi/mca/coll/han/coll_han_module.c b/ompi/mca/coll/han/coll_han_module.c index 1a3a7e5c66..441ef58ad4 100644 --- a/ompi/mca/coll/han/coll_han_module.c +++ b/ompi/mca/coll/han/coll_han_module.c @@ -188,7 +188,7 @@ mca_coll_han_comm_query(struct ompi_communicator_t * comm, int *priority) /* 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; - if (mca_coll_han_component.han_priority <= 0) { + if (mca_coll_han_component.han_priority < 0) { opal_output_verbose(10, ompi_coll_base_framework.framework_output, "coll:han:comm_query (%d/%s): priority too low; disqualifying myself", comm->c_contextid, comm->c_name); diff --git a/ompi/mca/coll/sm/coll_sm_module.c b/ompi/mca/coll/sm/coll_sm_module.c index 0789ef8151..4761c41037 100644 --- a/ompi/mca/coll/sm/coll_sm_module.c +++ b/ompi/mca/coll/sm/coll_sm_module.c @@ -180,10 +180,10 @@ mca_coll_sm_comm_query(struct ompi_communicator_t *comm, int *priority) /* 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_sm_component.sm_priority; - if (mca_coll_sm_component.sm_priority <= 0) { + if (mca_coll_sm_component.sm_priority < 0) { opal_output_verbose(10, ompi_coll_base_framework.framework_output, "coll:sm:comm_query (%d/%s): priority too low; disqualifying myself", comm->c_contextid, comm->c_name); - return NULL; + return NULL; } sm_module = OBJ_NEW(mca_coll_sm_module_t);