Skip to content

btl/openib: correctly issue a warning when two btls or more are in th… #1362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 11, 2016
Merged

btl/openib: correctly issue a warning when two btls or more are in th… #1362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion opal/mca/btl/openib/btl_openib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* Copyright (c) 2009-2010 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013-2014 NVIDIA Corporation. All rights reserved.
* Copyright (c) 2014 Bull SAS. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science
* Copyright (c) 2015-2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
Expand Down Expand Up @@ -317,6 +317,7 @@ struct mca_btl_openib_component_t {
#if HAVE_DECL_IBV_LINK_LAYER_ETHERNET
bool rroce_enable;
#endif
unsigned int num_default_gid_btls; /* numbers of btl in the default subnet */
}; typedef struct mca_btl_openib_component_t mca_btl_openib_component_t;

OPAL_MODULE_DECLSPEC extern mca_btl_openib_component_t mca_btl_openib_component;
Expand Down
7 changes: 6 additions & 1 deletion opal/mca/btl/openib/btl_openib_component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ static int btl_openib_component_open(void)

/* initialize state */
mca_btl_openib_component.ib_num_btls = 0;
mca_btl_openib_component.num_default_gid_btls = 0;
mca_btl_openib_component.openib_btls = NULL;
OBJ_CONSTRUCT(&mca_btl_openib_component.devices, opal_pointer_array_t);
mca_btl_openib_component.devices_count = 0;
Expand Down Expand Up @@ -688,13 +689,17 @@ static int init_one_port(opal_list_t *btl_list, mca_btl_openib_device_t *device,
ibv_get_device_name(device->ib_dev), port_num, subnet_id));
#endif

if(mca_btl_openib_component.ib_num_btls > 0 &&
if(mca_btl_openib_component.num_default_gid_btls > 0 &&
IB_DEFAULT_GID_PREFIX == subnet_id &&
mca_btl_openib_component.warn_default_gid_prefix) {
opal_show_help("help-mpi-btl-openib.txt", "default subnet prefix",
true, opal_process_info.nodename);
}

if (IB_DEFAULT_GID_PREFIX == subnet_id) {
mca_btl_openib_component.num_default_gid_btls++;
}

lmc = (1 << ib_port_attr->lmc);
lmc_step = 1;

Expand Down