Fix an AMCA parameter regression introduced (as a side effect of) in r14449
(and, due to lack of in code documentation, in r14661). The {{{opal_mca_base_param_use_amca_sets}}} flag tells the orted that it should not look at the parameter files just yet since it may have an AMCA parameter file to look at first. So we need to set this to {{{false}}} before initializing the MCA paras, then quickly turn around and re-init them when we have the full information. This commit fixes trac:1058 This commit was SVN r15144. The following SVN revision numbers were found above: r14449 --> open-mpi/ompi@0ba47105ed r14661 --> open-mpi/ompi@df86202202 The following Trac tickets were found above: Ticket 1058 --> https://svn.open-mpi.org/trac/ompi/ticket/1058
Этот коммит содержится в:
родитель
a3998a1676
Коммит
db59235af5
@ -83,8 +83,6 @@
|
||||
/*
|
||||
* Globals
|
||||
*/
|
||||
|
||||
extern bool opal_mca_base_param_use_amca_sets;
|
||||
orted_globals_t orted_globals;
|
||||
|
||||
static struct opal_event term_handler;
|
||||
@ -196,6 +194,12 @@ int main(int argc, char *argv[])
|
||||
/* initialize the globals */
|
||||
memset(&orted_globals, 0, sizeof(orted_globals_t));
|
||||
|
||||
/* Need to set this so that the orted does not throw a warning message
|
||||
* about missing AMCA param files that are located in the relative or
|
||||
* absolute paths (e.g., not in the package directory).
|
||||
*/
|
||||
opal_mca_base_param_use_amca_sets = false;
|
||||
|
||||
/* Ensure that enough of OPAL is setup for us to be able to run */
|
||||
if (OPAL_SUCCESS != opal_init_util()) {
|
||||
fprintf(stderr, "OPAL failed to initialize -- orted aborting\n");
|
||||
@ -209,8 +213,6 @@ int main(int argc, char *argv[])
|
||||
* Do not parse the Aggregate Parameter Sets in this pass.
|
||||
* we will get to them in a moment
|
||||
*/
|
||||
/* GMS: what does this do and why is it gone now? */
|
||||
/* opal_mca_base_param_use_mca_sets = false; */
|
||||
mca_base_param_init();
|
||||
|
||||
/* setup to check common command line options that just report and die */
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user