1
1

Priority of rmaps_rank_file_component changed to 100 when it selected

This commit was SVN r18866.
Этот коммит содержится в:
Lenny Verkhovsky 2008-07-10 13:57:40 +00:00
родитель 0532aeb368
Коммит 30f0b33274

Просмотреть файл

@ -74,7 +74,7 @@ orte_rmaps_rank_file_component_t mca_rmaps_rank_file_component = {
*/
static int orte_rmaps_rank_file_open(void)
{
int index, paffinity_alone;
int index, paffinity_alone = 0;
mca_rmaps_rank_file_component.priority = 0;
mca_base_param_reg_string(&mca_rmaps_rank_file_component.super.base_version,
@ -82,14 +82,14 @@ static int orte_rmaps_rank_file_open(void)
"The path to the rank mapping file",
false, false, NULL, &orte_rmaps_rank_file_path);
if (NULL != orte_rmaps_rank_file_path) {
mca_rmaps_rank_file_component.priority = 1000000;
mca_rmaps_rank_file_component.priority = 100;
}
index = mca_base_param_find("opal", NULL, "paffinity_slot_list");
if (index >= 0) {
if (OPAL_SUCCESS == mca_base_param_lookup_string(index, &orte_mca_rmaps_rank_file_slot_list)) {
if (NULL != orte_mca_rmaps_rank_file_slot_list) {
mca_rmaps_rank_file_component.priority = 1000000;
mca_rmaps_rank_file_component.priority = 100;
}
}
}
@ -97,7 +97,7 @@ static int orte_rmaps_rank_file_open(void)
index = mca_base_param_find("opal", NULL, "paffinity_alone");
if (index >= 0) {
if (OPAL_SUCCESS == mca_base_param_lookup_int(index, &paffinity_alone)) {
if ( 1000000 == mca_rmaps_rank_file_component.priority && paffinity_alone ){
if ( 100 == mca_rmaps_rank_file_component.priority && paffinity_alone ){
opal_output(0, "WARNING: paffinity_alone cannot be set with paffinity_slot_list or rank_file\nTherefore mca_rmaps_rank_file_component.priority set to 0\n");
mca_rmaps_rank_file_component.priority = 0;
}