platform: Remove "with_verbs" from all the platform files.

Since --with-verbs has been removed, then remove it from all the platform files, too. Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
2019-01-10 09:56:27 -08:00 · 2019-01-10 09:56:27 -08:00 · 99553eb1b9
--- a/contrib/platform/ibm/debug-power6-gcc
+++ b/contrib/platform/ibm/debug-power6-gcc
@ -4,7 +4,6 @@ enable_debug=yes
 enable_mem_profile=no
 enable_contrib_no_build=libnbc
 enable_ft_thread=no
-with_verbs=/usr
 CXXFLAGS="-m64 -mcpu=power6 -mtune=power6 -O0 -g3 -ggdb"
 CCASFLAGS="-m64 -mcpu=power6 -mtune=power6 -O0 -g3 -ggdb"
 FCFLAGS="-m64 -mcpu=power6 -mtune=power6 -O0 -g3 -ggdb"
--- a/contrib/platform/ibm/debug-power7-gcc
+++ b/contrib/platform/ibm/debug-power7-gcc
@ -4,7 +4,6 @@ enable_debug=yes
 enable_mem_profile=no
 enable_contrib_no_build=libnbc
 enable_ft_thread=no
-with_verbs=/usr
 CXXFLAGS="-m64 -mcpu=power7 -mtune=power7 -O0 -g3 -ggdb"
 CCASFLAGS="-m64 -mcpu=power7 -mtune=power7 -O0 -g3 -ggdb"
 FCFLAGS="-m64 -mcpu=power7 -mtune=power7 -O0 -g3 -ggdb"
--- a/contrib/platform/ibm/debug-ppc32-gcc
+++ b/contrib/platform/ibm/debug-ppc32-gcc
@ -4,7 +4,6 @@ enable_debug=yes
 enable_mem_profile=no
 enable_contrib_no_build=libnbc
 enable_ft_thread=no
-with_verbs=/usr
 CXXFLAGS="-m32 -mcpu=powerpc64 -mtune=powerpc64 -O0 -g3 -ggdb"
 CCASFLAGS="-m32 -mcpu=powerpc64 -mtune=powerpc64 -O0 -g3 -ggdb"
 FCFLAGS="-m32 -mcpu=powerpc64 -mtune=powerpc64 -O0 -g3 -ggdb"
--- a/contrib/platform/ibm/debug-ppc64-gcc
+++ b/contrib/platform/ibm/debug-ppc64-gcc
@ -4,7 +4,6 @@ enable_debug=yes
 enable_mem_profile=no
 enable_contrib_no_build=libnbc
 enable_ft_thread=no
-with_verbs=/usr
 CXXFLAGS="-m64 -mcpu=powerpc64 -mtune=powerpc64 -O0 -g3 -ggdb"
 CCASFLAGS="-m64 -mcpu=powerpc64 -mtune=powerpc64 -O0 -g3 -ggdb"
 FCFLAGS="-m64 -mcpu=powerpc64 -mtune=powerpc64 -O0 -g3 -ggdb"
--- a/contrib/platform/ibm/optimized-power6-gcc
+++ b/contrib/platform/ibm/optimized-power6-gcc
@ -3,7 +3,6 @@ enable_mem_profile=no
 enable_debug=no
 enable_contrib_no_build=libnbc
 enable_ft_thread=no
-with_verbs=/usr
 enable_shared=yes
 enable_static=no
 CXXFLAGS="-m64 -mcpu=power6 -mtune=power6 -O3"
--- a/contrib/platform/ibm/optimized-power7-gcc
+++ b/contrib/platform/ibm/optimized-power7-gcc
@ -3,7 +3,6 @@ enable_mem_profile=no
 enable_debug=no
 enable_contrib_no_build=libnbc
 enable_ft_thread=no
-with_verbs=/usr
 enable_shared=yes
 enable_static=no
 CXXFLAGS="-m64 -mcpu=power7 -mtune=power7 -O3"
--- a/contrib/platform/ibm/optimized-ppc32-gcc
+++ b/contrib/platform/ibm/optimized-ppc32-gcc
@ -3,7 +3,6 @@ enable_mem_profile=no
 enable_debug=no
 enable_contrib_no_build=libnbc
 enable_ft_thread=no
-with_verbs=/usr
 enable_shared=yes
 enable_static=no
 CXXFLAGS="-m32 -mcpu=powerpc64 -mtune=powerpc64 -O3"
