Skip to content

Open opal frameworks in opal_init not ompi_mpi_init #938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Open opal frameworks in opal_init not ompi_mpi_init #938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e7d7f2
Open opal frameworks in opal_init not ompi_mpi_init
hjelmn Sep 24, 2015
7d9f629
mpool: remote unnecessary mca_mpool_base_init function
hjelmn Sep 24, 2015
6f30ccb
ompi_mpi_finalize: remote unused headers
hjelmn Sep 24, 2015
18d5e75
ompi_mpi_init: use opal_init not opal_init_util
hjelmn Sep 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions ompi/runtime/ompi_mpi_finalize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2006-2013 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2006-2014 Los Alamos National Security, LLC. All rights
* Copyright (c) 2006-2015 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2006 University of Houston. All rights reserved.
* Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
Expand Down Expand Up @@ -47,10 +47,7 @@
#include "opal/sys/atomic.h"
#include "opal/runtime/opal.h"
#include "opal/util/show_help.h"
#include "opal/mca/mpool/base/base.h"
#include "opal/mca/mpool/base/mpool_base_tree.h"
#include "opal/mca/rcache/base/base.h"
#include "opal/mca/allocator/base/base.h"
#include "opal/mca/pmix/pmix.h"
#include "opal/util/timings.h"

Expand Down Expand Up @@ -401,15 +398,6 @@ int ompi_mpi_finalize(void)
if (OMPI_SUCCESS != (ret = mca_base_framework_close(&ompi_bml_base_framework))) {
return ret;
}
if (OMPI_SUCCESS != (ret = mca_base_framework_close(&opal_mpool_base_framework))) {
return ret;
}
if (OMPI_SUCCESS != (ret = mca_base_framework_close(&opal_rcache_base_framework))) {
return ret;
}
if (OMPI_SUCCESS != (ret = mca_base_framework_close(&opal_allocator_base_framework))) {
return ret;
}

/* free proc resources */
if ( OMPI_SUCCESS != (ret = ompi_proc_finalize())) {
Expand All @@ -434,7 +422,7 @@ int ompi_mpi_finalize(void)
return ret;
}

if (OPAL_SUCCESS != (ret = opal_finalize_util())) {
if (OPAL_SUCCESS != (ret = opal_finalize ())) {
return ret;
}

Expand Down
27 changes: 2 additions & 25 deletions ompi/runtime/ompi_mpi_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@
#include "opal/util/show_help.h"
#include "opal/runtime/opal.h"
#include "opal/mca/event/event.h"
#include "opal/mca/allocator/base/base.h"
#include "opal/mca/rcache/base/base.h"
#include "opal/mca/rcache/rcache.h"
#include "opal/mca/mpool/base/base.h"
#include "opal/mca/pmix/pmix.h"
#include "opal/util/timings.h"

Expand Down Expand Up @@ -390,8 +386,8 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)

/* Setup enough to check get/set MCA params */

if (OPAL_SUCCESS != (ret = opal_init_util(&argc, &argv))) {
error = "ompi_mpi_init: opal_init_util failed";
if (OPAL_SUCCESS != (ret = opal_init (&argc, &argv))) {
error = "ompi_mpi_init: opal_init failed";
goto error;
}

Expand Down Expand Up @@ -556,18 +552,6 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)

/* Open up MPI-related MCA components */

if (OMPI_SUCCESS != (ret = mca_base_framework_open(&opal_allocator_base_framework, 0))) {
error = "mca_allocator_base_open() failed";
goto error;
}
if (OMPI_SUCCESS != (ret = mca_base_framework_open(&opal_rcache_base_framework, 0))) {
error = "mca_rcache_base_open() failed";
goto error;
}
if (OMPI_SUCCESS != (ret = mca_base_framework_open(&opal_mpool_base_framework, 0))) {
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;
Expand Down Expand Up @@ -601,13 +585,6 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)

/* Select which MPI components to use */

if (OMPI_SUCCESS !=
(ret = mca_mpool_base_init(OPAL_ENABLE_PROGRESS_THREADS,
ompi_mpi_thread_multiple))) {
error = "mca_mpool_base_init() failed";
goto error;
}

if (OMPI_SUCCESS !=
(ret = mca_pml_base_select(OPAL_ENABLE_PROGRESS_THREADS,
ompi_mpi_thread_multiple))) {
Expand Down
3 changes: 2 additions & 1 deletion opal/mca/mpool/base/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2015 Los Alamos National Security, LLC. All rights
# reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
Expand All @@ -23,7 +25,6 @@ headers += \
base/mpool_base_tree.h
libmca_mpool_la_SOURCES += \
base/mpool_base_frame.c \
base/mpool_base_init.c \
base/mpool_base_lookup.c \
base/mpool_base_alloc.c \
base/mpool_base_mem_cb.c \
Expand Down
1 change: 0 additions & 1 deletion opal/mca/mpool/base/base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ OPAL_DECLSPEC OBJ_CLASS_DECLARATION(mca_mpool_base_selected_module_t);
* Global functions for MCA: overall mpool open and close
*/

OPAL_DECLSPEC int mca_mpool_base_init(bool enable_progress_threads, bool enable_mpi_threads);
OPAL_DECLSPEC mca_mpool_base_component_t* mca_mpool_base_component_lookup(const char* name);
OPAL_DECLSPEC mca_mpool_base_module_t* mca_mpool_base_module_create(
const char* name,
Expand Down
2 changes: 2 additions & 0 deletions opal/mca/mpool/base/mpool_base_alloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ struct opal_info_t {
};
typedef struct opal_info_t opal_info_t;

OBJ_CLASS_INSTANCE(mca_mpool_base_selected_module_t, opal_list_item_t, NULL, NULL);

/**
* Memory Pool Registration
*/
Expand Down
43 changes: 0 additions & 43 deletions opal/mca/mpool/base/mpool_base_init.c
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions opal/runtime/opal_finalize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@
#include "opal/runtime/opal_cr.h"
#include "opal/mca/crs/base/base.h"

#include "opal/frameworks.h"

extern int opal_initialized;
extern int opal_util_initialized;
extern bool opal_init_called;
Expand Down Expand Up @@ -139,6 +141,10 @@ opal_finalize(void)
/* close the checkpoint and restart service */
opal_cr_finalize();

(void) mca_base_framework_close (&opal_mpool_base_framework);
(void) mca_base_framework_close (&opal_rcache_base_framework);
(void) mca_base_framework_close (&opal_allocator_base_framework);

/* close the security framework */
(void) mca_base_framework_close(&opal_sec_base_framework);

Expand Down
15 changes: 15 additions & 0 deletions opal/runtime/opal_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
#include "opal/mca/event/base/base.h"
#include "opal/mca/backtrace/base/base.h"

#include "opal/frameworks.h"

#include "opal/constants.h"
#include "opal/util/error.h"
#include "opal/util/stacktrace.h"
Expand Down Expand Up @@ -529,6 +531,19 @@ opal_init(int* pargc, char*** pargv)
goto return_error;
}

if (OPAL_SUCCESS != (ret = mca_base_framework_open(&opal_allocator_base_framework, 0))) {
error = "mca_allocator_base_open() failed";
goto return_error;
}
if (OPAL_SUCCESS != (ret = mca_base_framework_open(&opal_rcache_base_framework, 0))) {
error = "mca_rcache_base_open() failed";
goto return_error;
}
if (OPAL_SUCCESS != (ret = mca_base_framework_open(&opal_mpool_base_framework, 0))) {
error = "mca_mpool_base_open() failed";
goto return_error;
}

return OPAL_SUCCESS;

return_error:
Expand Down