m4: remove all configury related to libibverbs
Now that all components that use libibverbs are gone, remove OPAL_CHECK_VERBS and the confusingly-named OPAL_CHECK_OPENFABRICS (which really just checked for verbs things -- not all the possible OpenFabrics APIs/libraries). The only code left in Open MPI that calls verbs is hwloc -- and that's just the APIs that takes an IBV device and returns topological information about it. Since nothing in the Open MPI code base uses the "ibv_*" API any more, we have no need for this hwloc functionality so we'll even remove the --with-verbs configure options. Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
Этот коммит содержится в:
Jeff Squyres
родитель
3f4af8e51c
Коммит
59c8ab6da4
@ -1,485 +0,0 @@
|
||||
# -*- shell-script -*-
|
||||
#
|
||||
# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
# University Research and Technology
|
||||
# Corporation. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
# of Tennessee Research Foundation. All rights
|
||||
# reserved.
|
||||
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
# University of Stuttgart. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved.
|
||||
# Copyright (c) 2006-2017 Los Alamos National Security, LLC. All rights
|
||||
# reserved.
|
||||
# Copyright (c) 2006-2009 Mellanox Technologies. All rights reserved.
|
||||
# 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-2016 Research Organization for Information Science
|
||||
# and Technology (RIST). All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
#
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
# OPAL_CHECK_OPENFABRICS(prefix, [action-if-found], [action-if-not-found])
|
||||
# --------------------------------------------------------
|
||||
# check if OPENIB support can be found. sets prefix_{CPPFLAGS,
|
||||
# LDFLAGS, LIBS} as needed and runs action-if-found if there is
|
||||
# support, otherwise executes action-if-not-found
|
||||
AC_DEFUN([OPAL_CHECK_OPENFABRICS],[
|
||||
OPAL_VAR_SCOPE_PUSH([$1_msg])
|
||||
|
||||
# Setup the --with switches to allow users to specify where
|
||||
# verbs stuff lives.
|
||||
AC_REQUIRE([OPAL_CHECK_VERBS_DIR])
|
||||
|
||||
if test -z "$opal_check_openib_happy" ; then
|
||||
#
|
||||
# Add padding to OpenIB header
|
||||
#
|
||||
AC_ARG_ENABLE([openib-control-hdr-padding],
|
||||
[AC_HELP_STRING([--enable-openib-control-hdr-padding],
|
||||
[Add padding bytes to the openib BTL control header (default:disabled)])])
|
||||
AC_MSG_CHECKING([if want to add padding to the openib BTL control header])
|
||||
if test "$enable_openib_control_hdr_padding" = "yes"; then
|
||||
AC_MSG_RESULT([yes])
|
||||
ompi_openib_pad_hdr=1
|
||||
elif test "$enable_openib_control_hdr_padding" = "no"; then
|
||||
AC_MSG_RESULT([no])
|
||||
ompi_openib_pad_hdr=0
|
||||
else
|
||||
#
|
||||
# Enable padding for SPARC platforms by default because the
|
||||
# btl will segv otherwise. Keep padding disabled for other
|
||||
# platforms since there are some performance implications with
|
||||
# padding on for those platforms.
|
||||
#
|
||||
case "${host}" in
|
||||
sparc*)
|
||||
AC_MSG_RESULT([yes (enabled by default on SPARC)])
|
||||
ompi_openib_pad_hdr=1
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT([no])
|
||||
ompi_openib_pad_hdr=0
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED([OPAL_OPENIB_PAD_HDR], [$ompi_openib_pad_hdr],
|
||||
[Add padding bytes to the openib BTL control header])
|
||||
|
||||
AS_IF([test "$opal_want_verbs" = "no"],
|
||||
[opal_check_openib_happy="no"],
|
||||
[opal_check_openib_happy="yes"])
|
||||
|
||||
ompi_check_openib_$1_save_CPPFLAGS="$CPPFLAGS"
|
||||
ompi_check_openib_$1_save_LDFLAGS="$LDFLAGS"
|
||||
ompi_check_openib_$1_save_LIBS="$LIBS"
|
||||
|
||||
AS_IF([test "$opal_check_openib_happy" = "yes"],
|
||||
[AC_CHECK_HEADERS(
|
||||
fcntl.h sys/poll.h,
|
||||
[],
|
||||
[AC_MSG_WARN([fcntl.h sys/poll.h not found. Can not build component.])
|
||||
opal_check_openib_happy="no"])])
|
||||
|
||||
AS_IF([test "$opal_check_openib_happy" = "yes"],
|
||||
[OPAL_CHECK_PACKAGE([opal_check_openib],
|
||||
[infiniband/verbs.h],
|
||||
[ibverbs],
|
||||
[ibv_open_device],
|
||||
[],
|
||||
[$opal_verbs_dir],
|
||||
[$opal_verbs_libdir],
|
||||
[opal_check_openib_happy="yes"],
|
||||
[opal_check_openib_happy="no"])])
|
||||
|
||||
CPPFLAGS="$CPPFLAGS $opal_check_openib_CPPFLAGS"
|
||||
LDFLAGS="$LDFLAGS $opal_check_openib_LDFLAGS"
|
||||
LIBS="$LIBS $opal_check_openib_LIBS"
|
||||
|
||||
AS_IF([test "$opal_check_openib_happy" = "yes"],
|
||||
[AC_CACHE_CHECK(
|
||||
[number of arguments to ibv_create_cq],
|
||||
[ompi_cv_func_ibv_create_cq_args],
|
||||
[AC_LINK_IFELSE(
|
||||
[AC_LANG_PROGRAM(
|
||||
[[#include <infiniband/verbs.h> ]],
|
||||
[[ibv_create_cq(NULL, 0, NULL, NULL, 0);]])],
|
||||
[ompi_cv_func_ibv_create_cq_args=5],
|
||||
[AC_LINK_IFELSE(
|
||||
[AC_LANG_PROGRAM(
|
||||
[[#include <infiniband/verbs.h> ]],
|
||||
[[ibv_create_cq(NULL, 0, NULL);]])],
|
||||
[ompi_cv_func_ibv_create_cq_args=3],
|
||||
[ompi_cv_func_ibv_create_cq_args="unknown"])])])
|
||||
AS_IF([test "$ompi_cv_func_ibv_create_cq_args" = "unknown"],
|
||||
[AC_MSG_WARN([Can not determine number of args to ibv_create_cq.])
|
||||
AC_MSG_WARN([Not building component.])
|
||||
opal_check_openib_happy="no"],
|
||||
[AC_DEFINE_UNQUOTED([OPAL_IBV_CREATE_CQ_ARGS],
|
||||
[$ompi_cv_func_ibv_create_cq_args],
|
||||
[Number of arguments to ibv_create_cq])])])
|
||||
|
||||
#
|
||||
# OpenIB dynamic SL
|
||||
#
|
||||
AC_ARG_ENABLE([openib-dynamic-sl],
|
||||
[AC_HELP_STRING([--enable-openib-dynamic-sl],
|
||||
[Enable openib BTL to query Subnet Manager for IB SL (default: enabled)])])
|
||||
|
||||
# Set these up so that we can do an AC_DEFINE below
|
||||
# (unconditionally)
|
||||
opal_check_openib_have_xrc=0
|
||||
opal_check_openib_have_xrc_domains=0
|
||||
opal_check_openib_have_opensm_devel=0
|
||||
|
||||
# If we have the openib stuff available, find out what we've got
|
||||
AS_IF([test "$opal_check_openib_happy" = "yes"],
|
||||
[AC_CHECK_DECLS([IBV_EVENT_CLIENT_REREGISTER, IBV_ACCESS_SO, IBV_ATOMIC_HCA], [], [],
|
||||
[#include <infiniband/verbs.h>])
|
||||
AC_CHECK_FUNCS([ibv_get_device_list ibv_resize_cq])
|
||||
|
||||
# struct ibv_device.transport_type was added in OFED v1.2
|
||||
AC_CHECK_MEMBERS([struct ibv_device.transport_type], [], [],
|
||||
[#include <infiniband/verbs.h>])
|
||||
|
||||
# We have to check functions both exits *and* are declared
|
||||
# since some distro ship broken ibverbs devel headers
|
||||
# IBV_DEVICE_XRC is common to all OFED versions
|
||||
# ibv_create_xrc_rcv_qp was added in OFED 1.3
|
||||
# ibv_cmd_open_xrcd (aka XRC Domains) was added in OFED 3.12
|
||||
if test "$enable_connectx_xrc" = "yes"; then
|
||||
AC_CHECK_DECLS([IBV_DEVICE_XRC],
|
||||
[opal_check_openib_have_xrc=1
|
||||
opal_check_openib_have_xrc_domains=1],
|
||||
[],
|
||||
[#include <infiniband/verbs.h>])
|
||||
fi
|
||||
if test "$enable_connectx_xrc" = "yes" \
|
||||
&& test $opal_check_openib_have_xrc -eq 1; then
|
||||
AC_CHECK_DECLS([ibv_create_xrc_rcv_qp],
|
||||
[AC_CHECK_FUNCS([ibv_create_xrc_rcv_qp],
|
||||
[], [opal_check_openib_have_xrc=0])],
|
||||
[opal_check_openib_have_xrc=0],
|
||||
[#include <infiniband/driver.h>])
|
||||
fi
|
||||
if test "$enable_connectx_xrc" = "yes" \
|
||||
&& test $opal_check_openib_have_xrc_domains -eq 1; then
|
||||
AC_CHECK_DECLS([ibv_cmd_open_xrcd],
|
||||
[AC_CHECK_DECLS([IBV_SRQT_XRC],
|
||||
[AC_CHECK_FUNCS([ibv_cmd_open_xrcd],
|
||||
[], [opal_check_openib_have_xrc_domains=0])],
|
||||
[opal_check_openib_have_xrc_domains=0],
|
||||
[#include <infiniband/verbs.h>])],
|
||||
[opal_check_openib_have_xrc_domains=0],
|
||||
[#include <infiniband/driver.h>])
|
||||
# XRC and XRC Domains should be considered as exclusive
|
||||
if test "$opal_check_openib_have_xrc" -eq 1 && \
|
||||
test "$opal_check_openib_have_xrc_domains" -eq 1; then
|
||||
opal_check_openib_have_xrc=0
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "no" != "$enable_openib_dynamic_sl"; then
|
||||
# We need ib_types.h file, which is installed with opensm-devel
|
||||
# package. However, ib_types.h has a bad include directive,
|
||||
# which will cause AC_CHECK_HEADER to fail.
|
||||
# So instead, we will look for another file that is also
|
||||
# installed as part of opensm-devel package and included in
|
||||
# ib_types.h, but it doesn't include any other IB-related files.
|
||||
AC_CHECK_HEADER([infiniband/complib/cl_types_osd.h],
|
||||
[AC_CHECK_LIB([osmcomp], [cl_map_init],
|
||||
[opal_check_openib_have_opensm_devel=1],[])],
|
||||
[],
|
||||
[])
|
||||
# Abort if dynamic SL support was explicitly requested but opensm-devel
|
||||
# package wasn't found. Otherwise, OMPI will be built w/o dynamic SL.
|
||||
AC_MSG_CHECKING([if can use dynamic SL support])
|
||||
AS_IF([test "$opal_check_openib_have_opensm_devel" = "1"],
|
||||
[AC_MSG_RESULT([yes])],
|
||||
[AC_MSG_RESULT([no])
|
||||
AS_IF([test "$enable_openib_dynamic_sl" = "yes"],
|
||||
[AC_MSG_WARN([--enable-openib-dynamic-sl was specified but the])
|
||||
AC_MSG_WARN([appropriate header/library files could not be found])
|
||||
AC_MSG_WARN([Please install opensm-devel if you need dynamic SL support])
|
||||
AC_MSG_ERROR([Cannot continue])])])
|
||||
fi
|
||||
|
||||
|
||||
# Check support for RDMAoE devices
|
||||
$1_have_rdmaoe=0
|
||||
AC_CHECK_DECLS([IBV_LINK_LAYER_ETHERNET],
|
||||
[$1_have_rdmaoe=1], [],
|
||||
[#include <infiniband/verbs.h>])
|
||||
|
||||
AC_MSG_CHECKING([if RDMAoE support is enabled])
|
||||
AC_DEFINE_UNQUOTED([OPAL_HAVE_RDMAOE], [$$1_have_rdmaoe], [Enable RDMAoE support])
|
||||
if test "1" = "$$1_have_rdmaoe"; then
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
# Check to see if <infiniband/driver.h> works. It is known to
|
||||
# create problems on some platforms with some compilers (e.g.,
|
||||
# RHEL4U3 with the PGI 32 bit compiler). Use undocumented (in AC
|
||||
# 2.63) feature of AC_CHECK_HEADERS: if you explicitly pass in
|
||||
# AC_INCLUDES_DEFAULT as the 4th arg to AC_CHECK_HEADERS, the test
|
||||
# will fail if the header is present but not compilable, *but it
|
||||
# will not print the big scary warning*. See
|
||||
# http://lists.gnu.org/archive/html/autoconf/2008-10/msg00143.html.
|
||||
AS_IF([test "$opal_check_openib_happy" = "yes"],
|
||||
[AC_CHECK_HEADERS([infiniband/driver.h], [], [],
|
||||
[AC_INCLUDES_DEFAULT])])
|
||||
|
||||
AC_MSG_CHECKING([if ConnectX XRC support is enabled])
|
||||
AC_DEFINE_UNQUOTED([OPAL_HAVE_CONNECTX_XRC], [$opal_check_openib_have_xrc],
|
||||
[Enable features required for ConnectX XRC support])
|
||||
if test "1" = "$opal_check_openib_have_xrc"; then
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([if ConnectIB XRC support is enabled])
|
||||
AC_DEFINE_UNQUOTED([OPAL_HAVE_CONNECTX_XRC_DOMAINS], [$opal_check_openib_have_xrc_domains],
|
||||
[Enable features required for XRC domains support])
|
||||
if test "1" = "$opal_check_openib_have_xrc_domains"; then
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([if dynamic SL is enabled])
|
||||
AC_DEFINE_UNQUOTED([OPAL_ENABLE_DYNAMIC_SL], [$opal_check_openib_have_opensm_devel],
|
||||
[Enable features required for dynamic SL support])
|
||||
if test "1" = "$opal_check_openib_have_opensm_devel"; then
|
||||
AC_MSG_RESULT([yes])
|
||||
$1_LIBS="-losmcomp $$1_LIBS"
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
|
||||
AS_IF([test -z "$opal_verbs_dir"],
|
||||
[openib_include_dir="/usr/include"],
|
||||
[openib_include_dir="$opal_verbs_dir/include"])
|
||||
opal_check_openib_CPPFLAGS="$opal_check_openib_CPPFLAGS -I$openib_include_dir/infiniband"
|
||||
|
||||
CPPFLAGS="$ompi_check_openib_$1_save_CPPFLAGS"
|
||||
LDFLAGS="$ompi_check_openib_$1_save_LDFLAGS"
|
||||
LIBS="$ompi_check_openib_$1_save_LIBS"
|
||||
|
||||
OPAL_SUMMARY_ADD([[Transports]],[[OpenFabrics Verbs]],[$1],[$opal_check_openib_happy])
|
||||
|
||||
OPAL_VAR_SCOPE_POP
|
||||
fi
|
||||
|
||||
$1_have_xrc=$opal_check_openib_have_xrc
|
||||
$1_have_xrc_domains=$opal_check_openib_have_xrc_domains
|
||||
$1_have_opensm_devel=$opal_check_openib_have_opensm_devel
|
||||
|
||||
AS_IF([test "$opal_check_openib_happy" = "yes"],
|
||||
[$1_CPPFLAGS="[$]$1_CPPFLAGS $opal_check_openib_CPPFLAGS"
|
||||
$1_LDFLAGS="[$]$1_LDFLAGS $opal_check_openib_LDFLAGS"
|
||||
$1_LIBS="[$]$1_LIBS $opal_check_openib_LIBS"
|
||||
$2],
|
||||
[AS_IF([test "$opal_want_verbs" = "yes"],
|
||||
[AC_MSG_WARN([Verbs support requested (via --with-verbs) but not found.])
|
||||
AC_MSG_WARN([If you are using libibverbs v1.0 (i.e., OFED v1.0 or v1.1), you *MUST* have both the libsysfs headers and libraries installed. Later versions of libibverbs do not require libsysfs.])
|
||||
AC_MSG_ERROR([Aborting.])])
|
||||
$3])
|
||||
|
||||
])
|
||||
|
||||
AC_DEFUN([OPAL_CHECK_OPENFABRICS_CM_ARGS],[
|
||||
#
|
||||
# ConnectX XRC support - disabled see issue #3890
|
||||
#
|
||||
dnl AC_ARG_ENABLE([openib-connectx-xrc],
|
||||
dnl [AC_HELP_STRING([--enable-openib-connectx-xrc],
|
||||
dnl [Enable ConnectX XRC support in the openib BTL. (default: disabled)])],
|
||||
dnl [enable_connectx_xrc="$enableval"], [enable_connectx_xrc="no"])
|
||||
enable_connectx_xrc="no"
|
||||
#
|
||||
# Unconnect Datagram (UD) based connection manager
|
||||
#
|
||||
AC_ARG_ENABLE([openib-udcm],
|
||||
[AC_HELP_STRING([--enable-openib-udcm],
|
||||
[Enable datagram connection support in openib BTL (default: enabled)])],
|
||||
[enable_openib_udcm="$enableval"], [enable_openib_udcm="yes"])
|
||||
# Per discussion with Ralph and Nathan, disable UDCM for now.
|
||||
# It's borked and needs some surgery to get back on its feet.
|
||||
# enable_openib_udcm=no
|
||||
|
||||
#
|
||||
# Openfabrics RDMACM
|
||||
#
|
||||
AC_ARG_ENABLE([openib-rdmacm],
|
||||
[AC_HELP_STRING([--enable-openib-rdmacm],
|
||||
[Enable Open Fabrics RDMACM support in openib BTL (default: enabled)])])
|
||||
AC_ARG_ENABLE([openib-rdmacm-ibaddr],
|
||||
[AC_HELP_STRING([--enable-openib-rdmacm-ibaddr],
|
||||
[Enable Open Fabrics RDMACM with IB addressing support in openib BTL (default: disabled)])],
|
||||
[enable_openib_rdmacm=yes])
|
||||
])dnl
|
||||
|
||||
AC_DEFUN([OPAL_CHECK_OPENFABRICS_CM],[
|
||||
AC_REQUIRE([OPAL_CHECK_OPENFABRICS_CM_ARGS])
|
||||
$1_have_udcm=0
|
||||
$1_have_rdmacm=0
|
||||
|
||||
ompi_check_openib_$1_save_CPPFLAGS="$CPPFLAGS"
|
||||
ompi_check_openib_$1_save_LDFLAGS="$LDFLAGS"
|
||||
ompi_check_openib_$1_save_LIBS="$LIBS"
|
||||
|
||||
# add back in all the InfiniBand flags so that these tests might work...
|
||||
CPPFLAGS="$CPPFLAGS $$1_CPPFLAGS"
|
||||
LDFLAGS="$LDFLAGS $$1_LDFLAGS"
|
||||
LIBS="$LIBS $$1_LIBS"
|
||||
|
||||
AS_IF([test "$opal_check_openib_happy" = "yes"],
|
||||
[# Do we have a recent enough RDMA CM? Need to have the
|
||||
# rdma_get_peer_addr (inline) function (originally appeared
|
||||
# in OFED v1.3).
|
||||
if test "$enable_openib_rdmacm" != "no"; then
|
||||
AC_CHECK_HEADERS([rdma/rdma_cma.h],
|
||||
[AC_CHECK_LIB([rdmacm], [rdma_create_id],
|
||||
[AC_MSG_CHECKING([for rdma_get_peer_addr])
|
||||
$1_msg=no
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "rdma/rdma_cma.h"
|
||||
]], [[void *ret = (void*) rdma_get_peer_addr((struct rdma_cm_id*)0);]])],
|
||||
[$1_have_rdmacm=1
|
||||
$1_msg=yes])
|
||||
AC_MSG_RESULT([$$1_msg])])])
|
||||
|
||||
if test "1" = "$$1_have_rdmacm"; then
|
||||
$1_LIBS="-lrdmacm $$1_LIBS"
|
||||
else
|
||||
AS_IF([test "$enable_openib_rdmacm" = "yes"],
|
||||
[AC_MSG_WARN([--enable-openib-rdmacm was specified but the])
|
||||
AC_MSG_WARN([appropriate files could not be found])
|
||||
AC_MSG_WARN([Please install librdmacm and librdmacm-devel or disable rdmacm support])
|
||||
AC_MSG_ERROR([Cannot continue])])
|
||||
fi
|
||||
fi
|
||||
|
||||
# is udcm enabled
|
||||
if test "$enable_openib_udcm" = "yes"; then
|
||||
$1_have_udcm=1
|
||||
fi
|
||||
])
|
||||
|
||||
CPPFLAGS="$ompi_check_openib_$1_save_CPPFLAGS"
|
||||
LDFLAGS="$ompi_check_openib_$1_save_LDFLAGS"
|
||||
LIBS="$ompi_check_openib_$1_save_LIBS"
|
||||
|
||||
AC_MSG_CHECKING([if UD CM is enabled])
|
||||
AC_DEFINE_UNQUOTED([OPAL_HAVE_UDCM], [$$1_have_udcm],
|
||||
[Whether UD CM is available or not])
|
||||
if test "1" = "$$1_have_udcm"; then
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([if OpenFabrics RDMACM support is enabled])
|
||||
AC_DEFINE_UNQUOTED([OPAL_HAVE_RDMACM], [$$1_have_rdmacm],
|
||||
[Whether RDMA CM is available or not])
|
||||
if test "1" = "$$1_have_rdmacm"; then
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
])dnl
|
||||
|
||||
AC_DEFUN([OPAL_CHECK_EXP_VERBS],[
|
||||
OPAL_VAR_SCOPE_PUSH([have_struct_ibv_exp_send_wr])
|
||||
|
||||
AC_MSG_CHECKING([whether expanded verbs are available])
|
||||
AC_TRY_COMPILE([#include <infiniband/verbs_exp.h>], [struct ibv_exp_send_wr;],
|
||||
[have_struct_ibv_exp_send_wr=1
|
||||
AC_MSG_RESULT([yes])],
|
||||
[have_struct_ibv_exp_send_wr=0
|
||||
AC_MSG_RESULT([no])])
|
||||
|
||||
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.exp_atomic_cap], [], [],
|
||||
[[#include <infiniband/verbs_exp.h>]])
|
||||
AS_IF([test '$have_struct_ibv_exp_send_wr' = 1], [$1], [$2])
|
||||
OPAL_VAR_SCOPE_POP
|
||||
])dnl
|
||||
|
||||
AC_DEFUN([OPAL_CHECK_MLNX_OPENFABRICS],[
|
||||
$1_have_mverbs=0
|
||||
$1_have_mqe=0
|
||||
|
||||
AS_IF([test "$opal_check_openib_happy" = "yes"],
|
||||
[OPAL_CHECK_PACKAGE([$1],
|
||||
[infiniband/mverbs.h],
|
||||
[mverbs],
|
||||
[ibv_m_query_device],
|
||||
["$$1_LIBS"],
|
||||
[$opal_verbs_dir],
|
||||
[$opal_verbs_libdir],
|
||||
[$1_have_mverbs=1],
|
||||
[])])
|
||||
|
||||
AS_IF([test "$opal_check_openib_happy" = "yes"],
|
||||
[OPAL_CHECK_PACKAGE([$1],
|
||||
[infiniband/mqe.h],
|
||||
[mqe],
|
||||
[mqe_context_create],
|
||||
["$$1_LIBS"],
|
||||
[$opal_verbs_dir],
|
||||
[$opal_verbs_libdir],
|
||||
[$1_have_mqe=1],
|
||||
[])])
|
||||
|
||||
AC_MSG_CHECKING([if Mellanox OpenFabrics VERBS is enabled])
|
||||
AC_DEFINE_UNQUOTED([OPAL_HAVE_MVERBS], [$$1_have_mverbs],
|
||||
[Whether MVERBS is available or not])
|
||||
AS_IF([test "1" = "$$1_have_mverbs"],
|
||||
[AC_MSG_RESULT([yes])],
|
||||
[AC_MSG_RESULT([no])])
|
||||
|
||||
# save the CPPFLAGS since we would have to update it for next test
|
||||
ompi_check_mellanox_openfabrics_$1_save_CPPFLAGS="$CPPFLAGS"
|
||||
|
||||
# If openfabrics custom directory have been defined, we have
|
||||
# to use it for MACRO test that uses mverbs.h file.
|
||||
#
|
||||
if test ! -z "$ompi_check_verbs_dir" ; then
|
||||
CPPFLAGS="-I${opal_verbs_dir}/include $CPPFLAGS"
|
||||
fi
|
||||
|
||||
AS_IF([test "1" = "$$1_have_mverbs"],
|
||||
[AC_CHECK_DECLS([IBV_M_WR_CALC_RDMA_WRITE_WITH_IMM],
|
||||
[AC_DEFINE_UNQUOTED([OPAL_HAVE_IBOFFLOAD_CALC_RDMA], [1],
|
||||
[Whether IBV_M_WR_CALC_SEND is defined or not])],
|
||||
[AC_DEFINE_UNQUOTED([OPAL_HAVE_IBOFFLOAD_CALC_RDMA], [0],
|
||||
[Whether IBV_M_WR_CALC_SEND is defined or not])],
|
||||
[#include <infiniband/mverbs.h>])])
|
||||
|
||||
# restoring the CPPFLAGS
|
||||
CPPFLAGS="$ompi_check_mellanox_openfabrics_$1_save_CPPFLAGS"
|
||||
|
||||
AC_MSG_CHECKING([if Mellanox OpenFabrics MQE is enabled])
|
||||
AC_DEFINE_UNQUOTED([OPAL_HAVE_MQE], [$$1_have_mqe],
|
||||
[Whether MQE is available or not])
|
||||
AS_IF([test "1" = "$$1_have_mqe"],
|
||||
[AC_MSG_RESULT([yes])],
|
||||
[AC_MSG_RESULT([no])])
|
||||
|
||||
AS_IF([test "1" = "$$1_have_mverbs" && test "1" = $$1_have_mqe],
|
||||
[$2], [$3])
|
||||
])dnl
|
||||
@ -1,120 +0,0 @@
|
||||
dnl -*- shell-script -*-
|
||||
dnl
|
||||
dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
dnl University Research and Technology
|
||||
dnl Corporation. All rights reserved.
|
||||
dnl Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
dnl of Tennessee Research Foundation. All rights
|
||||
dnl reserved.
|
||||
dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
dnl University of Stuttgart. All rights reserved.
|
||||
dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
dnl All rights reserved.
|
||||
dnl Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved.
|
||||
dnl Copyright (c) 2006-2011 Los Alamos National Security, LLC. All rights
|
||||
dnl reserved.
|
||||
dnl Copyright (c) 2006-2009 Mellanox Technologies. All rights reserved.
|
||||
dnl Copyright (c) 2010-2012 Oracle and/or its affiliates. All rights reserved.
|
||||
dnl Copyright (c) 2015 Research Organization for Information Science
|
||||
dnl and Technology (RIST). All rights reserved.
|
||||
dnl $COPYRIGHT$
|
||||
dnl
|
||||
dnl Additional copyrights may follow
|
||||
dnl
|
||||
dnl $HEADER$
|
||||
dnl
|
||||
|
||||
|
||||
# Internal helper macro to look for the verbs libdir
|
||||
# --------------------------------------------------------
|
||||
AC_DEFUN([_OPAL_CHECK_VERBS_LIBDIR],[
|
||||
AS_IF([test -d "$1"],
|
||||
[AS_IF([test "x`ls $1/libibverbs.* 2> /dev/null`" != "x"],
|
||||
[opal_verbs_libdir="$1"])
|
||||
])
|
||||
])
|
||||
|
||||
# Internal helper macro to look for the verbs dir
|
||||
# --------------------------------------------------------
|
||||
AC_DEFUN([_OPAL_CHECK_VERBS_DIR],[
|
||||
AS_IF([test -d "$1"],
|
||||
[AS_IF([test -f "$1/include/infiniband/verbs.h"],
|
||||
[opal_verbs_dir="$1"])
|
||||
])
|
||||
])
|
||||
|
||||
# OPAL_CHECK_VERBS_DIR
|
||||
# --------------------------------------------------------
|
||||
# Add --with-verbs options, and if directories are specified,
|
||||
# sanity check them.
|
||||
#
|
||||
# At the end of this macro:
|
||||
#
|
||||
# 1. $opal_want_verbs will be set to:
|
||||
# "yes" if --with-verbs or --with-verbs=DIR was specified
|
||||
# "no" if --without-verbs was specified)
|
||||
# "optional" if neither --with-verbs* nor --without-verbs was specified
|
||||
#
|
||||
# 2. $opal_verbs_dir and $opal_verbs_libdir with either both be set or
|
||||
# both be empty.
|
||||
#
|
||||
AC_DEFUN([OPAL_CHECK_VERBS_DIR],[
|
||||
|
||||
# Add --with options
|
||||
AC_ARG_WITH([verbs],
|
||||
[AC_HELP_STRING([--with-verbs(=DIR)],
|
||||
[Build verbs support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
|
||||
AC_ARG_WITH([verbs-libdir],
|
||||
[AC_HELP_STRING([--with-verbs-libdir=DIR],
|
||||
[Search for verbs libraries in DIR])])
|
||||
|
||||
# Sanity check the --with values
|
||||
OPAL_CHECK_WITHDIR([verbs], [$with_verbs],
|
||||
[include/infiniband/verbs.h])
|
||||
OPAL_CHECK_WITHDIR([verbs-libdir], [$with_verbs_libdir],
|
||||
[libibverbs.*])
|
||||
|
||||
# Set standardized shell variables for OFED lovin' components to
|
||||
# use. Either both of $opal_verbs_dir and
|
||||
# $verbs_libdir will be set, or neither will be set.
|
||||
opal_want_verbs=no
|
||||
AS_IF([test -z "$with_verbs"],
|
||||
[opal_want_verbs=optional],
|
||||
[AS_IF([test "$with_verbs" = "no"],
|
||||
[opal_want_verbs=no],
|
||||
[opal_want_verbs=yes])
|
||||
])
|
||||
|
||||
opal_verbs_dir=
|
||||
AS_IF([test -n "$with_verbs" && test "$with_verbs" != "yes" && test "$with_verbs" != "no"],
|
||||
[opal_verbs_dir=$with_verbs])
|
||||
|
||||
opal_verbs_libdir=
|
||||
AS_IF([test -n "$with_verbs_libdir" && test "$with_verbs_libdir" != "yes" && test "$with_verbs_libdir" != "no"],
|
||||
[opal_verbs_libdir=$with_verbs_libdir])
|
||||
|
||||
# If the top dir was specified but the libdir was not, look for
|
||||
# it. Note that if the user needs a specific libdir (i.e., if our
|
||||
# hueristic ordering below is not sufficient), they need to
|
||||
# specify it.
|
||||
AS_IF([test -z "$opal_verbs_libdir" && test -n "$opal_verbs_dir"],
|
||||
[_OPAL_CHECK_VERBS_LIBDIR(["$opal_verbs_dir/lib"])])
|
||||
AS_IF([test -z "$opal_verbs_libdir" && test -n "$opal_verbs_dir"],
|
||||
[_OPAL_CHECK_VERBS_LIBDIR(["$opal_verbs_dir/lib64"])])
|
||||
AS_IF([test -z "$opal_verbs_libdir" && test -n "$opal_verbs_dir"],
|
||||
[_OPAL_CHECK_VERBS_LIBDIR(["$opal_verbs_dir/lib32"])])
|
||||
AS_IF([test -z "$opal_verbs_libdir" && test -n "$opal_verbs_dir"],
|
||||
[AC_MSG_WARN([Could not find libibverbs in the usual locations under $opal_verbs_dir])
|
||||
AC_MSG_ERROR([Cannot continue])
|
||||
])
|
||||
|
||||
# If the libdir was specified, but the top dir was not, look for
|
||||
# it. Note that if the user needs a specific top dir (i.e., if
|
||||
# our hueristic below is not sufficient), they need to specify it.
|
||||
AS_IF([test -z "$opal_verbs" && test -n "$opal_verbs_libdir"],
|
||||
[_OPAL_CHECK_VERBS_DIR([`dirname "$opal_verbs_libdir"`])])
|
||||
AS_IF([test -z "$opal_verbs_dir" && test -n "$opal_verbs_libdir"],
|
||||
[AC_MSG_WARN([Could not find verbs.h in the usual locations under $opal_verbs_dir])
|
||||
AC_MSG_ERROR([Cannot continue])
|
||||
])
|
||||
])
|
||||
@ -69,9 +69,6 @@ AC_DEFUN([MCA_opal_hwloc_hwloc201_POST_CONFIG],[
|
||||
# MCA_hwloc_hwloc201_CONFIG([action-if-found], [action-if-not-found])
|
||||
# --------------------------------------------------------------------
|
||||
AC_DEFUN([MCA_opal_hwloc_hwloc201_CONFIG],[
|
||||
# Hwloc needs to know if we have Verbs support
|
||||
AC_REQUIRE([OPAL_CHECK_VERBS_DIR])
|
||||
|
||||
AC_CONFIG_FILES([opal/mca/hwloc/hwloc201/Makefile])
|
||||
|
||||
OPAL_VAR_SCOPE_PUSH([HWLOC_VERSION opal_hwloc_hwloc201_save_CPPFLAGS opal_hwloc_hwloc201_save_LDFLAGS opal_hwloc_hwloc201_save_LIBS opal_hwloc_hwloc201_save_cairo opal_hwloc_hwloc201_save_xml opal_hwloc_hwloc201_save_mode opal_hwloc_hwloc201_basedir opal_hwloc_hwloc201_file opal_hwloc_hwloc201_save_cflags CPPFLAGS_save LIBS_save opal_hwloc_external])
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user