Use semicolon as the separator for Windows, as colon is normally part of the windows path.
This commit was SVN r23411.
Этот коммит содержится в:
родитель
13b26095cc
Коммит
5b37e2922c
@ -107,9 +107,17 @@ int ompi_btl_openib_ini_init(void)
|
|||||||
int ret = OMPI_ERR_NOT_FOUND;
|
int ret = OMPI_ERR_NOT_FOUND;
|
||||||
char *colon;
|
char *colon;
|
||||||
|
|
||||||
|
#ifndef __WINDOWS__
|
||||||
|
char separator = ':';
|
||||||
|
#else
|
||||||
|
/* ':' is part of the path on Windows,
|
||||||
|
so use ';' instead. */
|
||||||
|
char separator = ';';
|
||||||
|
#endif
|
||||||
|
|
||||||
OBJ_CONSTRUCT(&devices, opal_list_t);
|
OBJ_CONSTRUCT(&devices, opal_list_t);
|
||||||
|
|
||||||
colon = strchr(mca_btl_openib_component.device_params_file_names, ':');
|
colon = strchr(mca_btl_openib_component.device_params_file_names, separator);
|
||||||
if (NULL == colon) {
|
if (NULL == colon) {
|
||||||
/* If we've only got 1 file (i.e., no colons found), parse it
|
/* If we've only got 1 file (i.e., no colons found), parse it
|
||||||
and be done */
|
and be done */
|
||||||
|
@ -189,7 +189,7 @@ int btl_openib_register_mca_params(void)
|
|||||||
return OMPI_ERR_OUT_OF_RESOURCE;
|
return OMPI_ERR_OUT_OF_RESOURCE;
|
||||||
}
|
}
|
||||||
CHECK(reg_string("device_param_files", "hca_param_files",
|
CHECK(reg_string("device_param_files", "hca_param_files",
|
||||||
"Colon-delimited list of INI-style files that contain device vendor/part-specific parameters",
|
"Colon-delimited list of INI-style files that contain device vendor/part-specific parameters (use semicolon for Windows)",
|
||||||
str, &mca_btl_openib_component.device_params_file_names,
|
str, &mca_btl_openib_component.device_params_file_names,
|
||||||
0));
|
0));
|
||||||
free(str);
|
free(str);
|
||||||
|
Загрузка…
Ссылка в новой задаче
Block a user