C/R fix for broken CRS component selection resulting from r18707.
Make sure that if we ask for the 'none' component (which is not a 'real' component, but a component in crs/base) then we do not fail out of the box when using tools. We check for the {{{OPAL_ERR_NOT_FOUND}}} error. Also make sure that component_open() returns {{{OPAL_ERR_NOT_FOUND}}} when it cannot find a value instead of {{{OPAL_ERROR}}} which means something quite a bit different. C/R is working but the tools still print the warning below everytime they are ran: {{{ -------------------------------------------------------------------------- A requested component was not found, or was unable to be opened. This means that this component is either not installed or is unable to be used on your system (e.g., sometimes this means that shared libraries that the component requires are unable to be found/loaded). Note that Open MPI stopped checking at the first component that it did not find. Host: odin.cs.indiana.edu Framework: crs Component: none -------------------------------------------------------------------------- }}} I'll have to figure out a work around for this warning (maybe work on the {{{MCA_NULL}}} Ticket #1291). This commit was SVN r18739. The following SVN revision numbers were found above: r18707 --> open-mpi/ompi@bdaaf01d8a
Этот коммит содержится в:
родитель
26f6d9cf0c
Коммит
a003fa7a50
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
|
||||
* Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2007 The University of Tennessee and The University
|
||||
@ -124,11 +124,11 @@ int mca_base_components_open(const char *type_name, int output_id,
|
||||
}
|
||||
|
||||
/* Find and load requested components */
|
||||
if (OPAL_SUCCESS !=
|
||||
if (OPAL_SUCCESS != (ret =
|
||||
mca_base_component_find(NULL, type_name, static_components,
|
||||
requested_component_names, include_mode,
|
||||
&components_found, open_dso_components)) {
|
||||
return OPAL_ERROR;
|
||||
&components_found, open_dso_components)) ) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
#if (OPAL_ENABLE_FT == 1) && (OPAL_ENABLE_FT_CR == 1)
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2004-2007 The Trustees of Indiana University.
|
||||
* Copyright (c) 2004-2008 The Trustees of Indiana University.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
|
||||
* All rights reserved.
|
||||
@ -51,6 +51,7 @@ char * opal_crs_base_snapshot_dir = NULL;
|
||||
*/
|
||||
int opal_crs_base_open(void)
|
||||
{
|
||||
int ret, exit_status = OPAL_SUCCESS;
|
||||
int value;
|
||||
char *str_value = NULL;
|
||||
|
||||
@ -86,20 +87,23 @@ int opal_crs_base_open(void)
|
||||
false, false,
|
||||
NULL, &str_value);
|
||||
|
||||
/* Open up all available components */
|
||||
if (OPAL_SUCCESS != (ret = mca_base_components_open("crs",
|
||||
opal_crs_base_output,
|
||||
mca_crs_base_static_components,
|
||||
&opal_crs_base_components_available,
|
||||
true)) ) {
|
||||
if( OPAL_ERR_NOT_FOUND == ret &&
|
||||
NULL != str_value &&
|
||||
0 == strncmp(str_value, "none", strlen("none")) ) {
|
||||
exit_status = OPAL_SUCCESS;
|
||||
} else {
|
||||
exit_status = OPAL_ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
if( NULL != str_value ) {
|
||||
free(str_value);
|
||||
}
|
||||
|
||||
/* Open up all available components */
|
||||
if (OPAL_SUCCESS !=
|
||||
mca_base_components_open("crs",
|
||||
opal_crs_base_output,
|
||||
mca_crs_base_static_components,
|
||||
&opal_crs_base_components_available,
|
||||
true)) {
|
||||
return OPAL_ERROR;
|
||||
}
|
||||
|
||||
|
||||
return OPAL_SUCCESS;
|
||||
return exit_status;
|
||||
}
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user