Minor cleanups to handle comm_spawn and singletons
Этот коммит содержится в:
родитель
74385302c0
Коммит
fcec24b2a4
@ -868,6 +868,12 @@ static int spawn(int count, const char *array_of_commands[],
|
|||||||
have_wdir = 0;
|
have_wdir = 0;
|
||||||
if ( array_of_info != NULL && array_of_info[i] != MPI_INFO_NULL ) {
|
if ( array_of_info != NULL && array_of_info[i] != MPI_INFO_NULL ) {
|
||||||
|
|
||||||
|
/* check for personality */
|
||||||
|
ompi_info_get (array_of_info[i], "personality", sizeof(host) - 1, host, &flag);
|
||||||
|
if ( flag ) {
|
||||||
|
jdata->personality = strdup(host);
|
||||||
|
}
|
||||||
|
|
||||||
/* check for 'host' */
|
/* check for 'host' */
|
||||||
ompi_info_get (array_of_info[i], "host", sizeof(host) - 1, host, &flag);
|
ompi_info_get (array_of_info[i], "host", sizeof(host) - 1, host, &flag);
|
||||||
if ( flag ) {
|
if ( flag ) {
|
||||||
@ -1119,6 +1125,11 @@ static int spawn(int count, const char *array_of_commands[],
|
|||||||
*/
|
*/
|
||||||
} /* for (i = 0 ; i < count ; ++i) */
|
} /* for (i = 0 ; i < count ; ++i) */
|
||||||
|
|
||||||
|
/* default the personality */
|
||||||
|
if (NULL == jdata->personality) {
|
||||||
|
jdata->personality = strdup("ompi");
|
||||||
|
}
|
||||||
|
|
||||||
/* spawn procs */
|
/* spawn procs */
|
||||||
rc = orte_plm.spawn(jdata);
|
rc = orte_plm.spawn(jdata);
|
||||||
OBJ_RELEASE(jdata);
|
OBJ_RELEASE(jdata);
|
||||||
|
@ -538,6 +538,8 @@ int orte_daemon(int argc, char *argv[])
|
|||||||
|
|
||||||
/* setup the singleton's job */
|
/* setup the singleton's job */
|
||||||
jdata = OBJ_NEW(orte_job_t);
|
jdata = OBJ_NEW(orte_job_t);
|
||||||
|
/* default to ompi for now */
|
||||||
|
jdata->personality = strdup("ompi");
|
||||||
orte_plm_base_create_jobid(jdata);
|
orte_plm_base_create_jobid(jdata);
|
||||||
ljob = ORTE_LOCAL_JOBID(jdata->jobid);
|
ljob = ORTE_LOCAL_JOBID(jdata->jobid);
|
||||||
opal_pointer_array_set_item(orte_job_data, ljob, jdata);
|
opal_pointer_array_set_item(orte_job_data, ljob, jdata);
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user