Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Copyright (c) 2006-2017 Cisco Systems, Inc. All rights reserved.
Copyright (c) 2006 Voltaire, Inc. All rights reserved.
Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved.
Use is subject to license terms.
Copyright (c) 2006-2016 Los Alamos National Security, LLC. All rights
Copyright (c) 2006-2017 Los Alamos National Security, LLC. All rights
reserved.
Copyright (c) 2010-2012 IBM Corporation. All rights reserved.
Copyright (c) 2012 Oak Ridge National Labs. All rights reserved.
Expand Down Expand Up @@ -70,6 +70,7 @@ Master (not on release branches yet)
orte daemon, rather than the mpirun process. This may be useful to set to
true when using SLURM, as it improves interoperability with SLURM's signal
propagation tools. By default it is set to false, except for Cray XC systems.
- Remove IB XRC support from the OpenIB BTL due to lack of support.

3.0.0 -- July, 2017
-------------------
Expand Down
13 changes: 7 additions & 6 deletions config/opal_check_openfabrics.m4
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# 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-2016 Los Alamos National Security, LLC. All rights
# 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.
Expand Down Expand Up @@ -301,12 +301,13 @@ AC_DEFUN([OPAL_CHECK_OPENFABRICS],[

AC_DEFUN([OPAL_CHECK_OPENFABRICS_CM_ARGS],[
#
# ConnectX XRC support
# ConnectX XRC support - disabled see issue #3890
#
AC_ARG_ENABLE([openib-connectx-xrc],
[AC_HELP_STRING([--enable-openib-connectx-xrc],
[Enable ConnectX XRC support in the openib BTL. 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 AC_ARG_ENABLE([openib-connectx-xrc],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you're not going to remove this code, you should probably put a comment here as to why you're commenting this out. Perhaps even refer to #3890 and/or #3969.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually there is a comment just above the lines that are dnl'd out.

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
#
Expand Down