Commits

Jeff Squyres committed 4f91f99

Up to SVN r27647

Comments (0)

Files changed (312)

 ./ompi/contrib/vt/vt/extlib/otf/tools/otfprofile-mpi/otfprofile-mpi
 ./ompi/contrib/vt/vt/extlib/otf/tools/otfconfig/Makefile.in
 ./ompi/contrib/vt/vt/extlib/otf/tools/otfconfig/otfconfig
-./ompi/contrib/vt/vt/etc/Makefile.in
-./ompi/contrib/vt/vt/etc/vt-setup-config.xml
 ./ompi/contrib/vt/vt/util/Makefile.in
 ./ompi/contrib/vt/vt/util/installdirs_conf.h
 ./ompi/contrib/vt/vt/include/Makefile.in
 ./orte/mca/dfs/vc70.pdb
 ./orte/mca/dfs/base/*.obj
 ./orte/mca/dfs/app/Makefile.in
+./orte/mca/dfs/test/Makefile.in
 ./orte/mca/dfs/orted/Makefile.in
 ./orte/mca/rml/Makefile.in
 ./orte/mca/rml/oob/Makefile.in
                         University of Stuttgart.  All rights reserved.
 Copyright (c) 2004-2005 The Regents of the University of California.
                         All rights reserved.
-Copyright (c) 2008-2010 Cisco Systems, Inc.  All rights reserved.
+Copyright (c) 2008-2012 Cisco Systems, Inc.  All rights reserved.
 $COPYRIGHT$
 
 Additional copyrights may follow
      shell$ make all install
 
 
-Use of GNU m4, Autoconf, Automake, and Libtool
-==============================================
+Use of GNU Autoconf, Automake, and Libtool (and m4)
+===================================================
 
 This procedure is *ONLY* necessary if you are building from a
 developer's tree.  If you have an Open MPI distribution tarball, this
 section.
 
 If you are building Open MPI from a developer's tree, you must first
-install fairly recent versions of the GNU tools m4, Autoconf, Automake,
-and Libtool.  The specific versions required depend on if you are
-using the trunk or a release branch (and which release branch you are
-using).  The specific versions can be found at:
+install fairly recent versions of the GNU tools Autoconf, Automake,
+and Libtool (and possibly GNU m4, because recent versions of Autoconf
+have specific GNU m4 version requirements).  The specific versions
+required depend on if you are using the trunk or a release branch (and
+which release branch you are using).  The specific versions can be
+found at:
 
   http://www.open-mpi.org/svn/building.php
 
 following advice:
 
 NOTE: On MacOS/X, the default "libtool" program is different than the
-      GNU libtool.  You must download and install the GNU version (via
-      Fink or any other mechanism).
+      GNU libtool.  You must download and install the GNU version
+      (e.g., via MacPorts, Homebrew, or some other mechanism).
 
 1. Unless your OS distribution has easy-to-use binary installations,
    the sources can be can be downloaded from:
 
-        ftp://ftp.gnu.org/gnu/m4/
         ftp://ftp.gnu.org/gnu/autoconf/
         ftp://ftp.gnu.org/gnu/automake/
         ftp://ftp.gnu.org/gnu/libtool/
+        and if you need it:
+        ftp://ftp.gnu.org/gnu/m4/
+
+   NOTE: It is certainly easiest to download/build/install all four of
+   these tools together.  But note that Open MPI has no specific m4
+   requirements; it is only listed here because Autoconf requires
+   minimum versions of GNU m4.  Hence, you may or may not *need* to
+   actually install a new version of GNU m4.  That being said, if you
+   are confused or don't know, just install the latest GNU m4 with the
+   rest of the GNU Autotools and everything will work out fine.
 
 2. Build and install the tools in the following order:
 
 3. You MUST install the last three tools (Autoconf, Automake, Libtool)
    into the same prefix directory.  These three tools are somewhat
    inter-related, and if they're going to be used together, they MUST
-   share a common installation prefix.  You can install m4 anywhere,
-   as long as it can be found in the path.  It may be convenient to
-   install it instal the same prefix as the other three.
+   share a common installation prefix.  
+
+   You can install m4 anywhere as long as it can be found in the path;
+   it may be convenient to install it in the same prefix as the other
+   three.  Or you can use any recent-enough m4 that is in your path.
 
    3a. It is *strongly* encouraged that you do not install your new
        versions over the OS-installed versions.  This could cause
    will invoke the GNU Autoconf, Automake, and Libtool commands in the
    proper order and setup to run OMPI's top-level "configure" script.
 
-   Running autogen.pl may take several minutes, depending on your
+   Running autogen.pl may take a few minutes, depending on your
    system.  It's not very exciting to watch.  :-)
 
    If you have a multi-processor system, enabling the multi-threaded
    behavior in Automake 1.11 (or newer) can result in autogen.pl
    running faster.  Do this by setting the AUTOMAKE_JOBS environment
    variable to the number of processors (threads) that you want it to
-   use.  For example (you can again put this in your shell startup
-   files):
+   use before invoking autogen.pl.  For example (you can again put
+   this in your shell startup files):
 
        # For bash/sh:
        export AUTOMAKE_JOBS=4
        set AUTOMAKE_JOBS 4
 
    5a. You generally need to run autogen.pl whenever the top-level
-       file "configure.ac" changes, or any files in the config/
-       directory change (the config/ directory is where a lot of
-       "include" files for OMPI's configure script live).
+       file "configure.ac" changes, or any files in the config/ or
+       <project>/config/ directories change (these directories are
+       where a lot of "include" files for OMPI's configure script
+       live).
 
    5b. You do *NOT* need to re-run autogen.pl if you modify a
        Makefile.am.
 ===========
 
 Flex is used during the compilation of a developer's checkout (it is
-not used in distribution tarballs).  Other flavors of lex are *not*
-supported: given the choice of making parsing code portable between
-all flavors of lex and doing more interesting work on Open MPI, we
-greatly prefer the latter.  
+not used to build official distribution tarballs).  Other flavors of
+lex are *not* supported: given the choice of making parsing code
+portable between all flavors of lex and doing more interesting work on
+Open MPI, we greatly prefer the latter.
 
 Note that no testing has been performed to see what the minimum
 version of Flex is required by Open MPI.  We suggest that you use
 v2.5.35 at the earliest.
 
-*** NOTE: Windows builds of Open MPI require Flex version 2.5.35.
-Specifically, we know that v2.5.35 works and 2.5.4a does not.  We have
-not tested to figure out exactly what the minimum required flex
-version is on Windows; we suggest that you use 2.5.35 at the earliest.
-It is for this reason that the contrib/dist/make_dist_tarball script
-checks for a Windows-friendly version of flex before continuing.
+*** NOTE: Windows developer builds of Open MPI *require* Flex version
+2.5.35.  Specifically, we know that v2.5.35 works and 2.5.4a does not.
+We have not tested to figure out exactly what the minimum required
+flex version is on Windows; we suggest that you use 2.5.35 at the
+earliest.  It is for this reason that the
+contrib/dist/make_dist_tarball script checks for a Windows-friendly
+version of flex before continuing.
+
+For now, Open MPI will allow developer builds with Flex 2.5.4.  This
+is primarily motivated by the fact that RedHat/Centos 5 ships with
+Flex 2.5.4.  It is likely that someday Open MPI developer builds will
+require Flex version >=2.5.35.
 
 Note that the flex-generated code generates some compiler warnings on
 some platforms, but the warnings do not seem to be consistent or
 my $ompi_automake_version = "1.11.1";
 my $ompi_autoconf_version = "2.65";
 my $ompi_libtool_version = "2.2.6b";
+my $ompi_flex_version = "2.5.4";
 
 # Search paths
 my $ompi_autoconf_search = "autoconf";
 my $ompi_automake_search = "automake";
 my $ompi_libtoolize_search = "libtoolize;glibtoolize";
+my $ompi_flex_search = "flex";
 
 # One-time setup
 my $username;
             verbose "  $_ not found\n";
             next;
         }
-        $version =~ m/\s([\d\w\.]+)$/m;
-        $version = $1;
+
+	# Matches a version string with 1 or more parts possibly prefixed with a letter (ex:
+	# v2.2) or followed by a letter (ex: 2.2.6b). This regex assumes there is a space
+	# before the version string and that the version is ok if there is no version.
+	if (!($version =~ m/\s[vV]?(\d[\d\.]*\w?)/m)) {
+	    verbose "  WARNING: $_ does not appear to support --version. Assuming it is ok\n";
+
+	    return;
+	}
+
+	$version = $1;
+
         verbose "     Found $_ version $version; checking version...\n";
         push(@versions_found, $version);
 
     print "\nI am gonna abort.  :-(
 
 Please make sure you are using at least the following versions of the
-GNU tools:
+tools:
 
     GNU Autoconf: $ompi_autoconf_version
     GNU Automake: $ompi_automake_version
     GNU Libtool: $ompi_libtool_version
+    Flex: $ompi_flex_version
 =================================================================\n";
     my_exit(1);
 }
 &find_and_check("autoconf", $ompi_autoconf_search, $ompi_autoconf_version);
 &find_and_check("libtool", $ompi_libtoolize_search, $ompi_libtool_version);
 &find_and_check("automake", $ompi_automake_search, $ompi_automake_version);
+&find_and_check("flex", $ompi_flex_search, $ompi_flex_version);
 
 #---------------------------------------------------------------------------
 

contrib/Makefile.am

 	platform/ibm/debug-ppc64-gcc \
 	platform/ibm/optimized-ppc32-gcc \
 	platform/ibm/optimized-ppc64-gcc \
+	platform/greenplum/bend/mac \
+	platform/greenplum/bend/mac.conf \
+	platform/greenplum/bend/linux \
+	platform/greenplum/bend/linux.conf \
+	platform/greenplum/bend/mac-optimized \
+	platform/greenplum/bend/mac-optimized.conf \
+	platform/greenplum/bend/linux-optimized \
+	platform/greenplum/bend/linux-optimized.conf
 	platform/greenplum/mrplus/mac \
 	platform/greenplum/mrplus/mac.conf \
 	platform/greenplum/mrplus/linux \

contrib/platform/greenplum/bend/linux

+enable_event_thread_support=yes
+enable_opal_multi_threads=yes
+enable_orte_progress_threads=yes
+enable_ft_thread=no
+enable_mem_debug=no
+enable_mem_profile=no
+enable_debug_symbols=yes
+enable_binaries=yes
+enable_heterogeneous=no
+enable_picky=yes
+enable_debug=yes
+enable_shared=yes
+enable_static=no
+enable_memchecker=no
+enable_ipv6=yes
+enable_mpi_fortran=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_cxx_exceptions=no
+enable_mpi_java=yes
+enable_io_romio=no
+enable_vt=no
+enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm,filem-rsh
+enable_contrib_no_build=libnbc,vt
+with_memory_manager=no
+with_tm=no
+with_slurm=no
+with_devel_headers=yes
+with_portals=no
+with_valgrind=no

contrib/platform/greenplum/bend/linux-optimized

+enable_event_thread_support=yes
+enable_opal_multi_threads=yes
+enable_orte_progress_threads=yes
+enable_ft_thread=no
+enable_mem_debug=no
+enable_mem_profile=no
+enable_debug_symbols=no
+enable_binaries=yes
+enable_heterogeneous=no
+enable_picky=no
+enable_debug=no
+enable_shared=yes
+enable_static=no
+enable_memchecker=no
+enable_ipv6=no
+enable_mpi_fortran=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_cxx_exceptions=no
+enable_mpi_java=yes
+enable_io_romio=no
+enable_vt=no
+enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm,filem-rsh
+enable_contrib_no_build=libnbc,vt
+with_memory_manager=no
+with_tm=no
+with_slurm=no
+with_devel_headers=yes
+with_portals=no
+with_valgrind=no

contrib/platform/greenplum/bend/linux-optimized.conf

+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This is the default system-wide MCA parameters defaults file.
+# Specifically, the MCA parameter "mca_param_files" defaults to a
+# value of
+# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
+# (this file is the latter of the two).  So if the default value of
+# mca_param_files is not changed, this file is used to set system-wide
+# MCA parameters.  This file can therefore be used to set system-wide
+# default MCA parameters for all users.  Of course, users can override
+# these values if they want, but this file is an excellent location
+# for setting system-specific MCA parameters for those users who don't
+# know / care enough to investigate the proper values for them.
+
+# Note that this file is only applicable where it is visible (in a
+# filesystem sense).  Specifically, MPI processes each read this file
+# during their startup to determine what default values for MCA
+# parameters should be used.  mpirun does not bundle up the values in
+# this file from the node where it was run and send them to all nodes;
+# the default value decisions are effectively distributed.  Hence,
+# these values are only applicable on nodes that "see" this file.  If
+# $sysconf is a directory on a local disk, it is likely that changes
+# to this file will need to be propagated to other nodes.  If $sysconf
+# is a directory that is shared via a networked filesystem, changes to
+# this file will be visible to all nodes that share this $sysconf.
+
+# The format is straightforward: one per line, mca_param_name =
+# rvalue.  Quoting is ignored (so if you use quotes or escape
+# characters, they'll be included as part of the value).  For example:
+
+# Disable run-time MPI parameter checking
+#   mpi_param_check = 0
+
+# Note that the value "~/" will be expanded to the current user's home
+# directory.  For example:
+
+# Change component loading path
+#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
+
+# See "ompi_info --param all all" for a full listing of Open MPI MCA
+# parameters available and their default values.
+#
+
+# Basic behavior to smooth startup
+mca_component_show_load_errors = 0
+mpi_param_check = 0 
+orte_abort_timeout = 10 
+hwloc_base_mem_bind_failure_action = silent
+
+## Protect the shared file systems
+
+## Add the interface for out-of-band communication
+## and set it up
+oob_tcp_peer_retries = 120 
+#oob_tcp_connect_timeout=600 
+
+## Define the MPI interconnects
+btl = sm,tcp,self 
+
+## Setup shared memory
+btl_sm_free_list_max = 768

contrib/platform/greenplum/bend/linux.conf

+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This is the default system-wide MCA parameters defaults file.
+# Specifically, the MCA parameter "mca_param_files" defaults to a
+# value of
+# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
+# (this file is the latter of the two).  So if the default value of
+# mca_param_files is not changed, this file is used to set system-wide
+# MCA parameters.  This file can therefore be used to set system-wide
+# default MCA parameters for all users.  Of course, users can override
+# these values if they want, but this file is an excellent location
+# for setting system-specific MCA parameters for those users who don't
+# know / care enough to investigate the proper values for them.
+
+# Note that this file is only applicable where it is visible (in a
+# filesystem sense).  Specifically, MPI processes each read this file
+# during their startup to determine what default values for MCA
+# parameters should be used.  mpirun does not bundle up the values in
+# this file from the node where it was run and send them to all nodes;
+# the default value decisions are effectively distributed.  Hence,
+# these values are only applicable on nodes that "see" this file.  If
+# $sysconf is a directory on a local disk, it is likely that changes
+# to this file will need to be propagated to other nodes.  If $sysconf
+# is a directory that is shared via a networked filesystem, changes to
+# this file will be visible to all nodes that share this $sysconf.
+
+# The format is straightforward: one per line, mca_param_name =
+# rvalue.  Quoting is ignored (so if you use quotes or escape
+# characters, they'll be included as part of the value).  For example:
+
+# Disable run-time MPI parameter checking
+#   mpi_param_check = 0
+
+# Note that the value "~/" will be expanded to the current user's home
+# directory.  For example:
+
+# Change component loading path
+#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
+
+# See "ompi_info --param all all" for a full listing of Open MPI MCA
+# parameters available and their default values.
+#
+
+#default hostfile
+orte_default_hostfile=/home/common/hosts
+
+# Basic behavior to smooth startup
+mca_component_show_load_errors = 1
+mpi_param_check = 0 
+orte_abort_timeout = 10 
+hwloc_base_mem_bind_failure_action = silent
+
+## Protect the shared file systems
+
+## Add the interface for out-of-band communication
+## and set it up
+oob_tcp_peer_retries = 120 
+#oob_tcp_connect_timeout=600 
+
+## Define the MPI interconnects
+btl = sm,tcp,self 
+
+## Setup shared memory
+btl_sm_free_list_max = 768

contrib/platform/greenplum/bend/mac

+enable_event_thread_support=yes
+enable_opal_multi_threads=yes
+enable_orte_progress_threads=yes
+enable_mem_debug=yes
+enable_mem_profile=no
+enable_debug_symbols=yes
+enable_binaries=yes
+enable_heterogeneous=no
+enable_picky=yes
+enable_debug=yes
+enable_shared=yes
+enable_static=no
+enable_io_romio=no
+enable_ipv6=yes
+enable_mpi_fortran=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_mpi_java=yes
+enable_memchecker=no
+enable_vt=no
+enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm,filem-rsh
+enable_contrib_no_build=libnbc,vt
+with_memory_manager=no
+with_devel_headers=yes
+with_xgrid=no
+with_slurm=no
+with_jdk_bindir=/usr/bin
+with_jdk_headers=/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers

contrib/platform/greenplum/bend/mac-optimized

+enable_event_thread_support=yes
+enable_opal_multi_threads=yes
+enable_orte_progress_threads=yes
+enable_mem_debug=no
+enable_mem_profile=no
+enable_debug_symbols=no
+enable_binaries=yes
+enable_heterogeneous=no
+enable_picky=no
+enable_debug=no
+enable_shared=yes
+enable_static=no
+enable_io_romio=no
+enable_ipv6=no
+enable_mpi_fortran=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_mpi_java=yes
+enable_memchecker=no
+enable_vt=no
+enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm,filem-rsh
+enable_contrib_no_build=libnbc,vt
+with_memory_manager=no
+with_devel_headers=yes
+with_xgrid=no
+with_slurm=no
+with_jdk_bindir=/usr/bin
+with_jdk_headers=/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers

contrib/platform/greenplum/bend/mac-optimized.conf

+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This is the default system-wide MCA parameters defaults file.
+# Specifically, the MCA parameter "mca_param_files" defaults to a
+# value of
+# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
+# (this file is the latter of the two).  So if the default value of
+# mca_param_files is not changed, this file is used to set system-wide
+# MCA parameters.  This file can therefore be used to set system-wide
+# default MCA parameters for all users.  Of course, users can override
+# these values if they want, but this file is an excellent location
+# for setting system-specific MCA parameters for those users who don't
+# know / care enough to investigate the proper values for them.
+
+# Note that this file is only applicable where it is visible (in a
+# filesystem sense).  Specifically, MPI processes each read this file
+# during their startup to determine what default values for MCA
+# parameters should be used.  mpirun does not bundle up the values in
+# this file from the node where it was run and send them to all nodes;
+# the default value decisions are effectively distributed.  Hence,
+# these values are only applicable on nodes that "see" this file.  If
+# $sysconf is a directory on a local disk, it is likely that changes
+# to this file will need to be propagated to other nodes.  If $sysconf
+# is a directory that is shared via a networked filesystem, changes to
+# this file will be visible to all nodes that share this $sysconf.
+
+# The format is straightforward: one per line, mca_param_name =
+# rvalue.  Quoting is ignored (so if you use quotes or escape
+# characters, they'll be included as part of the value).  For example:
+
+# Disable run-time MPI parameter checking
+#   mpi_param_check = 0
+
+# Note that the value "~/" will be expanded to the current user's home
+# directory.  For example:
+
+# Change component loading path
+#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
+
+# See "ompi_info --param all all" for a full listing of Open MPI MCA
+# parameters available and their default values.
+#
+
+# Basic behavior to smooth startup
+mca_component_show_load_errors = 0
+mpi_param_check = 0 
+orte_abort_timeout = 10 
+hwloc_base_mem_bind_failure_action = silent
+
+## Protect the shared file systems
+
+## Add the interface for out-of-band communication
+## and set it up
+oob_tcp_peer_retries = 120 
+#oob_tcp_connect_timeout=600 
+
+## Define the MPI interconnects
+btl = sm,tcp,self 
+
+## Setup shared memory
+btl_sm_free_list_max = 768

contrib/platform/greenplum/bend/mac.conf

+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This is the default system-wide MCA parameters defaults file.
+# Specifically, the MCA parameter "mca_param_files" defaults to a
+# value of
+# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
+# (this file is the latter of the two).  So if the default value of
+# mca_param_files is not changed, this file is used to set system-wide
+# MCA parameters.  This file can therefore be used to set system-wide
+# default MCA parameters for all users.  Of course, users can override
+# these values if they want, but this file is an excellent location
+# for setting system-specific MCA parameters for those users who don't
+# know / care enough to investigate the proper values for them.
+
+# Note that this file is only applicable where it is visible (in a
+# filesystem sense).  Specifically, MPI processes each read this file
+# during their startup to determine what default values for MCA
+# parameters should be used.  mpirun does not bundle up the values in
+# this file from the node where it was run and send them to all nodes;
+# the default value decisions are effectively distributed.  Hence,
+# these values are only applicable on nodes that "see" this file.  If
+# $sysconf is a directory on a local disk, it is likely that changes
+# to this file will need to be propagated to other nodes.  If $sysconf
+# is a directory that is shared via a networked filesystem, changes to
+# this file will be visible to all nodes that share this $sysconf.
+
+# The format is straightforward: one per line, mca_param_name =
+# rvalue.  Quoting is ignored (so if you use quotes or escape
+# characters, they'll be included as part of the value).  For example:
+
+# Disable run-time MPI parameter checking
+#   mpi_param_check = 0
+
+# Note that the value "~/" will be expanded to the current user's home
+# directory.  For example:
+
+# Change component loading path
+#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
+
+# See "ompi_info --param all all" for a full listing of Open MPI MCA
+# parameters available and their default values.
+#
+
+# Basic behavior to smooth startup
+mca_component_show_load_errors = 1
+mpi_param_check = 0 
+orte_abort_timeout = 10 
+hwloc_base_mem_bind_failure_action = silent
+
+## Protect the shared file systems
+
+## Add the interface for out-of-band communication
+## and set it up
+oob_tcp_peer_retries = 120 
+#oob_tcp_connect_timeout=600 
+
+## Define the MPI interconnects
+btl = sm,tcp,self 
+
+## Setup shared memory
+btl_sm_free_list_max = 768

contrib/platform/greenplum/mrplus/linux-optimized

+enable_event_thread_support=yes
+enable_opal_multi_threads=yes
+enable_orte_progress_threads=yes
 enable_ft_thread=no
 enable_mem_debug=no
 enable_mem_profile=no

contrib/platform/greenplum/mrplus/linux-optimized.conf

 #
 
 # setup for MapReduce behavior
-state_staged_select = 1
+orte_staged_execution = 1
 filem_raw_flatten_directory_trees = 1
 orte_set_default_slots = cores
 orte_soft_locations = 1
+orte_allowed_exit_without_sync = 1
+orte_retain_aliases = 1
 
 # Basic behavior to smooth startup
-mca_component_show_load_errors = 0
+mca_component_show_load_errors = 1
 mpi_param_check = 0 
 orte_abort_timeout = 10 
 hwloc_base_mem_bind_failure_action = silent

contrib/platform/greenplum/mrplus/linux.conf

 #
 
 # setup for MapReduce behavior
-state_staged_select = 1
+orte_staged_execution = 1
 filem_raw_flatten_directory_trees = 1
 orte_set_default_slots = cores
 orte_soft_locations = 1
+orte_allowed_exit_without_sync = 1
+orte_retain_aliases = 1
 
 # Basic behavior to smooth startup
-mca_component_show_load_errors = 0
+mca_component_show_load_errors = 1
 mpi_param_check = 0 
 orte_abort_timeout = 10 
 hwloc_base_mem_bind_failure_action = silent

contrib/platform/greenplum/mrplus/mac-optimized

+enable_event_thread_support=yes
+enable_opal_multi_threads=yes
+enable_orte_progress_threads=yes
 enable_mem_debug=no
 enable_mem_profile=no
 enable_debug_symbols=no

contrib/platform/greenplum/mrplus/mac-optimized.conf

 #
 
 # setup for MapReduce behavior
-state_staged_select = 1
+orte_staged_execution = 1
 filem_raw_flatten_directory_trees = 1
 orte_set_default_slots = cores
 orte_soft_locations = 1
+orte_allowed_exit_without_sync = 1
+orte_retain_aliases = 1
 
 # Basic behavior to smooth startup
-mca_component_show_load_errors = 0
+mca_component_show_load_errors = 1
 mpi_param_check = 0 
 orte_abort_timeout = 10 
 hwloc_base_mem_bind_failure_action = silent

contrib/platform/greenplum/mrplus/mac.conf

 #
 
 # setup for MapReduce behavior
-state_staged_select = 1
+orte_staged_execution = 1
 filem_raw_flatten_directory_trees = 1
 orte_set_default_slots = cores
 orte_soft_locations = 1
+orte_allowed_exit_without_sync = 1
+orte_retain_aliases = 1
 
 # Basic behavior to smooth startup
-mca_component_show_load_errors = 0
+mca_component_show_load_errors = 1
 mpi_param_check = 0 
 orte_abort_timeout = 10 
 hwloc_base_mem_bind_failure_action = silent

contrib/platform/greenplum/xconnect/linux

+enable_event_thread_support=yes
+enable_opal_multi_threads=yes
+enable_orte_progress_threads=yes
+enable_ft_thread=no
+enable_mem_debug=no
+enable_mem_profile=no
+enable_debug_symbols=yes
+enable_binaries=yes
+enable_heterogeneous=no
+enable_picky=yes
+enable_debug=yes
+enable_shared=yes
+enable_static=no
+enable_memchecker=no
+enable_ipv6=yes
+enable_mpi_fortran=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_cxx_exceptions=no
+enable_mpi_java=no
+enable_io_romio=no
+enable_vt=no
+enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm,filem-rsh
+enable_contrib_no_build=libnbc,vt
+with_memory_manager=no
+with_tm=no
+with_slurm=no
+with_devel_headers=yes
+with_portals=no
+with_valgrind=no

contrib/platform/greenplum/xconnect/linux-optimized

+enable_event_thread_support=yes
+enable_opal_multi_threads=yes
+enable_orte_progress_threads=yes
+enable_ft_thread=no
+enable_mem_debug=no
+enable_mem_profile=no
+enable_debug_symbols=no
+enable_binaries=yes
+enable_heterogeneous=no
+enable_picky=no
+enable_debug=no
+enable_shared=yes
+enable_static=no
+enable_memchecker=no
+enable_ipv6=no
+enable_mpi_fortran=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_cxx_exceptions=no
+enable_mpi_java=no
+enable_io_romio=no
+enable_vt=no
+enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm,filem-rsh
+enable_contrib_no_build=libnbc,vt
+with_memory_manager=no
+with_tm=no
+with_slurm=no
+with_devel_headers=yes
+with_portals=no
+with_valgrind=no

contrib/platform/greenplum/xconnect/linux-optimized.conf

+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This is the default system-wide MCA parameters defaults file.
+# Specifically, the MCA parameter "mca_param_files" defaults to a
+# value of
+# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
+# (this file is the latter of the two).  So if the default value of
+# mca_param_files is not changed, this file is used to set system-wide
+# MCA parameters.  This file can therefore be used to set system-wide
+# default MCA parameters for all users.  Of course, users can override
+# these values if they want, but this file is an excellent location
+# for setting system-specific MCA parameters for those users who don't
+# know / care enough to investigate the proper values for them.
+
+# Note that this file is only applicable where it is visible (in a
+# filesystem sense).  Specifically, MPI processes each read this file
+# during their startup to determine what default values for MCA
+# parameters should be used.  mpirun does not bundle up the values in
+# this file from the node where it was run and send them to all nodes;
+# the default value decisions are effectively distributed.  Hence,
+# these values are only applicable on nodes that "see" this file.  If
+# $sysconf is a directory on a local disk, it is likely that changes
+# to this file will need to be propagated to other nodes.  If $sysconf
+# is a directory that is shared via a networked filesystem, changes to
+# this file will be visible to all nodes that share this $sysconf.
+
+# The format is straightforward: one per line, mca_param_name =
+# rvalue.  Quoting is ignored (so if you use quotes or escape
+# characters, they'll be included as part of the value).  For example:
+
+# Disable run-time MPI parameter checking
+#   mpi_param_check = 0
+
+# Note that the value "~/" will be expanded to the current user's home
+# directory.  For example:
+
+# Change component loading path
+#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
+
+# See "ompi_info --param all all" for a full listing of Open MPI MCA
+# parameters available and their default values.
+#
+
+# Basic behavior to smooth startup
+mca_component_show_load_errors = 0
+mpi_param_check = 0 
+orte_abort_timeout = 10 
+hwloc_base_mem_bind_failure_action = silent
+
+## Protect the shared file systems
+
+## Add the interface for out-of-band communication
+## and set it up
+oob_tcp_peer_retries = 120 
+#oob_tcp_connect_timeout=600 
+
+## Define the MPI interconnects
+btl = sm,tcp,self 
+
+## Setup shared memory
+btl_sm_free_list_max = 768

contrib/platform/greenplum/xconnect/linux.conf

+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This is the default system-wide MCA parameters defaults file.
+# Specifically, the MCA parameter "mca_param_files" defaults to a
+# value of
+# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
+# (this file is the latter of the two).  So if the default value of
+# mca_param_files is not changed, this file is used to set system-wide
+# MCA parameters.  This file can therefore be used to set system-wide
+# default MCA parameters for all users.  Of course, users can override
+# these values if they want, but this file is an excellent location
+# for setting system-specific MCA parameters for those users who don't
+# know / care enough to investigate the proper values for them.
+
+# Note that this file is only applicable where it is visible (in a
+# filesystem sense).  Specifically, MPI processes each read this file
+# during their startup to determine what default values for MCA
+# parameters should be used.  mpirun does not bundle up the values in
+# this file from the node where it was run and send them to all nodes;
+# the default value decisions are effectively distributed.  Hence,
+# these values are only applicable on nodes that "see" this file.  If
+# $sysconf is a directory on a local disk, it is likely that changes
+# to this file will need to be propagated to other nodes.  If $sysconf
+# is a directory that is shared via a networked filesystem, changes to
+# this file will be visible to all nodes that share this $sysconf.
+
+# The format is straightforward: one per line, mca_param_name =
+# rvalue.  Quoting is ignored (so if you use quotes or escape
+# characters, they'll be included as part of the value).  For example:
+
+# Disable run-time MPI parameter checking
+#   mpi_param_check = 0
+
+# Note that the value "~/" will be expanded to the current user's home
+# directory.  For example:
+
+# Change component loading path
+#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
+
+# See "ompi_info --param all all" for a full listing of Open MPI MCA
+# parameters available and their default values.
+#
+
+# Basic behavior to smooth startup
+mca_component_show_load_errors = 1
+mpi_param_check = 0 
+orte_abort_timeout = 10 
+hwloc_base_mem_bind_failure_action = silent
+
+## Protect the shared file systems
+
+## Add the interface for out-of-band communication
+## and set it up
+oob_tcp_peer_retries = 120 
+#oob_tcp_connect_timeout=600 
+
+## Define the MPI interconnects
+btl = sm,tcp,self 
+
+## Setup shared memory
+btl_sm_free_list_max = 768

contrib/platform/greenplum/xconnect/mac

+enable_event_thread_support=yes
+enable_opal_multi_threads=yes
+enable_orte_progress_threads=yes
+enable_mem_debug=yes
+enable_mem_profile=no
+enable_debug_symbols=yes
+enable_binaries=yes
+enable_heterogeneous=no
+enable_picky=yes
+enable_debug=yes
+enable_shared=yes
+enable_static=no
+enable_io_romio=no
+enable_ipv6=yes
+enable_mpi_fortran=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_mpi_java=no
+enable_memchecker=no
+enable_vt=no
+enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm,filem-rsh
+enable_contrib_no_build=libnbc,vt
+with_memory_manager=no
+with_devel_headers=yes
+with_xgrid=no
+with_slurm=no

contrib/platform/greenplum/xconnect/mac-optimized

+enable_event_thread_support=yes
+enable_opal_multi_threads=yes
+enable_orte_progress_threads=yes
+enable_mem_debug=no
+enable_mem_profile=no
+enable_debug_symbols=no
+enable_binaries=yes
+enable_heterogeneous=no
+enable_picky=no
+enable_debug=no
+enable_shared=yes
+enable_static=no
+enable_io_romio=no
+enable_ipv6=no
+enable_mpi_fortran=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_mpi_java=no
+enable_memchecker=no
+enable_vt=no
+enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm,filem-rsh
+enable_contrib_no_build=libnbc,vt
+with_memory_manager=no
+with_devel_headers=yes
+with_xgrid=no
+with_slurm=no

contrib/platform/greenplum/xconnect/mac-optimized.conf

+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This is the default system-wide MCA parameters defaults file.
+# Specifically, the MCA parameter "mca_param_files" defaults to a
+# value of
+# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
+# (this file is the latter of the two).  So if the default value of
+# mca_param_files is not changed, this file is used to set system-wide
+# MCA parameters.  This file can therefore be used to set system-wide
+# default MCA parameters for all users.  Of course, users can override
+# these values if they want, but this file is an excellent location
+# for setting system-specific MCA parameters for those users who don't
+# know / care enough to investigate the proper values for them.
+
+# Note that this file is only applicable where it is visible (in a
+# filesystem sense).  Specifically, MPI processes each read this file
+# during their startup to determine what default values for MCA
+# parameters should be used.  mpirun does not bundle up the values in
+# this file from the node where it was run and send them to all nodes;
+# the default value decisions are effectively distributed.  Hence,
+# these values are only applicable on nodes that "see" this file.  If
+# $sysconf is a directory on a local disk, it is likely that changes
+# to this file will need to be propagated to other nodes.  If $sysconf
+# is a directory that is shared via a networked filesystem, changes to
+# this file will be visible to all nodes that share this $sysconf.
+
+# The format is straightforward: one per line, mca_param_name =
+# rvalue.  Quoting is ignored (so if you use quotes or escape
+# characters, they'll be included as part of the value).  For example:
+
+# Disable run-time MPI parameter checking
+#   mpi_param_check = 0
+
+# Note that the value "~/" will be expanded to the current user's home
+# directory.  For example:
+
+# Change component loading path
+#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
+
+# See "ompi_info --param all all" for a full listing of Open MPI MCA
+# parameters available and their default values.
+#
+
+# Basic behavior to smooth startup
+mca_component_show_load_errors = 0
+mpi_param_check = 0 
+orte_abort_timeout = 10 
+hwloc_base_mem_bind_failure_action = silent
+
+## Protect the shared file systems
+
+## Add the interface for out-of-band communication
+## and set it up
+oob_tcp_peer_retries = 120 
+#oob_tcp_connect_timeout=600 
+
+## Define the MPI interconnects
+btl = sm,tcp,self 
+
+## Setup shared memory
+btl_sm_free_list_max = 768

contrib/platform/greenplum/xconnect/mac.conf

+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This is the default system-wide MCA parameters defaults file.
+# Specifically, the MCA parameter "mca_param_files" defaults to a
+# value of
+# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
+# (this file is the latter of the two).  So if the default value of
+# mca_param_files is not changed, this file is used to set system-wide
+# MCA parameters.  This file can therefore be used to set system-wide
+# default MCA parameters for all users.  Of course, users can override
+# these values if they want, but this file is an excellent location
+# for setting system-specific MCA parameters for those users who don't
+# know / care enough to investigate the proper values for them.
+
+# Note that this file is only applicable where it is visible (in a
+# filesystem sense).  Specifically, MPI processes each read this file
+# during their startup to determine what default values for MCA
+# parameters should be used.  mpirun does not bundle up the values in
+# this file from the node where it was run and send them to all nodes;
+# the default value decisions are effectively distributed.  Hence,
+# these values are only applicable on nodes that "see" this file.  If
+# $sysconf is a directory on a local disk, it is likely that changes
+# to this file will need to be propagated to other nodes.  If $sysconf
+# is a directory that is shared via a networked filesystem, changes to
+# this file will be visible to all nodes that share this $sysconf.
+
+# The format is straightforward: one per line, mca_param_name =
+# rvalue.  Quoting is ignored (so if you use quotes or escape
+# characters, they'll be included as part of the value).  For example:
+
+# Disable run-time MPI parameter checking
+#   mpi_param_check = 0
+
+# Note that the value "~/" will be expanded to the current user's home
+# directory.  For example:
+
+# Change component loading path
+#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
+
+# See "ompi_info --param all all" for a full listing of Open MPI MCA
+# parameters available and their default values.
+#
+
+# Basic behavior to smooth startup
+mca_component_show_load_errors = 1
+mpi_param_check = 0 
+orte_abort_timeout = 10 
+hwloc_base_mem_bind_failure_action = silent
+
+## Protect the shared file systems
+
+## Add the interface for out-of-band communication
+## and set it up
+oob_tcp_peer_retries = 120 
+#oob_tcp_connect_timeout=600 
+
+## Define the MPI interconnects
+btl = sm,tcp,self 
+
+## Setup shared memory
+btl_sm_free_list_max = 768

ompi/config/ompi_check_libfca.m4

 				   [fca_api.h],
 				   [$ompi_check_fca_libs],
 				   [fca_get_version],
-				   [],
+				   [-l$ompi_check_fca_libs],
 				   [$ompi_check_fca_dir],
 				   [$ompi_check_fca_libdir],
 				   [ompi_check_fca_happy="yes"],

ompi/contrib/vt/configure.m4

     if test "$contrib_vt_happy" = "1"; then
         contrib_vt_args="--disable-option-checking --with-openmpi-inside=1.7"
 
-        contrib_vt_skip=no
         eval "set x $ac_configure_args"; shift
         for contrib_vt_arg
         do
-            if test "$contrib_vt_skip" = "yes"; then
-                contrib_vt_skip=no
-            else
+            case $contrib_vt_arg in
+            -with-contrib-vt-flags | --with-contrib-vt-flags | -with-contrib-vt-flags=* | --with-contrib-vt-flags=*)
+                ;;
+            -with-platform=* | --with-platform=*)
+                ;;
+            -with-cuda | --with-cuda | -with-cuda=* | --with-cuda=*)
+                if test "x$with_cuda" != "xno" -a "x$with_cuda" != "x"; then
+                    contrib_vt_args="$contrib_vt_args '--with-cuda-dir=$with_cuda' '--with-cuda-libdir=$with_cuda_libdir'"
+                fi
+                ;;
+            -with-cuda-libdir | --with-cuda-libdir | -with-cuda-libdir=* | --with-cuda-libdir=*)
+                ;;
+            *)
                 case $contrib_vt_arg in
-                -with-contrib-vt-flags | --with-contrib-vt-flags)
-                    contrib_vt_skip=yes
-                    ;;
-                -with-contrib-vt-flags=* | --with-contrib-vt-flags=*)
-                    ;;
-                -with-platform | --with-platform)
-                    contrib_vt_skip=yes
-                    ;;
-                -with-platform=* | --with-platform=*)
-                    ;;
-                *)
-                    case $contrib_vt_arg in
-                    *\'*) contrib_vt_arg=`echo "$contrib_vt_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-                    esac
-                    contrib_vt_args="$contrib_vt_args '$contrib_vt_arg'"
-                    ;;
+                *\'*) contrib_vt_arg=`echo "$contrib_vt_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
                 esac
-            fi
+                contrib_vt_args="$contrib_vt_args '$contrib_vt_arg'"
+                ;;
+            esac
         done
 
         contrib_vt_args="$contrib_vt_args $with_contrib_vt_flags"

ompi/contrib/vt/vt/ChangeLog

-5.13.1openmpi
-	- updated version of internal OTF to 1.11.2openmpi
+5.14.1openmpi
+	- updated version of internal OTF to 1.12.2openmpi
 	  (see extlib/otf/ChangeLog)
+	- append "/vampirtrace" to DATADIR, if configuring inside Open MPI and
+	  DATADIR doesn't points to the default (=DATAROOTDIR)
+	  (prevents conflicts with the libtool RPM)
+
+5.14openmpi
+	- updated version of internal OTF to 1.12.1openmpi
+	  (see extlib/otf/ChangeLog)
+	- added support for filtering functions of specific call paths
+	- introduced new environment variable VT_MPI_IGNORE_FILTER to
+	  enable/disable recording of MPI communication events although its
+	  corresponding functions are filtered
+	- fixed undefined reference error for vt_get_mpi_f_in_place___ when
+	  linking the Fortran MPI wrapper library (libvt-fmpi) built for
+	  SGI-MPT (--with-sgimpt)
 	- compiler wrappers:
+		- added option '-vt:inst-exclude-file[-list]' to exclude source
+		  files from the automatic instrumentation by the compiler or
+		  PDT/TAU
+		- added option '-vt:opari-exclude-file[-list]' to exclude source
+		  files from the instrumentation of OpenMP constructs by OPARI
+		- consider preprocessed files (-vt:preprocess) for reuse
+		  (-vt:reusefiles)
+		- do additionally scan for comments (pdbcomment) if performing
+		  PDT/TAU instrumentation to prevent instrumenting functions
+		  within comments
+	- OPARI: (see tools/opari/ChangeLog:26,27)
+
+5.13.2
+	- added support for IBM BlueGene/Q
+	- added support for PAPI 5 (aka PAPI-V)
+	- fixed CUDA runtime API wrapper for CUDA 5 
+	- fixed "Cannot find communicator" error occurred when completing
+	  a non-blocking MPI communication using an already freed communicator
+	  (e.g. MPI_Irecv(...,comm,...), MPI_Comm_free(comm), MPI_Wait())
+	- fixed 'gnu' compiler instrumentation for functions defined within
+	  shared objects
+	- vtunify:
+		- disable OpenMP parallelization if PGI compiler version < 9
+		  is used (threadprivate not supported)
+	- OPARI: (see tools/opari/ChangeLog:24,25)
+
+5.13.1
+	- updated version of internal OTF to 1.11.2goldfish
+	  (see extlib/otf/ChangeLog)
+	- use high precision timer RTC on Cray XE/XK6 platforms using the
+	  Cray compiler
+	- fixed parsing symbol list file given by VT_GNU_NMFILE if it is
+	  generated by nm with multiple input files
+	- compiler wrappers:
+		- added detection of Cray compiler's OpenMP flag (-h omp) to
+		  enable OPARI instrumentation
+		- add OPARI option '-nosrc' when using the Cray compiler
+		  (at least the Fortran compiler does not understand
+		   #line constructs)
 		- vtnvcc:
 			- add path to cuda.h to the PDT parser command
 			- exclude *.cu source files from instrumenting with
 		- enhanced precision of timestamp conversion from local 
 		  to global 
 
-5.13openmpi
+5.13
 	- updated version of internal OTF to 1.11.1goldfish
 	  (see extlib/otf/ChangeLog)
 	- added support for highly parallel trace writing using the 

ompi/contrib/vt/vt/INSTALL

                               give the command for PDT Fortran source code parser,
                               default: f95parse, f90parse, or gfparse
 
+      --with-pdt-comment=PDTCOMMENT
+                              give the command for PDT comment parser,
+                              default: pdbcomment
+
       --with-papi-dir=PAPIDIR
                               give the path for PAPI, default: /usr
 
         (e.g. RANLIB, AR, MPICC, CXXFLAGS).
 
     Examples:
-      BlueGene/P:
+      BlueGene/P and BlueGene/Q:
         % ./configure --host=powerpc64-ibm-linux-gnu
 
       Cray XK6:

ompi/contrib/vt/vt/Makefile.am

 	VERSION \
 	config/defaults/bgl \
 	config/defaults/bgp \
+	config/defaults/bgq \
 	config/defaults/crayxt \
 	config/defaults/crayxe \
 	config/defaults/ibm \

ompi/contrib/vt/vt/VERSION

-5.13.1openmpi
+5.14.1openmpi

ompi/contrib/vt/vt/config/defaults/bgq

+CC="bgxlc_r"
+CXX="bgxlC_r"
+FC="bgxlf95_r"
+MPICC="mpixlc_r"
+MPICXX="mpixlcxx_r"
+CFLAGS="-O3 -qstrict"
+CXXFLAGS="-O3 -qstrict -qminimaltoc"
+CC_FOR_BUILD="xlc_r"
+CXX_FOR_BUILD="xlC_r"
+CFLAGS_FOR_BUILD="-O3 -qstrict"
+CXXFLAGS_FOR_BUILD="-O3 -qstrict"
+enable_shared="no"
+with_cross_prefix="bg"
+with_mpibgq="yes"
+with_cxxrtlib="-L/opt/ibmcmp/vacpp/bg/12.1/bglib64 -libmc++ -lstdc++"
+with_shlibc="/lib64/libc.so.6"
+
+# Disable compiler optimization for the OTF library to work around a
+# not yet evaluated segmentation fault occurs when flushing the trace buffer.
+with_otf_flags="CFLAGS=-O0"

ompi/contrib/vt/vt/config/m4/acinclude.compwrap.m4

 	VT_WRAPPER_CC_TAUINST_OPTS=
 	VT_WRAPPER_CC_TAUINST_PARSE_BIN=
 	VT_WRAPPER_CC_TAUINST_PARSE_OPTS=
+	VT_WRAPPER_CC_TAUINST_COMMENT_BIN=
+	VT_WRAPPER_CC_TAUINST_COMMENT_OPTS=
 	VT_WRAPPER_CC_COMPINST_COMPILER_FLAGS=
 	VT_WRAPPER_CC_DEFAULT_PARTYPE="seq"
 
 	VT_WRAPPER_CXX_TAUINST_OPTS=
 	VT_WRAPPER_CXX_TAUINST_PARSE_BIN=
 	VT_WRAPPER_CXX_TAUINST_PARSE_OPTS=
+	VT_WRAPPER_CXX_TAUINST_COMMENT_BIN=
+	VT_WRAPPER_CXX_TAUINST_COMMENT_OPTS=
 	VT_WRAPPER_CXX_COMPINST_COMPILER_FLAGS=
 	VT_WRAPPER_CXX_DEFAULT_PARTYPE="seq"
 
 	VT_WRAPPER_FC_TAUINST_OPTS=
 	VT_WRAPPER_FC_TAUINST_PARSE_BIN=
 	VT_WRAPPER_FC_TAUINST_PARSE_OPTS=
+	VT_WRAPPER_FC_TAUINST_COMMENT_BIN=
+	VT_WRAPPER_FC_TAUINST_COMMENT_OPTS=
 	VT_WRAPPER_FC_COMPINST_COMPILER_FLAGS=
 	VT_WRAPPER_FC_DEFAULT_PARTYPE="seq"
 
 	VT_WRAPPER_NVCC_EXTRA_LIBS=
 	VT_WRAPPER_NVCC_CPP=$CPP
 	VT_WRAPPER_NVCC_EXTRA_CPPFLAGS=
-
 	VT_WRAPPER_NVCC_DYNINST_COMPILER_FLAGS=
 	VT_WRAPPER_NVCC_TAUINST_OPTS=
 	VT_WRAPPER_NVCC_TAUINST_PARSE_BIN=
 	VT_WRAPPER_NVCC_TAUINST_PARSE_OPTS=
+	VT_WRAPPER_NVCC_TAUINST_COMMENT_BIN=
+	VT_WRAPPER_NVCC_TAUINST_COMMENT_OPTS=
 	VT_WRAPPER_NVCC_COMPINST_COMPILER_FLAGS=
 	VT_WRAPPER_NVCC_AVAIL_INST="manual"
 	VT_WRAPPER_NVCC_DEFAULT_INST="manual"
 		VT_WRAPPER_NVCC_EXTRA_LINKER_FLAGS="$VT_WRAPPER_NVCC_EXTRA_LINKER_FLAGS -Wl,-force_flat_namespace"
 	])
 
-	AS_IF([test "$PLATFORM" = "bgp" -a x"$enable_shared" = "xyes"],
+	AS_IF([test x"$enable_shared" = "xyes"],
 	[
-		VT_WRAPPER_CC_EXTRA_LINKER_FLAGS="$VT_WRAPPER_CC_EXTRA_LINKER_FLAGS -Wl,-dy"
-		VT_WRAPPER_CXX_EXTRA_LINKER_FLAGS="$VT_WRAPPER_CXX_EXTRA_LINKER_FLAGS -Wl,-dy"
-		VT_WRAPPER_FC_EXTRA_LINKER_FLAGS="$VT_WRAPPER_FC_EXTRA_LINKER_FLAGS -Wl,-dy"
-		VT_WRAPPER_NVCC_EXTRA_LINKER_FLAGS="$VT_WRAPPER_NVCC_EXTRA_LINKER_FLAGS -Wl,-dy"
+		case $PLATFORM in
+			bgp | bgq)
+				VT_WRAPPER_CC_EXTRA_LINKER_FLAGS="$VT_WRAPPER_CC_EXTRA_LINKER_FLAGS -Wl,-dy"
+				VT_WRAPPER_CXX_EXTRA_LINKER_FLAGS="$VT_WRAPPER_CXX_EXTRA_LINKER_FLAGS -Wl,-dy"
+				VT_WRAPPER_FC_EXTRA_LINKER_FLAGS="$VT_WRAPPER_FC_EXTRA_LINKER_FLAGS -Wl,-dy"
+				VT_WRAPPER_NVCC_EXTRA_LINKER_FLAGS="$VT_WRAPPER_NVCC_EXTRA_LINKER_FLAGS -Wl,-dy"
+				;;
+		esac
 	])
 
 	AS_IF([test x"$compinst_type" = "xpgi9" -o x"$compinst_type" = "xcraycce"],
 					VT_WRAPPER_OPARI_OPTS="-nodecl"
 					break
 					;;
+				*Cray\ C*)
+					VT_WRAPPER_OPARI_OPTS="-nosrc"
+					break
+					;;
 			esac
 		done
 
 		VT_WRAPPER_CC_TAUINST_OPTS="-c -spec \${datadir}/TAUINST.SPEC"
 		VT_WRAPPER_CC_TAUINST_PARSE_BIN="$tauinst_cparse_cmd"
 		VT_WRAPPER_CC_TAUINST_PARSE_OPTS="$mpiincdir"
+		VT_WRAPPER_CC_TAUINST_COMMENT_BIN="$tauinst_comment_cmd"
 		VT_WRAPPER_CXX_TAUINST_OPTS="-c++ -spec \${datadir}/TAUINST.SPEC"
 		VT_WRAPPER_CXX_TAUINST_PARSE_BIN="$tauinst_cxxparse_cmd"
 		VT_WRAPPER_CXX_TAUINST_PARSE_OPTS="$VT_WRAPPER_CC_TAUINST_PARSE_OPTS"
+		VT_WRAPPER_CXX_TAUINST_COMMENT_BIN="$tauinst_comment_cmd"
 		VT_WRAPPER_FC_TAUINST_OPTS="-fortran -spec \${datadir}/TAUINST.SPEC"
 		VT_WRAPPER_FC_TAUINST_PARSE_BIN="$tauinst_fparse_cmd"
 		VT_WRAPPER_FC_TAUINST_PARSE_OPTS="$fmpiincdir"
+		VT_WRAPPER_FC_TAUINST_COMMENT_BIN="$tauinst_comment_cmd"
 		VT_WRAPPER_NVCC_TAUINST_OPTS="$VT_WRAPPER_CC_TAUINST_OPTS"
 		VT_WRAPPER_NVCC_TAUINST_PARSE_BIN="$VT_WRAPPER_CC_TAUINST_PARSE_BIN"
 		VT_WRAPPER_NVCC_TAUINST_PARSE_OPTS="$VT_WRAPPER_CC_TAUINST_PARSE_OPTS $CUDATKINCDIR"
+		VT_WRAPPER_NVCC_TAUINST_COMMENT_BIN="$tauinst_comment_cmd"
 		VT_WRAPPER_NVCC_AVAIL_INST="$VT_WRAPPER_NVCC_AVAIL_INST tauinst"
 		VT_WRAPPER_AVAIL_INST="$VT_WRAPPER_AVAIL_INST tauinst"
 	])
 	AC_SUBST(VT_WRAPPER_CC_TAUINST_OPTS)
 	AC_SUBST(VT_WRAPPER_CC_TAUINST_PARSE_BIN)
 	AC_SUBST(VT_WRAPPER_CC_TAUINST_PARSE_OPTS)
+	AC_SUBST(VT_WRAPPER_CC_TAUINST_COMMENT_BIN)
+	AC_SUBST(VT_WRAPPER_CC_TAUINST_COMMENT_OPTS)
 	AC_SUBST(VT_WRAPPER_CC_COMPINST_COMPILER_FLAGS)
 	AC_SUBST(VT_WRAPPER_CC_DEFAULT_PARTYPE)
 
 	AC_SUBST(VT_WRAPPER_CXX_TAUINST_OPTS)
 	AC_SUBST(VT_WRAPPER_CXX_TAUINST_PARSE_BIN)
 	AC_SUBST(VT_WRAPPER_CXX_TAUINST_PARSE_OPTS)
+	AC_SUBST(VT_WRAPPER_CXX_TAUINST_COMMENT_BIN)
+	AC_SUBST(VT_WRAPPER_CXX_TAUINST_COMMENT_OPTS)
 	AC_SUBST(VT_WRAPPER_CXX_COMPINST_COMPILER_FLAGS)
 	AC_SUBST(VT_WRAPPER_CXX_DEFAULT_PARTYPE)
 
 	AC_SUBST(VT_WRAPPER_FC_TAUINST_OPTS)
 	AC_SUBST(VT_WRAPPER_FC_TAUINST_PARSE_BIN)
 	AC_SUBST(VT_WRAPPER_FC_TAUINST_PARSE_OPTS)
+	AC_SUBST(VT_WRAPPER_FC_TAUINST_COMMENT_BIN)
+	AC_SUBST(VT_WRAPPER_FC_TAUINST_COMMENT_OPTS)
 	AC_SUBST(VT_WRAPPER_FC_COMPINST_COMPILER_FLAGS)
 	AC_SUBST(VT_WRAPPER_FC_DEFAULT_PARTYPE)
 
 	AC_SUBST(VT_WRAPPER_NVCC_TAUINST_OPTS)
 	AC_SUBST(VT_WRAPPER_NVCC_TAUINST_PARSE_BIN)
 	AC_SUBST(VT_WRAPPER_NVCC_TAUINST_PARSE_OPTS)
+	AC_SUBST(VT_WRAPPER_NVCC_TAUINST_COMMENT_BIN)
+	AC_SUBST(VT_WRAPPER_NVCC_TAUINST_COMMENT_OPTS)
 	AC_SUBST(VT_WRAPPER_NVCC_COMPINST_COMPILER_FLAGS)
 	AC_SUBST(VT_WRAPPER_NVCC_AVAIL_INST)
 	AC_SUBST(VT_WRAPPER_NVCC_DEFAULT_INST)

ompi/contrib/vt/vt/config/m4/acinclude.cuda.m4