Surround use of want_fork_support structure field with ifdef instead of c conditional.
This commit was SVN r21526.
Этот коммит содержится в:
родитель
626799ee0f
Коммит
efac1b73fb
@ -14,6 +14,7 @@
|
|||||||
* Copyright (c) 2006-2007 Los Alamos National Security, LLC. All rights
|
* Copyright (c) 2006-2007 Los Alamos National Security, LLC. All rights
|
||||||
* reserved.
|
* reserved.
|
||||||
* Copyright (c) 2006-2007 Voltaire All rights reserved.
|
* Copyright (c) 2006-2007 Voltaire All rights reserved.
|
||||||
|
* Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
|
||||||
* $COPYRIGHT$
|
* $COPYRIGHT$
|
||||||
*
|
*
|
||||||
* Additional copyrights may follow
|
* Additional copyrights may follow
|
||||||
@ -171,16 +172,16 @@ int btl_openib_register_mca_params(void)
|
|||||||
"Whether fork support is desired or not "
|
"Whether fork support is desired or not "
|
||||||
"(negative = try to enable fork support, but continue even if it is not available, 0 = do not enable fork support, positive = try to enable fork support and fail if it is not available)",
|
"(negative = try to enable fork support, but continue even if it is not available, 0 = do not enable fork support, positive = try to enable fork support and fail if it is not available)",
|
||||||
ival2, &ival, 0));
|
ival2, &ival, 0));
|
||||||
if (OMPI_HAVE_IBV_FORK_INIT) {
|
#ifdef HAVE_IBV_FORT_INIT
|
||||||
mca_btl_openib_component.want_fork_support = ival;
|
mca_btl_openib_component.want_fork_support = ival;
|
||||||
} else {
|
#else
|
||||||
if (0 != ival) {
|
if (0 != ival) {
|
||||||
orte_show_help("help-mpi-btl-openib.txt",
|
orte_show_help("help-mpi-btl-openib.txt",
|
||||||
"ibv_fork requested but not supported", true,
|
"ibv_fork requested but not supported", true,
|
||||||
orte_process_info.nodename);
|
orte_process_info.nodename);
|
||||||
return OMPI_ERROR;
|
return OMPI_ERROR;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
asprintf(&str, "%s/mca-btl-openib-device-params.ini",
|
asprintf(&str, "%s/mca-btl-openib-device-params.ini",
|
||||||
opal_install_dirs.pkgdatadir);
|
opal_install_dirs.pkgdatadir);
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user