eddy16112 · eddy16112 · Feb 26, 2016 · Dec 24, 2015 · Dec 24, 2015 · Dec 23, 2015
diff --git a/.gitignore b/.gitignore
@@ -37,6 +37,7 @@
 *.exe
 *.log
 *.trs
+*.sapp
 *~
 *\\#
 
@@ -300,10 +301,13 @@ opal/mca/hwloc/hwloc*/hwloc/include/private/autogen/config.h
 
 opal/mca/installdirs/config/install_dirs.h
 
-opal/mca/pmix/pmix1xx/pmix/include/pmix/autogen/config.h
-opal/mca/pmix/pmix1xx/pmix/include/pmix/pmix_common.h
-opal/mca/pmix/pmix1xx/pmix/include/private/autogen/config.h
-opal/mca/pmix/pmix1xx/pmix/include/private/autogen/config.h.in
+opal/mca/pmix/pmix112/pmix/include/pmix/autogen/config.h
+opal/mca/pmix/pmix112/pmix/include/private/autogen/config.h
+opal/mca/pmix/pmix112/pmix/include/private/autogen/config.h.in
+opal/mca/pmix/pmix120/pmix/include/pmix/autogen/config.h
+opal/mca/pmix/pmix120/pmix/include/private/autogen/config.h
+opal/mca/pmix/pmix120/pmix/include/private/autogen/config.h.in
+
 
 opal/tools/opal-checkpoint/opal-checkpoint
 opal/tools/opal-checkpoint/opal-checkpoint.1
@@ -364,6 +368,7 @@ orte/test/mpi/parallel_w64
 orte/test/mpi/pubsub
 orte/test/mpi/read_write
 orte/test/mpi/reduce-hang
+orte/test/mpi/ring
 orte/test/mpi/segv
 orte/test/mpi/simple_spawn
 orte/test/mpi/slave
@@ -590,6 +595,8 @@ test/event/signal-test
 test/event/event-test
 test/event/time-test
 
+test/monitoring/monitoring_test
+
 test/mpi/environment/chello
 
 test/runtime/parse_context

diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,81 @@
+# Use "required" for sudo, because we want to use the "trusty" Debian
+# distro, which is (currently) only available in the legacy Travis
+# infrastructure (i.e., if we put "sudo: false" to use the new container-
+# based Travis infrastructure, then "trusty" is not available).  We
+# need the "trusty" distro because it has more recent versions of the
+# GNU Autotools (i.e., autogen.pl will fail if you use the regular
+# distro because the GNU Autotools are too old).
+sudo: required
+dist: trusty
+language: c
+
+# Iterate over 2 different compilers
+compiler:
+    - gcc
+    - clang
+
+# Iterate over 2 different OSs
+os:
+    - linux
+    - osx
+
+addons:
+    # For Linux, make sure we have some extra packages that we like to
+    # build with
+    apt:
+        packages:
+            - autoconf
+            - automake
+            - libtool
+            - libnl-3-200
+            - libnl-3-dev
+            - libnl-route-3-200
+            - libnl-route-3-dev
+            - libibverbs-dev
+            - librdmacm-dev
+        sources:
+            - ubuntu-toolchain-r-test
+
+env:
+    global:
+        - AM_MAKEFLAGS="-j4"
+        - CPPFLAGS="-I$HOME/bogus/include"
+        - LDFLAGS="-I$HOME/bogus/lib"
+        - LD_LIBRARY_PATH="$HOME/bogus/lib"
+    matrix:
+        - GCC_VERSION=default
+        - GCC_VERSION=5
+
+# Install dependencies for the verbs and usnic providers.  Open MPI is
+# not currently using the verbs provider in Libfabric, so we might as
+# well not build it.
+before_install:
+    - if [[ "GCC_VERSION" == "5" ]]; then COMPILERS="CC=gcc-5 CXX=g++-5 FC=gfortran-5"; fi
+    - export CONFIGURE_ARGS="--prefix=$HOME/bogus $COMPILERS" DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_ARGS"
+    - export DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_ARGS"
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git clone https://github.com/ofiwg/libfabric.git ; fi
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$GCC_VERSION" == "5" ]] ; then sudo apt-get --assume-yes install gcc-5 g++-5 gfortran-5; fi
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd libfabric && ./autogen.sh && ./configure --prefix=$HOME/bogus --enable-usnic --disable-verbs $COMPILERS && make install && cd .. ; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$GCC_VERSION" == "5" ]] ; then brew update; brew unlink gcc ; brew install gcc; fi
+
+# Note that we use "make -k" to do the entire build, even if there was a
+# build error in there somewhere.  This prevents us from needing to submit
+# to Travis, see the first error, fix that first error, submit again, ...etc.
+install:
+    - m4 --version
+    - autoconf --version
+    - automake --version
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then libtool --version; else glibtool --version; fi
+    - ./autogen.pl
+    - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CC" == "gcc" ]]; then ./configure $CONFIGURE_ARGS --with-libfabric=$HOME/bogus --with-usnic --with-verbs; else ./configure $CONFIGURE_ARGS; fi
+    - make -k
+
+# We only need to distcheck on one OS / compiler combination (this is just
+# a minor optimization to make the overall set of builds faster).
+script:
+    - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CC" == "gcc" ]]; then make distcheck; else make check; fi
+
+matrix:
+  exclude:
+    - env: GCC_VERSION=5
+      compiler: clang
diff --git a/AUTHORS b/AUTHORS
@@ -40,7 +40,7 @@ [email protected]        Ethan Mallove               Sun, Oracle
 [email protected]           Eugene Loh                  Sun, Oracle
 [email protected]               Edgar Gabriel               HLRS, UH, UTK
 [email protected]                 Graham Fagg                 UTK
