ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Properly use the OPAL_MCA_PREFIX in orte_submit

Просмотр исходного кода
Этот коммит содержится в:
Ralph Castain 2016-03-01 18:16:40 -08:00
родитель 1b81d90eaa
Коммит 06e811c5a6
1 изменённых файлов: 5 добавлений и 5 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
orte/orted/orted_submit.c
Просмотреть файл

@ -477,10 +477,10 @@ int orte_submit_init(int argc, char *argv[],
fclose(fp); fclose(fp);
input[strlen(input)-1] = '\0'; /* remove newline */ input[strlen(input)-1] = '\0'; /* remove newline */
/* construct the target hnp info */ /* construct the target hnp info */
opal_setenv("OMPI_MCA_orte_hnp_uri", input, true, &environ); opal_setenv(OPAL_MCA_PREFIX"orte_hnp_uri", input, true, &environ);
} else { } else {
/* should just be the uri itself - construct the target hnp info */ /* should just be the uri itself - construct the target hnp info */
opal_setenv("OMPI_MCA_orte_hnp_uri", orte_cmd_line.hnp, true, &environ); opal_setenv(OPAL_MCA_PREFIX"orte_hnp_uri", orte_cmd_line.hnp, true, &environ);
} }
/* Setup MCA params */ /* Setup MCA params */
@ -488,7 +488,7 @@ int orte_submit_init(int argc, char *argv[],
/* we are never allowed to operate as a distributed tool, /* we are never allowed to operate as a distributed tool,
* so insist on the ess/tool component */ * so insist on the ess/tool component */
opal_setenv("OMPI_MCA_ess", "tool", true, &environ); opal_setenv(OPAL_MCA_PREFIX"ess", "tool", true, &environ);
if (orte_cmd_line.debug) { if (orte_cmd_line.debug) {
orte_devel_level_output = true; orte_devel_level_output = true;
@ -513,7 +513,7 @@ int orte_submit_init(int argc, char *argv[],
/* clear the ess param from the environment so our children /* clear the ess param from the environment so our children
* don't pick it up */ * don't pick it up */
opal_unsetenv("OMPI_MCA_ess", &environ); opal_unsetenv(OPAL_MCA_PREFIX"ess", &environ);
/* set the info in our contact table */ /* set the info in our contact table */
orte_rml.set_contact_info(orte_process_info.my_hnp_uri); orte_rml.set_contact_info(orte_process_info.my_hnp_uri);
@ -1138,7 +1138,7 @@ static int create_app(int argc, char* argv[],
goto cleanup; goto cleanup;
} }
/* Grab all OMPI_* environment variables */ /* Grab all MCA environment variables */
app->env = opal_argv_copy(*app_env); app->env = opal_argv_copy(*app_env);
if (ORTE_SUCCESS != (rc = orte_schizo.parse_env(orte_cmd_line.personalities, if (ORTE_SUCCESS != (rc = orte_schizo.parse_env(orte_cmd_line.personalities,