Skip to content
This repository was archived by the owner on Sep 30, 2022. It is now read-only.

configury + btl/openib: fix a typo #1292

Merged
merged 3 commits into from
Aug 5, 2016
Merged

configury + btl/openib: fix a typo #1292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
345d105
configury + btl/openib: fix a typo
ggouaillardet Jul 21, 2016
5aaee1f
btl/openib: fix #if vs #ifdef
ggouaillardet May 23, 2016
f3149f2
opal: remove some unused variables / compiler warnings
jsquyres Mar 25, 2016
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
4 changes: 2 additions & 2 deletions config/opal_check_openfabrics.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Copyright (c) 2010-2012 Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2009-2012 Oak Ridge National Laboratory. All rights reserved.
# Copyright (c) 2014 Bull SAS. All rights reserved.
# Copyright (c) 2014-2015 Research Organization for Information Science
# Copyright (c) 2014-2016 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$
#
Expand Down Expand Up @@ -400,7 +400,7 @@ AC_DEFUN([OPAL_CHECK_EXP_VERBS],[
AC_DEFINE_UNQUOTED([HAVE_EXP_VERBS], [$have_struct_ibv_exp_send_wr], [Experimental verbs])
AC_CHECK_DECLS([IBV_EXP_ATOMIC_HCA_REPLY_BE, IBV_EXP_QP_CREATE_ATOMIC_BE_REPLY, ibv_exp_create_qp, ibv_exp_query_device, IBV_EXP_QP_INIT_ATTR_ATOMICS_ARG],
[], [], [#include <infiniband/verbs_exp.h>])
AC_CHECK_MEMBERS([struct ibv_exp_device_attr.ext_atom, struct ibv_exp_device_attr.ext_atomic_cap], [], [],
AC_CHECK_MEMBERS([struct ibv_exp_device_attr.ext_atom, struct ibv_exp_device_attr.exp_atomic_cap], [], [],
[[#include <infiniband/verbs_exp.h>]])
AS_IF([test '$have_struct_ibv_exp_send_wr' = 1], [$1], [$2])
OPAL_VAR_SCOPE_POP
Expand Down
7 changes: 3 additions & 4 deletions 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 @@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2006-2015 Mellanox Technologies. All rights reserved.
* Copyright (c) 2006-2015 Los Alamos National Security, LLC. All rights
* reserved.
Expand Down Expand Up @@ -780,7 +780,7 @@ static int init_one_port(opal_list_t *btl_list, mca_btl_openib_device_t *device,
#if HAVE_DECL_IBV_ATOMIC_HCA
openib_btl->atomic_ops_be = false;

#if HAVE_STRUCT_IBV_EXP_DEVICE_ATTR_EXT_ATOM
#ifdef HAVE_STRUCT_IBV_EXP_DEVICE_ATTR_EXT_ATOM
/* check that 8-byte atomics are supported */
if (!(device->ib_exp_dev_attr.ext_atom.log_atomic_arg_sizes & (1<<3ull))) {
openib_btl->super.btl_flags &= ~MCA_BTL_FLAGS_ATOMIC_FOPS;
Expand All @@ -790,7 +790,7 @@ static int init_one_port(opal_list_t *btl_list, mca_btl_openib_device_t *device,
}
#endif

#if HAVE_STRUCT_IBV_EXP_DEVICE_ATTR_EXT_ATOMIC_CAP
#ifdef HAVE_STRUCT_IBV_EXP_DEVICE_ATTR_EXP_ATOMIC_CAP
switch (openib_btl->device->ib_exp_dev_attr.exp_atomic_cap)
#else
switch (openib_btl->device->ib_dev_attr.atomic_cap)
Expand Down Expand Up @@ -2125,7 +2125,6 @@ static int init_one_device(opal_list_t *btl_list, struct ibv_device* ib_dev)
{
/* we need to read this MCA param at this point in case someone
* altered it via MPI_T */
int index;
mca_base_var_source_t source;

if (OPAL_SUCCESS != (ret = get_var_source ("receive_queues", &source))) {
Expand Down