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

Use the HAVE_DECL_IBV_LINK_LAYER_ETHERNET macro.

Просмотр исходного кода 
Commit r27211 added ifdef checks for #define
HAVE_IBV_LINK_LAYER_ETHERNET, which is incorrect.  The correct #define
is HAVE_DECL_IBV_LINK_LAYER_ETHERNET.  This broke OMPI over iWARP.

This fixes trac:3726 and should be added to cmr:v1.7.3:reviewer=jsquyres

This commit was SVN r29053.

The following SVN revision numbers were found above:
  r27211 --> open-mpi/ompi@b27862e5c7

The following Trac tickets were found above:
  Ticket 3726 --> https://svn.open-mpi.org/trac/ompi/ticket/3726
Этот коммит содержится в:
Steve Wise 2013-08-20 20:00:46 +00:00
родитель 45e695928f
Коммит 67fe3f23ed
5 изменённых файлов: 6 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
ompi/mca/btl/openib/btl_openib.c
Просмотреть файл

@ -445,7 +445,7 @@ mca_btl_openib_transport_type_t mca_btl_openib_get_transport_type(mca_btl_openib
#ifdef HAVE_STRUCT_IBV_DEVICE_TRANSPORT_TYPE
switch(openib_btl->device->ib_dev->transport_type) {
case IBV_TRANSPORT_IB:
#if defined(HAVE_IBV_LINK_LAYER_ETHERNET)
#if defined(HAVE_DECL_IBV_LINK_LAYER_ETHERNET)
switch(openib_btl->ib_port_attr.link_layer) {
case IBV_LINK_LAYER_ETHERNET:
return MCA_BTL_OPENIB_TRANSPORT_RDMAOE;

2
ompi/mca/btl/openib/btl_openib_component.c
Просмотреть файл

@ -718,7 +718,7 @@ static int init_one_port(opal_list_t *btl_list, mca_btl_openib_device_t *device,
return OMPI_ERR_NOT_FOUND;
}
#if defined(HAVE_IBV_LINK_LAYER_ETHERNET)
#if defined(HAVE_DECL_IBV_LINK_LAYER_ETHERNET)
if (IBV_LINK_LAYER_ETHERNET == ib_port_attr->link_layer) {
subnet_id = mca_btl_openib_get_ip_subnet_id(device->ib_dev,
port_num);

2
ompi/mca/btl/openib/connect/btl_openib_connect_oob.c
Просмотреть файл

@ -127,7 +127,7 @@ static int oob_component_query(mca_btl_openib_module_t *btl,
IB (this CPC will not work with iWarp). If we do not have the
transport_type member, then we must be < OFED v1.2, and
therefore we must be IB. */
#if defined(HAVE_STRUCT_IBV_DEVICE_TRANSPORT_TYPE) && defined(HAVE_IBV_LINK_LAYER_ETHERNET)
#if defined(HAVE_STRUCT_IBV_DEVICE_TRANSPORT_TYPE) && defined(HAVE_DECL_IBV_LINK_LAYER_ETHERNET)
if (BTL_OPENIB_CONNECT_BASE_CHECK_IF_NOT_IB(btl)) {
opal_output_verbose(5, ompi_btl_base_framework.framework_output,
"openib BTL: oob CPC only supported on InfiniBand; skipped on %s:%d",

2
ompi/mca/btl/openib/connect/btl_openib_connect_udcm.c
Просмотреть файл

@ -389,7 +389,7 @@ static int udcm_component_query(mca_btl_openib_module_t *btl,
/* If we do not have struct ibv_device.transport_device, then
we're in an old version of OFED that is IB only (i.e., no
iWarp), so we can safely assume that we can use this CPC. */
#if defined(HAVE_STRUCT_IBV_DEVICE_TRANSPORT_TYPE) && defined(HAVE_IBV_LINK_LAYER_ETHERNET)
#if defined(HAVE_STRUCT_IBV_DEVICE_TRANSPORT_TYPE) && defined(HAVE_DECL_IBV_LINK_LAYER_ETHERNET)
if (BTL_OPENIB_CONNECT_BASE_CHECK_IF_NOT_IB(btl)) {
BTL_VERBOSE(("UD CPC only supported on InfiniBand; skipped on %s:%d",
ibv_get_device_name(btl->device->ib_dev),

4
ompi/mca/common/verbs/common_verbs_find_ports.c
Просмотреть файл

@ -170,7 +170,7 @@ static const char *transport_name_to_str(enum ibv_transport_type transport_type)
}
}
#if defined(HAVE_IBV_LINK_LAYER_ETHERNET)
#if defined(HAVE_DECL_IBV_LINK_LAYER_ETHERNET)
static const char *link_layer_to_str(int link_type)
{
switch(link_type) {
@ -417,7 +417,7 @@ opal_list_t *ompi_common_verbs_find_ports(const char *if_include,
/* If they specified neither link layer, then we want this port */
want = true;
}
#if defined(HAVE_IBV_LINK_LAYER_ETHERNET)
#if defined(HAVE_DECL_IBV_LINK_LAYER_ETHERNET)
else if (flags & OMPI_COMMON_VERBS_FLAGS_LINK_LAYER_IB) {
if (IBV_LINK_LAYER_INFINIBAND == port_attr.link_layer) {
want = true;