diff --git a/ompi/mca/pml/ob1/pml_ob1_component.c b/ompi/mca/pml/ob1/pml_ob1_component.c index ff2e93503cc..60f465d5e75 100644 --- a/ompi/mca/pml/ob1/pml_ob1_component.c +++ b/ompi/mca/pml/ob1/pml_ob1_component.c @@ -244,11 +244,15 @@ static int mca_pml_ob1_component_register(void) static int mca_pml_ob1_component_open(void) { + int rc; mca_pml_ob1_output = opal_output_open(NULL); opal_output_set_verbosity(mca_pml_ob1_output, mca_pml_ob1_verbose); mca_pml_ob1.enabled = false; - return mca_base_framework_open(&ompi_bml_base_framework, 0); + if (OMPI_SUCCESS != (rc = mca_base_framework_open(&ompi_bml_base_framework, 0))) { + return rc; + } + return mca_bml_base_init (1, ompi_mpi_thread_multiple); } diff --git a/ompi/runtime/ompi_mpi_finalize.c b/ompi/runtime/ompi_mpi_finalize.c index b636ddfbaab..4ceba079658 100644 --- a/ompi/runtime/ompi_mpi_finalize.c +++ b/ompi/runtime/ompi_mpi_finalize.c @@ -17,8 +17,8 @@ * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2011 Sandia National Laboratories. All rights reserved. * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. - * Copyright (c) 2016 Research Organization for Information Science - * and Technology (RIST). All rights reserved. + * Copyright (c) 2016-2018 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * * Copyright (c) 2016-2017 IBM Corporation. All rights reserved. * $COPYRIGHT$ @@ -446,9 +446,6 @@ int ompi_mpi_finalize(void) if (OMPI_SUCCESS != (ret = mca_base_framework_close(&ompi_coll_base_framework))) { goto done; } - if (OMPI_SUCCESS != (ret = mca_base_framework_close(&ompi_bml_base_framework))) { - goto done; - } if (OMPI_SUCCESS != (ret = mca_base_framework_close(&opal_mpool_base_framework))) { goto done; } diff --git a/ompi/runtime/ompi_mpi_init.c b/ompi/runtime/ompi_mpi_init.c index de71a33042b..ce3a9d475b4 100644 --- a/ompi/runtime/ompi_mpi_init.c +++ b/ompi/runtime/ompi_mpi_init.c @@ -18,8 +18,8 @@ * Copyright (c) 2011 Sandia National Laboratories. All rights reserved. * Copyright (c) 2012-2013 Inria. All rights reserved. * Copyright (c) 2014-2018 Intel, Inc. All rights reserved. - * Copyright (c) 2014-2016 Research Organization for Information Science - * and Technology (RIST). All rights reserved. + * Copyright (c) 2014-2018 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * Copyright (c) 2016-2018 Mellanox Technologies Ltd. All rights reserved. * * Copyright (c) 2016-2017 IBM Corporation. All rights reserved. @@ -606,14 +606,6 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided, error = "mca_mpool_base_open() failed"; goto error; } - if (OMPI_SUCCESS != (ret = mca_base_framework_open(&ompi_bml_base_framework, 0))) { - error = "mca_bml_base_open() failed"; - goto error; - } - if (OMPI_SUCCESS != (ret = mca_bml_base_init (1, ompi_mpi_thread_multiple))) { - error = "mca_bml_base_init() failed"; - goto error; - } if (OMPI_SUCCESS != (ret = mca_base_framework_open(&ompi_pml_base_framework, 0))) { error = "mca_pml_base_open() failed"; goto error;