1
1

Update the Cisco platform files. Create a make_tarball variant for creating orte-level tarballs

This commit was SVN r22338.
Этот коммит содержится в:
Ralph Castain 2009-12-23 16:44:57 +00:00
родитель 170da86ae5
Коммит ea8b2dc752
14 изменённых файлов: 349 добавлений и 354 удалений

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

@ -26,6 +26,7 @@ endif
EXTRA_DIST = \
dist/make_dist_tarball \
dist/make_orte_dist_tarball \
dist/linux/openmpi.spec \
dist/macosx-pkg/buildpackage.sh \
dist/macosx-pkg/ReadMe.rtf \
@ -104,15 +105,9 @@ EXTRA_DIST = \
platform/cisco/macosx-dynamic.conf \
platform/cisco/macosx-dynamic-optimized \
platform/cisco/macosx-dynamic-optimized.conf \
platform/cisco/hlfr/debug \
platform/cisco/hlfr/debug.conf \
platform/cisco/hlfr/ebuild \
platform/cisco/hlfr/ebuild.conf \
platform/cisco/hlfr/optimized \
platform/cisco/hlfr/optimized.conf \
platform/cisco/ludd-1/debug \
platform/cisco/ludd-1/debug.conf \
platform/cisco/ludd-1/optimized \
platform/cisco/ludd-1/optimized.conf
platform/cisco/ebuild/hlfr \
platform/cisco/ebuild/hlfr.conf \
platform/cisco/ebuild/native \
platform/cisco/ebuild/native.conf
dist_pkgdata_DATA = openmpi-valgrind.supp

309
contrib/dist/make_orte_dist_tarball поставляемый Исполняемый файл
Просмотреть файл

