From b3ba4a64aec7128836060ead22d8882cd989f23a Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Mon, 19 Oct 2015 09:49:29 -0600 Subject: [PATCH 1/2] cm: fix selection priority This patch removes a priority check that disables cm if the previous pml had higher priority. The check was incorrect as coded and is unnecessary as we finalize all but one pml anyway. Fixes #1035 Signed-off-by: Nathan Hjelm --- ompi/mca/pml/cm/pml_cm_component.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ompi/mca/pml/cm/pml_cm_component.c b/ompi/mca/pml/cm/pml_cm_component.c index 6e0d9bf9469..94e12d9c9c5 100644 --- a/ompi/mca/pml/cm/pml_cm_component.c +++ b/ompi/mca/pml/cm/pml_cm_component.c @@ -143,11 +143,6 @@ mca_pml_cm_component_init(int* priority, { int ret; - if((*priority) > ompi_pml_cm.default_priority) { - *priority = ompi_pml_cm.default_priority; - return NULL; - } - *priority = ompi_pml_cm.default_priority; opal_output_verbose( 10, 0, "in cm pml priority is %d\n", *priority); /* find a useable MTL */ @@ -166,9 +161,10 @@ mca_pml_cm_component_init(int* priority, * may still select PML/ob1 (BTLs) or PML/cm (MTLs) if preferable for the app/site. */ *priority = 30; + } else { + *priority = ompi_pml_cm.default_priority; } - if (ompi_mtl->mtl_flags & MCA_MTL_BASE_FLAG_REQUIRE_WORLD) { ompi_pml_cm.super.pml_flags |= MCA_PML_BASE_FLAG_REQUIRE_WORLD; } From 2ac3b55f28df2b70a5ef95dde73eae0aff40809a Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Mon, 19 Oct 2015 09:55:50 -0600 Subject: [PATCH 2/2] pml/ob1: remove priority check This commit removes code that checks the ob1 priority vs the previous priority. The previous priority is meaningless here and may only cause ob1 to disable itself when it shouldn't. Signed-off-by: Nathan Hjelm --- ompi/mca/pml/ob1/pml_ob1_component.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ompi/mca/pml/ob1/pml_ob1_component.c b/ompi/mca/pml/ob1/pml_ob1_component.c index 1a6cda759aa..47a62fabe58 100644 --- a/ompi/mca/pml/ob1/pml_ob1_component.c +++ b/ompi/mca/pml/ob1/pml_ob1_component.c @@ -254,10 +254,6 @@ mca_pml_ob1_component_init( int* priority, opal_output_verbose( 10, mca_pml_ob1_output, "in ob1, my priority is %d\n", mca_pml_ob1.priority); - if((*priority) > mca_pml_ob1.priority) { - *priority = mca_pml_ob1.priority; - return NULL; - } *priority = mca_pml_ob1.priority; allocator_component = mca_allocator_component_lookup( mca_pml_ob1.allocator_name );