From bfd75de6f9d8b3d315e9d2d6a26a1989e94adbd7 Mon Sep 17 00:00:00 2001 From: Mike Dubman Date: Tue, 9 Aug 2011 07:09:37 +0000 Subject: [PATCH] fix selection logic: if no suitable device found - disqulaify mxm w/o complains. This commit was SVN r25021. --- ompi/mca/mtl/mxm/mtl_mxm_component.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ompi/mca/mtl/mxm/mtl_mxm_component.c b/ompi/mca/mtl/mxm/mtl_mxm_component.c index c1633b2ffa..39e3a3ac44 100644 --- a/ompi/mca/mtl/mxm/mtl_mxm_component.c +++ b/ompi/mca/mtl/mxm/mtl_mxm_component.c @@ -82,8 +82,12 @@ static int ompi_mtl_mxm_component_open(void) mxm_fill_context_opts(&mxm_opts); err = mxm_init(&mxm_opts, &ompi_mtl_mxm.mxm_context); if (MXM_OK != err) { - orte_show_help("help-mtl-mxm.txt", "mxm init", true, - mxm_error_string(err)); + if (MXM_ERR_NO_DEVICE == err) { + MXM_VERBOSE(1, "No supported device found, disqualifying mxm"); + } else { + orte_show_help("help-mtl-mxm.txt", "mxm init", true, + mxm_error_string(err)); + } return OPAL_ERR_NOT_AVAILABLE; } return OMPI_SUCCESS; @@ -104,7 +108,7 @@ ompi_mtl_mxm_component_init(bool enable_progress_threads, rc = ompi_mtl_mxm_module_init(); if (OMPI_SUCCESS != rc) { - return NULL; + return NULL; } /* Calculate MTL constraints according to MXM types */