--- a/contrib/platform/ibm/optimized-ppc64-gcc
+++ b/contrib/platform/ibm/optimized-ppc64-gcc
@ -3,7 +3,6 @@ enable_mem_profile=no
 enable_debug=no
 enable_contrib_no_build=libnbc
 enable_ft_thread=no
-with_verbs=/usr
 enable_shared=yes
 enable_static=no
 CXXFLAGS="-m64 -mcpu=powerpc64 -mtune=powerpc64 -O3"
--- a/contrib/platform/intel/bend/gadget
+++ b/contrib/platform/intel/bend/gadget
@ -24,7 +24,6 @@ enable_mca_no_build=btl-tcp,btl-sm,rcache-udreg
 enable_mca_direct=pml-ob1
 with_memory_manager=no
 with_tm=no
-with_verbs=no
 with_devel_headers=yes
 with_portals=no
 with_valgrind=no
--- a/contrib/platform/intel/bend/gadget-optimized
+++ b/contrib/platform/intel/bend/gadget-optimized
@ -21,7 +21,6 @@ enable_io_romio=no
 enable_contrib_no_build=libnbc
 with_memory_manager=no
 with_tm=no
-with_verbs=no
 with_devel_headers=yes
 with_portals=no
 with_valgrind=no
--- a/contrib/platform/lanl/cray_xc_cle5.2/debug-common
+++ b/contrib/platform/lanl/cray_xc_cle5.2/debug-common
@ -1,6 +1,3 @@
-# do not use IB verbs
-with_verbs=no
-
 enable_dlopen=no
 enable_mem_profile=no
 enable_binaries=yes
--- a/contrib/platform/lanl/cray_xc_cle5.2/optimized-common
+++ b/contrib/platform/lanl/cray_xc_cle5.2/optimized-common
@ -1,6 +1,3 @@
-# do not use IB verbs
-with_verbs=no
-
 enable_dlopen=no

 enable_mem_profile=no
--- a/contrib/platform/lanl/cray_xe6/cray-common
+++ b/contrib/platform/lanl/cray_xe6/cray-common
@ -1,9 +1,6 @@
 # (c) 2012-2014 Los Alamos National Security, LLC. All rights reserved.
 # Common Cray XE/XK-6 options (used by all builds)

-# do not use IB verbs
-with_verbs=no
-
 # enable XPMEM enhanced shared memory (needs for Vader BTL)
 with_xpmem=/opt/cray/xpmem/0.1-2.0400.30792.5.6.gem

--- a/contrib/platform/lanl/darwin/darwin-common
+++ b/contrib/platform/lanl/darwin/darwin-common
@ -32,9 +32,6 @@ with_tm=no
 # Enable PMI support for direct launch
 with_pmi=yes

-# Always build ibverbs support
-with_verbs=yes
-
 # Install the development headers
 with_devel_headers=yes

--- a/contrib/platform/lanl/darwin/mic-common
+++ b/contrib/platform/lanl/darwin/mic-common
@ -29,7 +29,6 @@ enable_pci=no
 enable_libpci=no
 with_pmi=no
 with_slurm=no
-with_verbs=no

 MIC_LDFLAGS="-L$XCOMPOSER/compiler/lib/mic -Wl,-rpath=$XCOMPOSER/compiler/lib/mic"

--- a/contrib/platform/lanl/toss/README
+++ b/contrib/platform/lanl/toss/README
@ -17,7 +17,6 @@ created.
    - with_slurm
    - with_tm
    - with_pmi
-    - with_verbs
    - NOTE: common had "with_devel_headers=yes" in it that was not propagated.
      This option should not be used in production as per Open MPI developer
      mailing list guidance.
@ -58,9 +57,6 @@ created.
    - change: comment "Disable components not needed on TOSS platforms with
      high-speed networks" to "Disable components not needed on TOSS Ethernet-
      connected clusters"
-    - change: with_verbs=no
-    - change: comment "Always build ibverbs support" to "Do not build ibverbs
-      support"
 - toss3-wc-optimized.conf
  - copy of toss3-hfi-optimized.conf with the following changes:
    - change: comment "Add the interface for out-of-band communication and set
@ -83,7 +79,6 @@ created.
      - enable_mca_no_build=crs,filem,routed-linear,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,pml-cm,ess-cnos,grpcomm-cnos,plm-rsh,btl-tcp,oob-ud,ras-simulator,mpool-fake
      - enable_mca_static=btl:ugni,btl:self,btl:vader,pml:ob1
      - enable_mca_directpml-ob1
-      - with_verbs=no
      - with_tm=no
      - enable_orte_static_ports=no
      - enable_pty_support=no
