permanently disable ibcm
This commit was SVN r25137.
Этот коммит содержится в:
Nathan Hjelm
родитель
079ccdf8b1
Коммит
3048ce043d
@ -67,14 +67,7 @@ AC_DEFUN([OMPI_CHECK_OPENIB],[
|
||||
[AC_HELP_STRING([--enable-openib-connectx-xrc],
|
||||
[Enable ConnectX XRC support. If you do not have InfiniBand ConnectX adapters, you may disable the ConnectX XRC support. If you do not know which InfiniBand adapter is installed on your cluster, leave this option enabled (default: enabled)])],
|
||||
[enable_connectx_xrc="$enableval"], [enable_connectx_xrc="yes"])
|
||||
dnl Temporarily disable ibcm support; it is broken.
|
||||
dnl #
|
||||
dnl # Openfabrics IBCM
|
||||
dnl #
|
||||
dnl AC_ARG_ENABLE([openib-ibcm],
|
||||
dnl [AC_HELP_STRING([--enable-openib-ibcm],
|
||||
dnl [Enable Open Fabrics IBCM support in openib BTL (default: disabled)])],
|
||||
dnl [enable_openib_ibcm="$enableval"], [enable_openib_ibcm="no"])
|
||||
|
||||
#
|
||||
# Openfabrics RDMACM
|
||||
#
|
||||
@ -166,7 +159,6 @@ dnl [enable_openib_ibcm="$enableval"], [enable_openib_ibc
|
||||
# (unconditionally)
|
||||
$1_have_xrc=0
|
||||
$1_have_rdmacm=0
|
||||
$1_have_ibcm=0
|
||||
$1_have_opensm_devel=0
|
||||
|
||||
# If we have the openib stuff available, find out what we've got
|
||||
@ -226,19 +218,6 @@ dnl [enable_openib_ibcm="$enableval"], [enable_openib_ibc
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl Temporarily disable ibcm support; it is broken.
|
||||
dnl # Do we have IB CM? (note that OFED IB CM depends on RDMA
|
||||
dnl # CM, so no need to add it into the other-libraries
|
||||
dnl # argument to AC_CHECK_ LIB). Note that we only want IBCM
|
||||
dnl # starting with OFED 1.2 or so, so check for
|
||||
dnl # ib_cm_open_device (introduced in libibcm 1.0/OFED 1.2).
|
||||
dnl if test "$enable_openib_ibcm" = "yes"; then
|
||||
dnl AC_CHECK_HEADERS([infiniband/cm.h],
|
||||
dnl [AC_CHECK_LIB([ibcm], [ib_cm_open_device],
|
||||
dnl [$1_have_ibcm=1
|
||||
dnl $1_LIBS="-libcm $$1_LIBS"])])
|
||||
dnl fi
|
||||
|
||||
# Check support for RDMAoE devices
|
||||
$1_have_rdmaoe=0
|
||||
AC_CHECK_DECLS([IBV_LINK_LAYER_ETHERNET],
|
||||
@ -294,19 +273,6 @@ dnl fi
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
|
||||
# Note that IBCM support is hard-coded disabled (see above). The
|
||||
# CPC is currently broken, so there's no point in even offering
|
||||
# the opprotunity to enable it (i.e., don't even offer an --enable
|
||||
# switch; it'll just confuse users).
|
||||
AC_MSG_CHECKING([if OpenFabrics IBCM support is enabled])
|
||||
AC_DEFINE_UNQUOTED([OMPI_HAVE_IBCM], [$$1_have_ibcm],
|
||||
[Whether IB CM is available or not])
|
||||
if test "1" = "$$1_have_ibcm"; then
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
|
||||
AS_IF([test -z "$ompi_check_openib_dir"],
|
||||
[openib_include_dir="/usr/include"],
|
||||
[openib_include_dir="$ompi_check_openib_dir/include"])
|
||||
|
||||
@ -81,15 +81,6 @@ sources += \
|
||||
connect/btl_openib_connect_xoob.h
|
||||
endif
|
||||
|
||||
# If we have ibcm support, build that CPC
|
||||
if MCA_btl_openib_have_ibcm
|
||||
sources += \
|
||||
connect/btl_openib_connect_ibcm.c \
|
||||
connect/btl_openib_connect_ibcm.h
|
||||
|
||||
dist_pkgdata_DATA += connect/help-mpi-btl-openib-cpc-ibcm.txt
|
||||
endif
|
||||
|
||||
# If we have rdmacm support, build that CPC
|
||||
if MCA_btl_openib_have_rdmacm
|
||||
sources += \
|
||||
|
||||
@ -628,7 +628,7 @@ int mca_btl_openib_add_procs(
|
||||
|
||||
opal_output(-1, "add procs: adding proc %d", i);
|
||||
|
||||
/* OOB, XOOB, RDMACM, IBCM does not support SELF comunication, so
|
||||
/* OOB, XOOB, and RDMACM do not support SELF comunication, so
|
||||
* mark the prco as unreachable by openib btl */
|
||||
if (OPAL_EQUAL == orte_util_compare_name_fields
|
||||
(ORTE_NS_CMP_ALL, ORTE_PROC_MY_NAME, &ompi_proc->proc_name)) {
|
||||
|
||||
@ -25,7 +25,6 @@
|
||||
AC_DEFUN([MCA_ompi_btl_openib_POST_CONFIG], [
|
||||
AM_CONDITIONAL([MCA_btl_openib_have_xrc], [test $1 -eq 1 -a "x$btl_openib_have_xrc" = "x1"])
|
||||
AM_CONDITIONAL([MCA_btl_openib_have_rdmacm], [test $1 -eq 1 -a "x$btl_openib_have_rdmacm" = "x1"])
|
||||
AM_CONDITIONAL([MCA_btl_openib_have_ibcm], [test $1 -eq 1 -a "x$btl_openib_have_ibcm" = "x1"])
|
||||
AM_CONDITIONAL([MCA_btl_openib_have_dynamic_sl], [test $1 -eq 1 -a "x$btl_openib_have_opensm_devel" = "x1"])
|
||||
])
|
||||
|
||||
@ -58,7 +57,7 @@ AC_DEFUN([MCA_ompi_btl_openib_CONFIG],[
|
||||
$1],
|
||||
[$2])
|
||||
|
||||
AC_MSG_CHECKING([for thread support (needed for ibcm/rdmacm)])
|
||||
AC_MSG_CHECKING([for thread support (needed for rdmacm)])
|
||||
have_threads=`echo $THREAD_TYPE | awk '{ print [$]1 }'`
|
||||
if test "x$have_threads" = "x"; then
|
||||
have_threads=none
|
||||
@ -73,10 +72,6 @@ AC_DEFUN([MCA_ompi_btl_openib_CONFIG],[
|
||||
"$have_threads" != "none"; then
|
||||
cpcs="$cpcs rdmacm"
|
||||
fi
|
||||
if test "x$btl_openib_have_ibcm" = "x1" -a \
|
||||
"$have_threads" != "none"; then
|
||||
cpcs="$cpcs ibcm"
|
||||
fi
|
||||
AC_MSG_CHECKING([which openib btl cpcs will be built])
|
||||
AC_MSG_RESULT([$cpcs])])
|
||||
|
||||
|
||||
@ -21,9 +21,6 @@
|
||||
#if OMPI_HAVE_RDMACM && OPAL_HAVE_THREADS
|
||||
#include "connect/btl_openib_connect_rdmacm.h"
|
||||
#endif
|
||||
#if OMPI_HAVE_IBCM && OPAL_HAVE_THREADS
|
||||
#include "connect/btl_openib_connect_ibcm.h"
|
||||
#endif
|
||||
|
||||
#include "orte/util/show_help.h"
|
||||
#include "opal/util/argv.h"
|
||||
@ -52,14 +49,6 @@ static ompi_btl_openib_connect_base_component_t *all[] = {
|
||||
&ompi_btl_openib_connect_empty,
|
||||
#endif
|
||||
|
||||
/* Always have an entry here so that the CP indexes will always be
|
||||
the same: if IB CM is not available, use the "empty" CPC */
|
||||
#if OMPI_HAVE_IBCM && OPAL_HAVE_THREADS
|
||||
&ompi_btl_openib_connect_ibcm,
|
||||
#else
|
||||
&ompi_btl_openib_connect_empty,
|
||||
#endif
|
||||
|
||||
NULL
|
||||
};
|
||||
static ompi_btl_openib_connect_base_component_t **available = NULL;
|
||||
|
||||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
@ -1,20 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2007-2008 Cisco Systems, Inc. All rights reserved.
|
||||
*
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
*
|
||||
* $HEADER$
|
||||
*/
|
||||
|
||||
#ifndef BTL_OPENIB_CONNECT_IBCM_H
|
||||
#define BTL_OPENIB_CONNECT_IBCM_H
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "connect/connect.h"
|
||||
|
||||
extern ompi_btl_openib_connect_base_component_t ompi_btl_openib_connect_ibcm;
|
||||
|
||||
#endif
|
||||
Загрузка…
Ссылка в новой задаче
Block a user