@ -0,0 +1,309 @@
#!/bin/sh
#
# Copyright (c) 2004-2006 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) 2008-2009 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
#
# Version of auto tools that we want
#
M4_TARGET_VERSION=1.4.13
AM_TARGET_VERSION=1.11
AC_TARGET_VERSION=2.65
LT_TARGET_VERSION=2.2.6b
#
# Check command line flags
#
# Default to requiring *exact* versions if we're making distribution
# tarballs; but higher-than-expected versions are ok for
# non-distribution tarballs.
dist_target=distcheck
if test "`basename $0`" = "make_orte_tarball"; then
dist_target=dist
highok=1
else
highok=0
fi
greekonly=0
while test "$1" != ""; do
case $1 in
-greekonly) greekonly=1 ;;
--greekonly) greekonly=1 ;;
-highok) highok=1 ;;
--highok) highok=1 ;;
esac
shift
done
#
# First things first -- check that the auto versions that we have are
# the ones that we want.
#
check_gnu_version() {
prog="$1"
target="$2"
ver="`$prog --version | head -n 1 | sed -e's/([^)]*)//g' -e's/[^0-9 .][^ ]* / /g' -e's/ //g'`"
ver_major=`echo $ver | cut -d. -f1`
ver_minor=`echo $ver | cut -d. -f2`
ver_release=`echo $ver | cut -d. -f3`
if test "$ver_release" = ""; then
ver_release=0
fi
target_major=`echo $target | cut -d. -f1`
target_minor=`echo $target | cut -d. -f2`
target_release=`echo $target | cut -d. -f3`
if test "$target_release" = ""; then
target_release=0
fi
result=same
if test "$ver" != "$target"; then
if test "$ver_major" -lt "$target_major"; then
result=low
elif test "$ver_major" = "$target_major" -a "$ver_minor" -lt "$target_minor"; then
result=low
elif test "$ver_major" = "$target_major" -a "$ver_minor" = "$target_minor" -a "$ver_release" -lt "$target_release"; then
result=low
elif test "$ver_major" -gt "$target_major"; then
result=high
elif test "$ver_major" = "$target_major" -a "$ver_minor" -gt "$target_minor"; then
result=high
elif test "$ver_major" = "$target_major" -a "$ver_minor" = "$target_minor" -a "$ver_release" -gt "$target_release"; then
result=high
else
result=unknown
fi
fi
if test "$result" = "low"; then
cat <<EOF
----------------------------------------------------------------------
ERROR: Program "$prog" does not have a high enough version:
Found: $ver
Expected: $target
Expected versions:
m4: $M4_TARGET_VERSION
Automake: $AM_TARGET_VERSION
Autoconf: $AC_TARGET_VERSION
Libtool: $LT_TARGET_VERSION
Either change this script to match the found version, or install
the correct version of the tools.
----------------------------------------------------------------------
EOF
exit 1
fi
if test "$result" = "high"; then
if test "$highok" = "0"; then
cat <<EOF
----------------------------------------------------------------------
ERROR: Program "$prog" has a higher version than expected:
Found: $ver
Expected: $target
Expected versions:
m4: $M4_TARGET_VERSION
Automake: $AM_TARGET_VERSION
Autoconf: $AC_TARGET_VERSION
Libtool: $LT_TARGET_VERSION
Either change this script to match the found version, or install
the correct version of the tools.
----------------------------------------------------------------------
EOF
exit 1
else
cat <<EOF
----------------------------------------------------------------------
WARNING: Program "$prog" has a higher version than expected:
Found: $ver
Expected: $target
Expected versions:
m4: $M4_TARGET_VERSION
Automake: $AM_TARGET_VERSION
Autoconf: $AC_TARGET_VERSION
Libtool: $LT_TARGET_VERSION
This is *usually* ok, but this script is going to sleep for 5 seconds
to give you the chance to quit before doing anything.
----------------------------------------------------------------------
EOF
sleep 5
fi
fi
}
#
# Subroutine to actually make a tarball
#
make_tarball() {
#
# Autogen
#
echo "*** Running autogen.sh..."
rm -f success
(./autogen.sh -no-ompi 2>&1 && touch success) | tee auto.out
if test ! -f success; then
echo "Autogen failed. Aborting"
exit 1
fi
#
# Configure
#
echo "*** Running configure..."
rm -f success
(./configure --enable-dist 2>&1 && touch success) | tee config.out
if test ! -f success; then
echo "Configure failed. Aborting"
exit 1
fi
#
# make tarball
#
echo "*** Running make $dist_target..."
save_LD=$LD_LIBRARY_PATH
LD_LIBRARY_PATH=
rm -f success
(make $dist_target 2>&1 && touch success) | tee dist.out
if test ! -f success; then
echo "Make $dist_target failed. Aborting"
exit 1
fi
rm -f success
LD_LIBRARY_PATH=$save_LD
#
# move
#
echo "*** Moving tarballs..."
mv openmpi-* ..
echo "*** All done"
}
#########################################################################
# main
#########################################################################
echo "*** Checking GNU tools versions..."
check_gnu_version m4 $M4_TARGET_VERSION
check_gnu_version automake $AM_TARGET_VERSION
check_gnu_version autoconf $AC_TARGET_VERSION
check_gnu_version libtool $LT_TARGET_VERSION
#
# Verify that we're in a top Open MPI dir
#
echo "*** Checking to ensure in top-level Open MPI directory..."
if test -f VERSION -a -f configure.ac -a -f config/ompi_get_version.m4 ; then
happy=1
else
echo "Do not appear to be in an Open MPI top directory. Abort!"
exit 1
fi
#
# Do svn up and all that
#
echo "*** Removing old VERSION file..."
rm -f VERSION
if test -d .svn; then
echo "*** Running svn up..."
svn up
if test ! "$?" = "0"; then
echo "SVN update failed. Aborting"
exit 1
fi
elif test -d .hg; then
echo "*** Running hg up..."
hg revert VERSION
hg up
if test ! "$?" = "0"; then
echo "HG update failed. Aborting"
exit 1
fi
fi
#
# Ditch "svn/hg" from all version numbers
#
echo "*** Removing svn version numbers..."
svn_r="r`svnversion .`"
version_files=VERSION
release_date=`date '+%b %d, %Y'`
for file in $version_files; do
echo " - $file"
sed -e 's/^want_svn=.*/want_svn=0/' \
-e 's/^svn_r=.*/'svn_r=$svn_r/ \
-e "s/^date=.*/date=\"$release_date\"/" \
$file > $file.new
cp -f $file.new $file
rm $file.new
done
#
# Make 2 tarballs:
#
# - one with the greek
# - one without the greek
#
# unless the user specifically said --greekonly, then only make the
# greek tarball. Making both tarballs at once allows us to guarantee
# to have two tarballs -- one greek and one not -- that have exactly
# the same SVN r number (as opposed to, for example, running this
# script to make a greek tarball, then running it again to make a
# non-greek tarball -- there is a race condition that someone could
# commit in the meantime and change the SVN r number in the 2nd
# tarball)
#
# First, make greek tarball
echo "*** Making greek tarball"
make_tarball
# Now if ! --greekonly, make the non-greek tarball
if test "$greekonly" = "0"; then
echo "*** REMOVING ALL GREEK FROM VERSION NUMBERS!!"
for file in $version_files; do
echo " - $file"
sed -e 's/^greek=.*/greek=/' $file > $file.new
cp -f $file.new $file
rm $file.new
done
echo "Making non-greek tarball"
make_tarball
fi
# Put the VERSION file back the way it was
svn revert VERSION

