Merge pull request #2866 from rhc54/topic/qrsh
Minor change to allow qrsh to tree spawn, if supported
Этот коммит содержится в:
Коммит
a865d4060c
@ -17,7 +17,7 @@
|
|||||||
* reserved.
|
* reserved.
|
||||||
* Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved.
|
* Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved.
|
||||||
* Copyright (c) 2011 IBM Corporation. All rights reserved.
|
* Copyright (c) 2011 IBM Corporation. All rights reserved.
|
||||||
* Copyright (c) 2015 Intel, Inc. All rights reserved.
|
* Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
|
||||||
* $COPYRIGHT$
|
* $COPYRIGHT$
|
||||||
*
|
*
|
||||||
* Additional copyrights may follow
|
* Additional copyrights may follow
|
||||||
@ -288,8 +288,6 @@ static int rsh_component_query(mca_base_module_t **module, int *priority)
|
|||||||
}
|
}
|
||||||
mca_plm_rsh_component.agent = tmp;
|
mca_plm_rsh_component.agent = tmp;
|
||||||
mca_plm_rsh_component.using_qrsh = true;
|
mca_plm_rsh_component.using_qrsh = true;
|
||||||
/* no tree spawn allowed under qrsh */
|
|
||||||
mca_plm_rsh_component.no_tree_spawn = true;
|
|
||||||
goto success;
|
goto success;
|
||||||
} else if (!mca_plm_rsh_component.disable_llspawn &&
|
} else if (!mca_plm_rsh_component.disable_llspawn &&
|
||||||
NULL != getenv("LOADL_STEP_ID")) {
|
NULL != getenv("LOADL_STEP_ID")) {
|
||||||
@ -448,4 +446,3 @@ static int rsh_launch_agent_lookup(const char *agent_list, char *path)
|
|||||||
}
|
}
|
||||||
return ORTE_SUCCESS;
|
return ORTE_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user