1
1
This commit was SVN r31680.
Этот коммит содержится в:
Ralph Castain 2014-05-08 02:26:45 +00:00
родитель 11faab1091
Коммит 76f5991ab2
2 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -1977,7 +1977,7 @@ static int init_one_device(opal_list_t *btl_list, struct ibv_device* ib_dev)
mca_btl_openib_component.receive_queues)) { mca_btl_openib_component.receive_queues)) {
opal_show_help("help-mpi-btl-openib.txt", opal_show_help("help-mpi-btl-openib.txt",
"locally conflicting receive_queues", true, "locally conflicting receive_queues", true,
opal_install_dirs.ompidatadir, opal_install_dirs.opaldatadir,
ompi_process_info.nodename, ompi_process_info.nodename,
ibv_get_device_name(receive_queues_device->ib_dev), ibv_get_device_name(receive_queues_device->ib_dev),
receive_queues_device->ib_dev_attr.vendor_id, receive_queues_device->ib_dev_attr.vendor_id,
@ -2001,7 +2001,7 @@ static int init_one_device(opal_list_t *btl_list, struct ibv_device* ib_dev)
mca_btl_openib_component.receive_queues_source) { mca_btl_openib_component.receive_queues_source) {
opal_show_help("help-mpi-btl-openib.txt", opal_show_help("help-mpi-btl-openib.txt",
"locally conflicting receive_queues", true, "locally conflicting receive_queues", true,
opal_install_dirs.ompidatadir, opal_install_dirs.opaldatadir,
ompi_process_info.nodename, ompi_process_info.nodename,
ibv_get_device_name(receive_queues_device->ib_dev), ibv_get_device_name(receive_queues_device->ib_dev),
receive_queues_device->ib_dev_attr.vendor_id, receive_queues_device->ib_dev_attr.vendor_id,

Просмотреть файл

@ -270,7 +270,7 @@ int btl_openib_register_mca_params(void)
OMPI_HAVE_IBV_FORK_INIT ? -1 : 0, &mca_btl_openib_component.want_fork_support, 0)); OMPI_HAVE_IBV_FORK_INIT ? -1 : 0, &mca_btl_openib_component.want_fork_support, 0));
asprintf(&str, "%s/mca-btl-openib-device-params.ini", asprintf(&str, "%s/mca-btl-openib-device-params.ini",
opal_install_dirs.ompidatadir); opal_install_dirs.opaldatadir);
if (NULL == str) { if (NULL == str) {
return OMPI_ERR_OUT_OF_RESOURCE; return OMPI_ERR_OUT_OF_RESOURCE;
} }