Merge pull request #5737 from hppritcha/topic/remove_scif_support

SCIF: remove it

README

@@ -605,7 +605,6 @@ Network Support
     - Loopback (send-to-self)
     - Shared memory
     - TCP
-    - Intel Phi SCIF
     - SMCUDA
     - Cisco usNIC
     - uGNI (Cray Gemini, Aries)
@@ -1000,9 +999,6 @@ NETWORKING SUPPORT / OPTIONS
   covers most cases.  This option is only needed for special
   configurations.
 
---with-scif=<dir>
-  Look in directory for Intel SCIF support libraries
-
 --with-verbs=<directory>
   Specify the directory where the verbs (also known as OpenFabrics
   verbs, or Linux verbs, and previously known as OpenIB) libraries and

contrib/Makefile.am

@@ -88,12 +88,8 @@ EXTRA_DIST = \
         platform/lanl/darwin/mic-common \
         platform/lanl/darwin/debug \
         platform/lanl/darwin/debug.conf \
-        platform/lanl/darwin/debug-mic \
-        platform/lanl/darwin/debug-mic.conf \
         platform/lanl/darwin/optimized \
         platform/lanl/darwin/optimized.conf \
-        platform/lanl/darwin/optimized-mic \
-        platform/lanl/darwin/optimized-mic.conf \
 	platform/snl/portals4-m5 \
 	platform/snl/portals4-orte \
 	platform/ibm/debug-ppc32-gcc \

contrib/platform/lanl/darwin/debug.conf

@@ -10,7 +10,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
+# Copyright (c) 2011-2018 Los Alamos National Security, LLC.
 #                         All rights reserved.
 # $COPYRIGHT$
 #
@@ -84,7 +84,7 @@ oob_tcp_sndbuf = 32768
 oob_tcp_rcvbuf = 32768
 
 ## Define the MPI interconnects
-btl = sm,scif,openib,self
+btl = sm,openib,self
 
 ## Setup OpenIB - just in case
 btl_openib_want_fork_support = 0

contrib/platform/lanl/darwin/optimized.conf

@@ -10,7 +10,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2011-2013 Los Alamos National Security, LLC. All rights
+# Copyright (c) 2011-2018 Los Alamos National Security, LLC. All rights
 #                         reserved.
 # $COPYRIGHT$
 #
@@ -84,7 +84,7 @@ oob_tcp_sndbuf = 32768
 oob_tcp_rcvbuf = 32768
 
 ## Define the MPI interconnects
-btl = sm,scif,openib,self
+btl = sm,openib,self
 
 ## Setup OpenIB - just in case
 btl_openib_want_fork_support = 0