1
1
Этот коммит содержится в:
Bert Wesarg 2015-01-22 08:03:46 +01:00
родитель cf2ad0ab45
Коммит 0d0a754c42
15 изменённых файлов: 5 добавлений и 341 удалений

1
.gitignore поставляемый
Просмотреть файл

@ -206,7 +206,6 @@ ompi/contrib/vt/vt/vtlib/vt_fmpiwrap.gen.c
ompi/contrib/vt/vt/vtlib/vt_mpireg.gen.c
ompi/contrib/vt/vt/vtlib/vt_mpireg.gen.h
ompi/contrib/vt/vt/vtlib/vt_mpiwrap.gen.c
ompi/contrib/vt/wrappers/mpi*txt
ompi/debuggers/*.in
ompi/debuggers/dlopen_test

3
NEWS
Просмотреть файл

@ -59,7 +59,8 @@ Trunk (not on release branches yet)
support CUDA IPC. Earlier versions would get error and abort.
- Do not build the MPI C++ bindings by default. They must be enabled
via --enable-mpi-cxx.
- Remove embedded VampirTrace. It is in maintenance mode since 2013.
Please consider Score-P (score-p.org) as an external replacement.
1.8.4
-----

3
README
Просмотреть файл

@ -1171,9 +1171,6 @@ MISCELLANEOUS SUPPORT LIBRARIES
running Valgrind on MPI applications. There is a minor performance
penalty for enabling this option.
--disable-vt
Disable building the VampirTrace that is bundled with Open MPI.
MPI FUNCTIONALITY
--with-mpi-param-check(=value)

Просмотреть файл

@ -46,7 +46,7 @@ AC_DEFUN([OMPI_CONTRIB],[
if test "$enable_contrib_no_build" = "yes"; then
AC_MSG_RESULT([yes])
AC_MSG_ERROR([*** The enable-contrib-no-build flag requires an explicit list
*** of packages to not build. For example, --enable-contrib-no-build=vt])
*** of packages to not build. For example, --enable-contrib-no-build=libompitrace])
else
ifs_save="$IFS"
IFS="${IFS}$PATH_SEPARATOR,"

Просмотреть файл

@ -16,4 +16,4 @@ support this scenario, similar to how it is done for MCA components.
:-)
If it has an autogen.subdirs file, then it needs to be a subdirectory
that is autogen-able (see the vt project for an example).
that is autogen-able.

Просмотреть файл

@ -1,29 +0,0 @@
# -*- makefile -*-
#
# 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) 2014 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
EXTRA_DIST = autogen.subdirs
SUBDIRS = \
vt \
wrappers
DIST_SUBDIRS = \
vt \
wrappers

Просмотреть файл

@ -1,2 +0,0 @@
vt
vt/extlib/otf

Просмотреть файл

@ -1,155 +0,0 @@
# -*- shell-script -*-
#
# 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) 2007 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
# OMPI_contrib_vt_CONFIG([action-if-can-compile],
# [action-if-cant-compile])
# ------------------------------------------------
AC_DEFUN([OMPI_contrib_vt_CONFIG],[
AC_ARG_WITH([contrib-vt-flags],
[AC_HELP_STRING([--with-contrib-vt-flags=FLAGS],
[Pass FLAGS to the VampirTrace distribution configuration script])])
AS_IF([test "$with_contrib_vt_flags" = "yes" -o "$with_contrib_vt_flags" = "no"],
[with_contrib_vt_flags=""])
contrib_vt_happy=1
# Check for enabled PMPI.
AC_MSG_CHECKING([whether PMPI is enabled])
if test "$WANT_MPI_PROFILING" = "1"; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
AC_WARN([**************************************************************])
AC_WARN([*** VampirTrace cannot be built due to disabled MPI profiling.])
if test -z "$enable_vt"; then
AC_WARN([*** Pausing to give you time to read this message...])
fi
AC_WARN([**************************************************************])
if test -z "$enable_vt"; then
sleep 10
fi
contrib_vt_happy=0
fi
# Check whether the used C++ STL is suitable to build VampirTrace.
# For example, in case of using the Oracle C++ compiler, some of the needed
# language features are missing in the default STL (libCstd). It's recommended
# to use the STLport4 instead, which is much more conform to the C++ standard.
if test "$contrib_vt_happy" = "1"; then
AC_MSG_CHECKING([whether C++ STL is suitable for vt])
# Append VampirTrace specific CXXFLAGS possibly given by --with-contrib-vt-flags
# to CXXFLAGS. They could contain flags which are essential for the success of
# the following configure test (e.g. -library=stlport4).
contrib_vt_save_CXXFLAGS="$CXXFLAGS"
eval "set x $with_contrib_vt_flags"; shift
for contrib_vt_flag
do
case $contrib_vt_flag in
CXXFLAGS=*)
contrib_vt_flag=`echo "$contrib_vt_flag" | sed "s/CXXFLAGS=//"`
CXXFLAGS="$contrib_vt_save_CXXFLAGS $contrib_vt_flag"
;;
esac
done
AC_LANG_PUSH(C++)
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([[#include <map>]],
[[std::map<int, int> map;
// The following assignment implicitly converts an "iterator"
// to a "const_interator". Although this is allowed by the C++
// standard, using Oracle's default STL (libCstd) will cause a
// compile error.
// Seen with Oracle Studio version 12.3 and Express 6/10.
std::pair<std::map<int, int>::const_iterator, bool> ret=
map.insert(std::pair<int, int>(123, 456));]])],
[AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
AC_WARN([**************************************************************])
AC_WARN([*** VampirTrace cannot be built due to your STL appears to])
AC_WARN([*** be broken.])
if test "x$ompi_cv_cxx_compiler_vendor" = "xsun"; then
AC_WARN([*** Please try again re-configuring Open MPI with using])
AC_WARN([*** the STLport4 by adding the compiler flag -library=stlport4])
AC_WARN([*** to CXXFLAGS.])
fi
if test -z "$enable_vt"; then
AC_WARN([*** Pausing to give you time to read this message...])
fi
AC_WARN([**************************************************************])
if test -z "$enable_vt"; then
sleep 10
fi
contrib_vt_happy=0])
AC_LANG_POP(C++)
CXXFLAGS="$contrib_vt_save_CXXFLAGS"
fi
if test "$contrib_vt_happy" = "1"; then
contrib_vt_args="--disable-option-checking --with-openmpi-inside=1.7"
eval "set x $ac_configure_args"; shift
for contrib_vt_arg
do
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
*\'*) contrib_vt_arg=`echo "$contrib_vt_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
contrib_vt_args="$contrib_vt_args '$contrib_vt_arg'"
;;
esac
done
contrib_vt_args="$contrib_vt_args $with_contrib_vt_flags"
# Run VampirTrace's configure and see if it succeeded
OPAL_CONFIG_SUBDIR([ompi/contrib/vt/vt],
[$contrib_vt_args],
[], [contrib_vt_happy=0])
fi
# If VampirTrace configured itself successfully, setup OMPI-specific
# VampirTrace glue code to build.
AS_IF([test "$contrib_vt_happy" = "1"],
[$1
AC_CONFIG_FILES([
ompi/contrib/vt/Makefile
ompi/contrib/vt/wrappers/Makefile
ompi/contrib/vt/wrappers/mpicc-vt-wrapper-data.txt
ompi/contrib/vt/wrappers/mpic++-vt-wrapper-data.txt
ompi/contrib/vt/wrappers/mpifort-vt-wrapper-data.txt
])],
[$2])
])dnl

Просмотреть файл

@ -1,74 +0,0 @@
#
# 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-2009 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2014 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
if !OPAL_WANT_SCRIPT_WRAPPER_COMPILERS
if OPAL_INSTALL_BINARIES
nodist_pkgdata_DATA = \
mpicc-vt-wrapper-data.txt \
mpic++-vt-wrapper-data.txt \
mpifort-vt-wrapper-data.txt
install-exec-hook-always:
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
(cd $(DESTDIR)$(bindir); rm -f mpicc-vt$(EXEEXT); $(LN_S) opal_wrapper$(EXEEXT) mpicc-vt$(EXEEXT))
(cd $(DESTDIR)$(bindir); rm -f mpic++-vt$(EXEEXT); $(LN_S) opal_wrapper$(EXEEXT) mpic++-vt$(EXEEXT))
(cd $(DESTDIR)$(bindir); rm -f mpicxx-vt$(EXEEXT); $(LN_S) opal_wrapper$(EXEEXT) mpicxx-vt$(EXEEXT))
(cd $(DESTDIR)$(bindir); rm -f mpifort-vt$(EXEEXT); $(LN_S) opal_wrapper$(EXEEXT) mpifort-vt$(EXEEXT))
(cd $(DESTDIR)$(bindir); rm -f mpif77-vt$(EXEEXT); $(LN_S) mpifort-vt$(EXEEXT) mpif77-vt$(EXEEXT))
(cd $(DESTDIR)$(bindir); rm -f mpif90-vt$(EXEEXT); $(LN_S) mpifort-vt$(EXEEXT) mpif90-vt$(EXEEXT))
install-data-hook-always:
(cd $(DESTDIR)$(pkgdatadir); rm -f mpicxx-vt-wrapper-data.txt; $(LN_S) mpic++-vt-wrapper-data.txt mpicxx-vt-wrapper-data.txt)
(cd $(DESTDIR)$(pkgdatadir); rm -f mpif77-vt-wrapper-data.txt; $(LN_S) mpifort-wrapper-data.txt mpif77-vt-wrapper-data.txt)
(cd $(DESTDIR)$(pkgdatadir); rm -f mpif90-vt-wrapper-data.txt; $(LN_S) mpifort-wrapper-data.txt mpif90-vt-wrapper-data.txt)
uninstall-local-always:
rm -f $(DESTDIR)$(bindir)/mpicc-vt$(EXEEXT) \
$(DESTDIR)$(bindir)/mpic++-vt$(EXEEXT) \
$(DESTDIR)$(bindir)/mpicxx-vt$(EXEEXT) \
$(DESTDIR)$(bindir)/mpifort-vt$(EXEEXT) \
$(DESTDIR)$(bindir)/mpif77-vt$(EXEEXT) \
$(DESTDIR)$(bindir)/mpif90-vt$(EXEEXT) \
$(DESTDIR)$(pkgdatadir)/mpif77-vt-wrapper-data.txt \
$(DESTDIR)$(pkgdatadir)/mpif90-vt-wrapper-data.txt \
$(DESTDIR)$(pkgdatadir)/mpicxx-vt-wrapper-data.txt
if CASE_SENSITIVE_FS
install-exec-hook: install-exec-hook-always
(cd $(DESTDIR)$(bindir); rm -f mpiCC-vt$(EXEEXT); $(LN_S) opal_wrapper$(EXEEXT) mpiCC-vt$(EXEEXT))
install-data-hook: install-data-hook-always
(cd $(DESTDIR)$(pkgdatadir); rm -f mpiCC-vt-wrapper-data.txt; $(LN_S) mpic++-vt-wrapper-data.txt mpiCC-vt-wrapper-data.txt)
uninstall-local: uninstall-local-always
rm -f $(DESTDIR)$(bindir)/mpiCC-vt$(EXEEXT) \
$(DESTDIR)$(pkgdatadir)/mpiCC-vt-wrapper-data.txt
else # CASE_SENSITIVE_FS
install-exec-hook: install-exec-hook-always
install-data-hook: install-data-hook-always
uninstall-local: uninstall-local-always
endif # CASE_SENSITIVE_FS
endif # OPAL_INSTALL_BINARIES
endif # OPAL_WANT_SCRIPT_WRAPPER_COMPILERS

Просмотреть файл

@ -1,21 +0,0 @@
# There can be multiple blocks of configuration data, chosen by
# compiler flags (using the compiler_args key to chose which block
# should be activated. This can be useful for multilib builds. See the
# multilib page at:
# https://github.com/open-mpi/ompi/wiki/compilerwrapper3264
# for more information.
project=Open MPI
project_short=OMPI
version=@OMPI_VERSION@
language=C++
compiler_flags_env=CXXFLAGS
compiler=vtcxx
extra_includes=@OMPI_WRAPPER_EXTRA_INCLUDES@
preprocessor_flags=@OMPI_WRAPPER_EXTRA_CPPFLAGS@
compiler_flags=@OMPI_WRAPPER_EXTRA_CXXFLAGS@
linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
libs=@OMPI_WRAPPER_CXX_LIB@ -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
required_file=@OMPI_WRAPPER_CXX_REQUIRED_FILE@
includedir=${includedir}
libdir=${libdir}

Просмотреть файл

@ -1,21 +0,0 @@
# There can be multiple blocks of configuration data, chosen by
# compiler flags (using the compiler_args key to chose which block
# should be activated. This can be useful for multilib builds. See the
# multilib page at:
# https://github.com/open-mpi/ompi/wiki/compilerwrapper3264
# for more information.
project=Open MPI
project_short=OMPI
version=@OMPI_VERSION@
language=C
compiler_flags_env=CFLAGS
compiler=vtcc
extra_includes=@OMPI_WRAPPER_EXTRA_INCLUDES@
preprocessor_flags=@OMPI_WRAPPER_EXTRA_CPPFLAGS@
compiler_flags=@OMPI_WRAPPER_EXTRA_CFLAGS@
linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
libs=-lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
required_file=
includedir=${includedir}
libdir=${libdir}

Просмотреть файл

@ -1,23 +0,0 @@
# There can be multiple blocks of configuration data, chosen by
# compiler flags (using the compiler_args key to chose which block
# should be activated. This can be useful for multilib builds. See the
# multilib page at:
# https://github.com/open-mpi/ompi/wiki/compilerwrapper3264
# for more information.
project=Open MPI
project_short=OMPI
version=@OMPI_VERSION@
language=Fortran
compiler_env=FC
compiler_flags_env=FCFLAGS
compiler=vtf90
module_option=@OMPI_FC_MODULE_FLAG@
extra_includes=
preprocessor_flags=
compiler_flags=@OMPI_WRAPPER_EXTRA_FCFLAGS@
linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
libs=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -lmpi_mpifh -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
required_file=@OMPI_WRAPPER_FORTRAN_REQUIRED_FILE@
includedir=${includedir}
libdir=${libdir}

Просмотреть файл

@ -129,7 +129,6 @@ void ompi_info_do_config(bool want_all)
char *ft_support;
char *crdebug_support;
char *topology_support;
char *vt_support;
/* Do a little preprocessor trickery here to figure opal_info_out the
* tri-state of MPI_PARAM_CHECK (which will be either 0, 1, or
@ -264,7 +263,6 @@ void ompi_info_do_config(bool want_all)
wtime_support = OPAL_TIMER_USEC_NATIVE ? "native" : "gettimeofday";
symbol_visibility = OPAL_C_HAVE_VISIBILITY ? "yes" : "no";
topology_support = OPAL_HAVE_HWLOC ? "yes" : "no";
vt_support = OMPI_ENABLE_CONTRIB_vt ? "yes" : "no";
/* setup strings that require allocation */
if (OMPI_BUILD_FORTRAN_MPIFH_BINDINGS) {
@ -639,8 +637,6 @@ void ompi_info_do_config(bool want_all)
opal_info_out("C/R Enabled Debugging", "options:crdebug_support", crdebug_support);
free(crdebug_support);
opal_info_out("VampirTrace support", "options:vt", vt_support);
opal_info_out_int("MPI_MAX_PROCESSOR_NAME", "options:mpi-max-processor-name",
MPI_MAX_PROCESSOR_NAME);
opal_info_out_int("MPI_MAX_ERROR_STRING", "options:mpi-max-error-string",

Просмотреть файл

@ -7,7 +7,7 @@
* - Delete version tests for older PGI versions (#include "omp.h" not acceptabe)
* - Indent ('#' should be in column 0)
*
* External packages (vt, romio) depend on top_build_dir/ompi/include, therefore
* External packages (i.e., romio) depend on top_build_dir/ompi/include, therefore
* although this is not changed in the configure process, this has to be set as
* a .in file...
* ---------------------------------------------------------------------------

Просмотреть файл

@ -119,7 +119,6 @@ void oshmem_info_do_config(bool want_all)
char *ft_support;
char *crdebug_support;
char *topology_support;
char *vt_support;
/* Do a little preprocessor trickery here to figure opal_info_out the
* tri-state of MPI_PARAM_CHECK (which will be either 0, 1, or
@ -239,7 +238,6 @@ void oshmem_info_do_config(bool want_all)
wtime_support = OPAL_TIMER_USEC_NATIVE ? "native" : "gettimeofday";
symbol_visibility = OPAL_C_HAVE_VISIBILITY ? "yes" : "no";
topology_support = OPAL_HAVE_HWLOC ? "yes" : "no";
vt_support = OMPI_ENABLE_CONTRIB_vt ? "yes" : "no";
/* setup strings that require allocation */
if (OMPI_BUILD_FORTRAN_MPIFH_BINDINGS) {
@ -587,8 +585,6 @@ void oshmem_info_do_config(bool want_all)
opal_info_out("C/R Enabled Debugging", "options:crdebug_support", crdebug_support);
free(crdebug_support);
opal_info_out("VampirTrace support", "options:vt", vt_support);
opal_info_out_int("MPI_MAX_PROCESSOR_NAME", "options:mpi-max-processor-name",
MPI_MAX_PROCESSOR_NAME);
opal_info_out_int("MPI_MAX_ERROR_STRING", "options:mpi-max-error-string",