1
contrib/dist/make_orte_tarball поставляемый Символическая ссылка
Просмотреть файл

@ -0,0 +1 @@
make_orte_dist_tarball

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

34
contrib/platform/cisco/ebuild/native Обычный файл
Просмотреть файл

@ -0,0 +1,34 @@
enable_dlopen=no
enable_multicast=yes
enable_bootstrap=yes
enable_mem_debug=no
enable_mem_profile=no
with_memory_manager=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=no
enable_mpi_f77=no
enable_mpi_f90=no
enable_mpi_cxx=no
enable_mpi_cxx_seek=no
enable_cxx_exceptions=no
enable_ft_thread=no
enable_per_user_config_files=no
enable_script_wrapper_compilers=no
enable_orterun_prefix_by_default=yes
enable_io_romio=no
#enable_mca_direct=ras-cm,rmaps-resilient,routed-cm
enable_mca_no_build=carto,crs,snapc,crcp,filem,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,pml-csum,pml-cm,btl-openib,btl-sm,ess-portals_utcp,ess-cnos,ess-alps,ess-lsf,ess-slurm,ess-slurmd,ess-tm,notifier-ftb,notifier-smtp,notifier-twitter,plm-alps,plm-lsf,plm-tm,plm-xgrid,ras-alps,ras-gridengine,ras-loadleveler,ras-lsf,ras-slurm,ras-tm,routed-binomial,routed-direct,routed-linear,timer-catamount,timer-aix,timer-altix,timer-solaris,timer-windows
enable_contrib_no_build=libnbc,vt
with_tm=no
with_openib=no
with_devel_headers=yes
with_slurm=no
with_portals=no
with_valgrind=no

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

@ -53,17 +53,8 @@ mca_component_show_load_errors = 0
orte_abort_timeout = 10
opal_set_max_sys_limits = 1
# ORTE behavior
ras = cm
rmaps = resilient
routed = cm
plm = rsh
## Add the interface for out-of-band communication
## and set it up
oob_tcp_listen_mode = listen_thread
oob_tcp_sndbuf = 32768
oob_tcp_rcvbuf = 32768
# Define the interface for multicast
rmcast_base_if_include = 10.0

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

@ -1,35 +0,0 @@
enable_dlopen=no
enable_multicast=yes
enable_bootstrap=yes
enable_mem_debug=no
enable_mem_profile=no
enable_memchecker=no
enable_debug_symbols=yes
enable_binaries=yes
enable_heterogeneous=no
enable_picky=yes
enable_debug=yes
enable_shared=yes
enable_static=yes
enable_ipv6=no
enable_mpi_f77=no
enable_mpi_f90=no
enable_mpi_cxx=yes
enable_mpi_cxx_seek=yes
enable_cxx_exceptions=yes
enable_ft_thread=no
enable_per_user_config_files=no
enable_script_wrapper_compilers=yes
enable_orterun_prefix_by_default=yes
enable_io_romio=no
enable_mca_no_build=carto,crs,filem,routed-linear,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,pml-cm,pml-csum,btl-openib
enable_contrib_no_build=libnbc,vt
with_slurm=no
with_openib=no
with_devel_headers=yes
with_memory_manager=ptmalloc2
with_valgrind=no
CC=/nobackup/dbarach/rcastain/ebuild/open-repo/build-root/tools/bin/ppc-q-linux-gcc-4.3.3
CXX=/nobackup/dbarach/rcastain/ebuild/open-repo/build-root/tools/bin/ppc-q-linux-gcc-4.3.3
ac_cv_c_bigendian=yes

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

@ -1,75 +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 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
orte_abort_timeout = 10
opal_set_max_sys_limits = 1
# ORTE behavior
rmaps = resilient
plm = rsh
## Add the interface for out-of-band communication
## and set it up
oob_tcp_listen_mode = listen_thread
oob_tcp_sndbuf = 32768
oob_tcp_rcvbuf = 32768

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