--- a/contrib/platform/lanl/toss/cray-lustre-optimized
+++ b/contrib/platform/lanl/toss/cray-lustre-optimized
@ -20,9 +20,6 @@ enable_mca_static=btl:ugni,btl:self,btl:vader,pml:ob1
 # enable direct calling for ob1
 enable_mca_direct=pml-ob1

-# do not use IB verbs
-with_verbs=no
-
 # do not use torque
 with_tm=no

--- a/contrib/platform/lanl/toss/toss2-mlx-optimized
+++ b/contrib/platform/lanl/toss/toss2-mlx-optimized
@ -16,6 +16,3 @@ with_pmi=yes

 # Enable lustre support in romio
 with_io_romio_flags=--with-file-system=ufs+nfs+lustre
-
-# Always build ibverbs support
-with_verbs=yes
--- a/contrib/platform/lanl/toss/toss2-qib-optimized
+++ b/contrib/platform/lanl/toss/toss2-qib-optimized
@ -16,6 +16,3 @@ with_pmi=yes

 # Enable lustre support in romio
 with_io_romio_flags=--with-file-system=ufs+nfs+lustre
-
-# Always build ibverbs support
-with_verbs=yes
--- a/contrib/platform/lanl/toss/toss3-hfi-optimized
+++ b/contrib/platform/lanl/toss/toss3-hfi-optimized
@ -16,6 +16,3 @@ with_pmi=yes

 # Enable lustre support in romio
 with_io_romio_flags=--with-file-system=ufs+nfs+lustre
-
-# Always build ibverbs support
-with_verbs=yes
--- a/contrib/platform/lanl/toss/toss3-mlx-optimized
+++ b/contrib/platform/lanl/toss/toss3-mlx-optimized
@ -16,6 +16,3 @@ with_pmi=yes

 # Enable lustre support in romio
 with_io_romio_flags=--with-file-system=ufs+nfs+lustre
-
-# Always build ibverbs support
-with_verbs=yes
--- a/contrib/platform/lanl/toss/toss3-wc-optimized
+++ b/contrib/platform/lanl/toss/toss3-wc-optimized
@ -16,6 +16,3 @@ with_pmi=yes

 # Enable lustre support in romio
 with_io_romio_flags=--with-file-system=ufs+nfs+lustre
-
-# Do not build ibverbs support
-with_verbs=no
--- a/contrib/platform/mellanox/optimized
+++ b/contrib/platform/mellanox/optimized
@ -1,7 +1,6 @@
 enable_mca_no_build=coll-ml,btl-uct
 enable_debug_symbols=yes
 enable_orterun_prefix_by_default=yes
-with_verbs=no
 with_devel_headers=yes
 enable_oshmem=yes
 enable_oshmem_fortran=yes
--- a/contrib/platform/snl/kitten
+++ b/contrib/platform/snl/kitten
@ -53,10 +53,7 @@ ac_cv_func_usleep=${ac_cv_func_usleep=no}
 ac_cv_func_vm_read_overwrite=${ac_cv_func_vm_read_overwrite=no}
 ac_cv_func_waitpid=${ac_cv_func_waitpid=no}

-if test "with_verbs" != "no" ; then
-    enable_mca_direct=pml-ob1
-    enable_mca_no_built="$enable_mca_no_build,btl-sm"
-elif test "with_portals4" != "no" ; then
+if test "with_portals4" != "no" ; then
    enable_mca_no_build="$enable_mca_no_build,pml-ob1,btl,bml,mpool,rcache"
    enable_mca_direct=pml-cm,mtl-portals4
 fi
--- a/contrib/platform/snl/portals4-orte
+++ b/contrib/platform/snl/portals4-orte
@ -4,6 +4,5 @@ enable_contrib_no_build=libnbc
 enable_heterogeneous=no
 enable_mem_debug=no
 enable_mem_profile=no
-with_verbs=no
 with_gm=no
 with_mx=no
--- a/contrib/platform/utk/cray_xc30_darter
+++ b/contrib/platform/utk/cray_xc30_darter
@ -24,7 +24,6 @@ with_alps=yes
 with_tm=no
 with_slurm=no
 with_xpmem=yes
-with_verbs=no
 enable_mca_no_build=crs,filem,routed-linear,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-example,crcp,pml-cm,ess-cnos,grpcomm-cnos,plm-rsh,btl-tcp,oob-ud,ras-simulator,mpool-fake,maffinity-first_use,maffinity-libnuma,paffinity-linux
 enable_mca_static=btl:ugni,btl:self,btl:vader,pml:ob1,coll:ml
 #enable_mca_direct=pml-ob1