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

Fix AMCA orted command line.

Просмотр исходного кода 
If no AMCA parameters are passed then do not send across the path information. Only place it on the command line if the AMCA parameter is set.

This commit was SVN r18382.
Этот коммит содержится в:
Josh Hursey 2008-05-06 18:27:31 +00:00
родитель 9971bc9d95
Коммит c47406810e
1 изменённых файлов: 32 добавлений и 31 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

63
orte/mca/plm/base/plm_base_launch_support.c
Просмотреть файл

@ -765,42 +765,43 @@ int orte_plm_base_orted_append_basic_args(int *argc, char ***argv,
opal_argv_append(argc, argv, "-mca");
opal_argv_append(argc, argv, "mca_base_param_file_prefix");
opal_argv_append(argc, argv, amca_param_prefix);
}
/* Add the 'path' param */
loc_id = mca_base_param_find("mca", NULL, "base_param_file_path");
mca_base_param_lookup_string(loc_id, &amca_param_path);
if( NULL != amca_param_path ) {
/* Add the 'path' param */
loc_id = mca_base_param_find("mca", NULL, "base_param_file_path");
mca_base_param_lookup_string(loc_id, &amca_param_path);
if( NULL != amca_param_path ) {
opal_argv_append(argc, argv, "-mca");
opal_argv_append(argc, argv, "mca_base_param_file_path");
opal_argv_append(argc, argv, amca_param_path);
}
/* Add the 'path' param */
loc_id = mca_base_param_find("mca", NULL, "base_param_file_path_force");
mca_base_param_lookup_string(loc_id, &tmp_force);
if( NULL == tmp_force ) {
/* Get the current working directory */
tmp_force = (char *) malloc(sizeof(char) * OMPI_PATH_MAX);
if( NULL == (tmp_force = getcwd(tmp_force, OMPI_PATH_MAX) )) {
tmp_force = strdup("");
}
}
opal_argv_append(argc, argv, "-mca");
opal_argv_append(argc, argv, "mca_base_param_file_path");
opal_argv_append(argc, argv, amca_param_path);
}
opal_argv_append(argc, argv, "mca_base_param_file_path_force");
opal_argv_append(argc, argv, tmp_force);
/* Add the 'path' param */
loc_id = mca_base_param_find("mca", NULL, "base_param_file_path_force");
mca_base_param_lookup_string(loc_id, &tmp_force);
if( NULL == tmp_force ) {
/* Get the current working directory */
tmp_force = (char *) malloc(sizeof(char) * OMPI_PATH_MAX);
if( NULL == (tmp_force = getcwd(tmp_force, OMPI_PATH_MAX) )) {
tmp_force = strdup("");
free(tmp_force);
if( NULL != amca_param_path ) {
free(amca_param_path);
amca_param_path = NULL;
}
if( NULL != amca_param_prefix ) {
free(amca_param_prefix);
amca_param_prefix = NULL;
}
}
opal_argv_append(argc, argv, "-mca");
opal_argv_append(argc, argv, "mca_base_param_file_path_force");
opal_argv_append(argc, argv, tmp_force);
free(tmp_force);
if( NULL != amca_param_path ) {
free(amca_param_path);
amca_param_path = NULL;
}
if( NULL != amca_param_prefix ) {
free(amca_param_prefix);
amca_param_prefix = NULL;
}
return ORTE_SUCCESS;
}