@ -1,32 +0,0 @@
enable_dlopen=no
enable_multicast=yes
enable_bootstrap=yes
enable_mem_debug=no
enable_mem_profile=no
enable_memchecker=no
enable_debug_symbols=no
enable_binaries=yes
enable_heterogeneous=no
enable_debug=no
enable_shared=yes
enable_static=yes
enable_ipv6=no
enable_mpi_f77=no
enable_mpi_f90=no
enable_mpi_cxx=yes
enable_mpi_cxx_seek=yes
enable_cxx_exceptions=no
enable_ft_thread=no
enable_per_user_config_files=no
enable_script_wrapper_compilers=yes
enable_orterun_prefix_by_default=yes
enable_io_romio=no
enable_mca_no_build=carto,crs,filem,routed-linear,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,pml-cm,pml-csum,btl-openib
enable_contrib_no_build=libnbc,vt
with_slurm=no
with_openib=no
with_devel_headers=yes
with_memory_manager=ptmalloc2
with_valgrind=no
CC=/scratch/dbarach/q/ebuild/open-repo/build-root/tools/bin/ppc-q-linux-gcc-4.3.3
CXX=/scratch/dbarach/q/ebuild/open-repo/build-root/tools/bin/ppc-q-linux-gcc-4.3.3

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

@ -1,75 +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 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
orte_abort_timeout = 10
opal_set_max_sys_limits = 1
# ORTE behavior
rmaps = resilient
plm = rsh
## Add the interface for out-of-band communication
## and set it up
oob_tcp_listen_mode = listen_thread
oob_tcp_sndbuf = 32768
oob_tcp_rcvbuf = 32768

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

@ -1,24 +0,0 @@
enable_multicast=yes
enable_bootstrap=yes
with_memory_manager=no
enable_mem_debug=yes
enable_mem_profile=no
enable_debug_symbols=yes
enable_binaries=yes
with_devel_headers=yes
enable_heterogeneous=no
enable_picky=yes
enable_debug=yes
enable_shared=yes
enable_static=no
enable_contrib_no_build=libnbc,vt
enable_io_romio=no
enable_ipv6=no
enable_mpi_f77=no
enable_mpi_f90=no
enable_mpi_cxx=no
enable_mpi_cxx_seek=no
enable_memchecker=no
enable_per_user_config_files=no
enable_orterun_prefix_by_default=yes
enable_mca_no_build=carto,crs,memchecker,rmaps-load_balance,rmaps-round_robin,rmaps-seq,rmaps-topo,rmaps-rank_file,filem,plm-slurm,plm-xgrid,snapc,grpcomm-basic,grpcomm-hier,pml-dr,pml-crcp2,pml-cm,crcp,pml-v

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

@ -1,25 +0,0 @@
enable_multicast=yes
enable_bootstrap=yes
with_memory_manager=no
enable_mem_debug=no
enable_mem_profile=no
enable_debug_symbols=no
enable_binaries=yes
with_devel_headers=yes
enable_heterogeneous=no
enable_picky=yes
enable_debug=no
enable_shared=yes
enable_static=no
enable_contrib_no_build=libnbc,vt
enable_io_romio=no
enable_ipv6=no
enable_mpi_f77=no
enable_mpi_f90=no
enable_mpi_cxx=no
enable_mpi_cxx_seek=no
enable_memchecker=no
enable_per_user_config_files=no
enable_orterun_prefix_by_default=yes
enable_mca_no_build=carto,crs,memchecker,rmaps-load_balance,rmaps-round_robin,rmaps-seq,rmaps-topo,rmaps-rank_file,filem,plm-slurm,plm-xgrid,snapc,grpcomm-basic,grpcomm-hier,pml-dr,pml-crcp2,pml-cm,crcp,pml-v
with_valgrind=no

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

@ -1,69 +0,0 @@
#
# Copyright (c) 2009 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
orte_abort_timeout = 10
opal_set_max_sys_limits = 1
# ORTE behavior
ras = cm
rmaps = resilient
routed = cm
plm = rsh
## Add the interface for out-of-band communication
## and set it up
oob_tcp_listen_mode = listen_thread
oob_tcp_sndbuf = 32768
oob_tcp_rcvbuf = 32768
# Define the interface for multicast
rmcast_base_if_include = 10.0