-gilles[email protected]   Gilles Gouaillardet         RIST
+gilles@rist.or.jp               Gilles Gouaillardet         RIST
 [email protected]                Ginger Young                LANL
 [email protected]               Gleb Natapov                Voltaire
 [email protected]               Galen Shipman               LANL

diff --git a/NEWS b/NEWS
@@ -67,6 +67,161 @@ Master (not on release branches yet)
   Please consider Score-P (score-p.org) as an external replacement.
 
 
+2.0.0
+------
+
+ **********************************************************************
+ *  Open MPI is now fully MPI-3.1 compliant
+ **********************************************************************
+
+
+- Enhancements to reduce the memory footprint for jobs at scale.
+  A new MCA parameter - mpi_add_procs_cutoff is available to set
+  the threshold for using this feature.
+- Enhancements to MPI RMA.  Open MPI now maps MPI RMA operations on
+  to native RMA operations for those networks which support this
+  capability.
+- Add support for PMIx - Process Management Interface for Exascale.
+  Version 1.1.2 of PMIx is included internally in this release.
+- Add support for PLFS file systems in Open MPI I/O.
+- Add support for UCX transport.
+- Improved support for MPI_THREAD_MULTIPLE.
+- Update Java interfaces to MPI-3.1
+- Simplify build process for Cray XC systems.  Add support for
+  using native SLURM.
+- Update the internal copy of ROMIO to that which shipped in MPICH
+  3.1.4.
+- Update internal copy of libevent to v2.0.22.
+- Update internal copy of hwloc to v1.11.1.
+- Removed checkpoint/restart code due to loss of maintainer. :-(
+- Add a new MCA parameter - opal_common_verbs_want_fork_support. This
+  replaces the btl_openib_want_fork_support parameter.
+- Add a -tune command line option to simplify setting many environment
+  variables and mca parameters.
+- Removed --enable-mpi-profiling configure option.
+- Add --with-platform-patches-dir configure option.
+- Add a new mca parameter default-dash-to-host to offer a mirror of
+  the default_hostfile.
+- Add a --with-pmi-libdir configure option for environments that install
+  PMI libs in a non-default location.
+- Add the ability to specify the number of desired slots in the --host
+  option.
+- Remove support for OS X Leopard.
+- Remove support for Cray XT systems.
+- Remove VampirTrace.
+- Remove support for Myrinet/MX.
+- Remove legacy collective module:ML.
+- Remove support for Alpha processors.
+- Numerous fixes/improvements to orte-dvm.  Special thanks to Mark
+  Santcroos for his help.
+- Silence a compiler warning in PSM MTL.  Thanks to Adrian Reber for
+  reporting this.
+- Add missing Fortran bindings for MPI_Win_allocate.  Thanks to Christoph
+  Niethammer for reporting and fixing.
+- Replace use of alloca with malloc for certain datatype creation
+  functions.  Thanks to Bogdan Sataric for reporting this.
+- Fix use of MPI_LB and MPI_UB in creation of of certain MPI datatypes.
+  Thanks to Gus Correa for helping to fix this.
+- Implement a workaround for a libtool problem.  Thanks to Eric
+  Schnetter for reporting and fixing.
+- Improve hcoll library detection in configure.  Thanks to David
+  Shrader and Ake Sandgren for reporting this.
+- Fix problems with XRC detection in OFED 3.12 and older releases.
+  Thanks to Paul Hargrove for his analysis of this problem.
+- Fix an issue with MCA parameters for Java bindings.  Thanks to
+  Takahiro Kawashima and Siegmar Gross for reporting this issue.
+- Fix a performance problem for large messages for Cray XC systems.
+  Thanks to Jerome Vienne for reporting this.
+- Fix an issue with MPI_Win_lock_all.  Thanks to Thomas Jahns for
+  reporting.
+- Fix an issue with passing a parameter to configure multiple times.
+  Thanks to QuesarVII for reporting and supplying a fix.
+- Add support for ALPS resource allocation system on Cray CLE 5.2 and
+  later.  Thanks to Mark Santcroos.
+- Correction to HACKING file.  Thanks to Maximilien Levesque.
+- Fix an issue with user supplied reduction operator functions.
+  Thanks to Rupert Nash for reporting this.
+- Fix an issue with an internal list management function.  Thanks to
+  Adrian Reber for reporting this.
+- Fix a problem with MPI-RMA PSCW epochs.  Thanks to Berk Hess for
+  reporting this.
+- Fix a problem in neighbor collectives.  Thanks to Lisandro Dalcin
+  for reporting.
+- Fix a problem when using persistent requests in the Java bindings.
+  Thanks to Nate Chambers for reporting.
+- Add additional flavors to MPI_Comm_split_type.  Thanks to Nick
+  Andersen for supplying this enhancement.
+- Improve closing of file descriptors during job launch phase.  Thanks
+  to Piotr Lesnicki for reporting and providing this enhancement.
+- Fix a problem in MPI_Get_accumulate and MPI_Rget_accumulate when
+  using Portals4.  Thanks to Nicolas Chevalier for reporting.
+- Use correct include file for lstat prototype in ROMIO. Thanks to
+  William Throwe for finding and providing a fix.
+- Fortran related fixes to handle Intel 2016 compiler.  Thanks to
+  Fabrice Roy for reporting this.
+- Fix an issue with use of DL-related macros in opal library.  Thanks to
+  Scott Atchley for finding this.
+- Fix a Fortran linkage issue.  Thanks to Macro Atzeri for finding and
+  suggesting a fix.
+- Fix an issue with parsing mpirun command line options which contain
+  colons.  Thanks to Lev Given for reporting.
+- Fix a problem with Open MPI's package config files.  Thanks to
+  Christoph Junghans for reporting.
+- Fix a typo in the MPI_Intercomm_merge man page.  Thanks To Harald
+  Servat for reporting and correcting.
+- Update man pages for non-blocking sends per MPI 3.1 standard.
+  Thanks to Alexander Pozdneev for reporting.
+
+
+1.10.2
+------
+
+ **********************************************************************
+ *  OSHMEM is now 1.2 compliant
+ **********************************************************************
+
+- Fix NBC_Copy for legitimate zero-size messages
+- Fix multiple bugs in OSHMEM
+- Correctly handle mpirun --host <user>@<ip-address>
+- Centralize two MCA params to avoid duplication between OMPI and
+  OSHMEM layers: opal_abort_delay and opal_abort_print_stack
+- Add support for Fujitsu compilers
+- Add UCX support for OMPI and OSHMEM
+- Correctly handle oversubscription when not given directives
+  to permit it. Thanks to @ammore1 for reporting it
+- Fix rpm spec file to not include the /usr directory
+- Add Intel HFI1 default parameters for the openib BTL
+- Resolve symbol conflicts in the PSM2 library
+- Add ability to empty the rgpusm cache when full if requested
+- Fix another libtool bug when -L requires a space between it
+  and the path. Thanks to Eric Schnetter for the patch.
+- Add support for OSHMEM v1.2 APIs
+- Improve efficiency of oshmem_preconnect_all algorithm
+- Fix bug in buffered sends support
+- Fix double free in edge case of mpirun. Thanks to @jsharpe for 
+  the patch
+- Multiple one-sided support fixes
+- Fix integer overflow in the tuned "reduce" collective when
+  using buffers larger than INT_MAX in size
+- Fix parse of user environment variables in mpirun. Thanks to
+  Stefano Garzarella for the patch
+- Performance improvements in PSM2 support
+- Fix NBS iBarrier for inter-communicators
+- Fix bug in vader BTL during finalize
+- Improved configure support for Fortran compilers
+- Fix rank_file mapper to support default --slot-set. Thanks
+  to Matt Thompson for reporting it
+- Update MPI_Testsome man page. Thanks to Eric Schnetter for
+  the suggestion
+- Fix missing resize of the returned type for subarray and
+  darray types. Thanks to Keith Bennett and Dan Garmann for
+  reporting it
+- Fix Java support on OSX 10.11. Thanks to Alexander Daryin
+  for reporting the problem
+- Fix some compilation issues on Solaris 11.2. Thanks to
+  Paul Hargrove for his continued help in such areas
+
+
 1.10.1
 ------
 
@@ -118,6 +273,12 @@ Master (not on release branches yet)
   to our attention.
 - Fix linking issues on some platforms (e.g., SLES 12).
 - Fix hang on some corner cases when MPI applications abort.
+- Add missing options to mpirun man page. Thanks to Daniel Letai
+  for bringing this to our attention.
+- Add new --with-platform-patches-dir configure option
+- Adjust relative selection priorities to ensure that MTL
+  support is favored over BTL support when both are available
+- Use CUDA IPC for all sized messages for performance
 
 
 1.10.0
@@ -126,7 +287,11 @@ Master (not on release branches yet)
 ** version numbering scheme.  The v1.10.x release series is based on
 ** the v1.8.x series, but with a few new features.  v2.x will be the
 ** next series after the v1.10.x series, and complete the transition
-** to the new version numbering scheme.  See README for more details.
+** to the new version numbering scheme.  See README for more details
+** on the new versioning scheme.
+**
+** NOTE: In accordance with OMPI version numbering, the v1.10 is *not*
+** API compatible with the v1.8 release series.
 
 - Added libfabric support (see README for more details):
   - usNIC BTL updated to use libfabric.

diff --git a/README b/README
@@ -8,7 +8,7 @@ Copyright (c) 2004-2008 High Performance Computing Center Stuttgart,
                         University of Stuttgart.  All rights reserved.
 Copyright (c) 2004-2007 The Regents of the University of California.
                         All rights reserved.
-Copyright (c) 2006-2015 Cisco Systems, Inc.  All rights reserved.
+Copyright (c) 2006-2016 Cisco Systems, Inc.  All rights reserved.
 Copyright (c) 2006-2011 Mellanox Technologies. All rights reserved.
 Copyright (c) 2006-2012 Oracle and/or its affiliates.  All rights reserved.
 Copyright (c) 2007      Myricom, Inc.  All rights reserved.
@@ -952,6 +952,17 @@ NETWORKING SUPPORT / OPTIONS
   which covers most cases.  This option is only needed for special
   configurations.
 
+--with-verbs-usnic
+  This option will activate support in Open MPI for disabling a
+  dire-sounding warning message from libibverbs that Cisco usNIC
+  devices are not supported (because Cisco usNIC devices are supported
+  through libfabric, not libibverbs).  This libibverbs warning can
+  also be suppressed by installing the "no op" libusnic_verbs plugin
+  for libibverbs (see https://github.com/cisco/libusnic_verbs, or
+  download binaries from cisco.com).  This option is disabled by
+  default because it causes libopen-pal.so to depend on libibverbs.so,
+  which is undesirable to many downstream packagers.
+
 --with-usnic
   Abort configure if Cisco usNIC support cannot be built.
 
@@ -1561,7 +1572,6 @@ Here's how we apply those rules specifically to Open MPI:
     * libmpi_cxx
     * libmpi_java
     * liboshmem
-    * liboshmem_java
 
 ===========================================================================
 

diff --git a/VERSION b/VERSION
@@ -91,22 +91,20 @@ libopen_rte_so_version=0:0:0
 libopen_pal_so_version=0:0:0
 libmpi_java_so_version=0:0:0
 liboshmem_so_version=0:0:0
-liboshmem_java_so_version=0:0:0
 
 # "Common" components install standalone libraries that are run-time
 # linked by one or more components.  So they need to be versioned as
 # well.  Yuck; this somewhat breaks the
 # components-don't-affect-the-build-system abstraction.
 
 # OMPI layer
-libmca_common_cuda_so_version=0:0:0
-libmca_common_ofacm_so_version=0:0:0
-libmca_common_sm_so_version=0:0:0
-libmca_common_ugni_so_version=0:0:0
-libmca_common_verbs_so_version=0:0:0
+
+# ORTE layer
+libmca_orte_common_alps_so_version=0:0:0
 
 # OPAL layer
+libmca_opal_common_cuda_so_version=0:0:0
 libmca_opal_common_libfabric_so_version=0:0:0
-
-# ORTE layer
-libmca_common_alps_so_version=0:0:0
+libmca_opal_common_sm_so_version=0:0:0
+libmca_opal_common_ugni_so_version=0:0:0
+libmca_opal_common_verbs_so_version=0:0:0