commit mpi-selector

Hello community, here is the log from the commit of package mpi-selector checked in at Fri Aug 24 01:45:49 CEST 2007. -------- --- mpi-selector/mpi-selector.changes 2007-07-06 11:31:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/mpi-selector/mpi-selector.changes 2007-08-21 13:58:19.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Aug 21 13:48:41 CEST 2007 - kejohnson@suse.de + +- Updated source tarball to OFED-1.2.5 release. +- In the spec file, removed autogen.sh from %build and also + removed ofed-mpi-selector-proposal.txt from %doc. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mpi-selector.spec ++++++ --- /var/tmp/diff_new_pack.nt9472/_old 2007-08-24 01:45:32.000000000 +0200 +++ /var/tmp/diff_new_pack.nt9472/_new 2007-08-24 01:45:32.000000000 +0200 @@ -14,7 +14,7 @@ URL: http://www.openfabrics.org Summary: Tool to provide defaults for which MPI implementation to use Version: 1.0.0 -Release: 1 +Release: 11 License: BSD 3-Clause Group: System/Console Source: %{name}-%{version}.tar.bz2 @@ -41,7 +41,6 @@ %patch2 %build -./autogen.sh %configure --with-shell-startup-dir=/etc/profile.d make @@ -54,7 +53,7 @@ %files %defattr(-, root, root, -) -%doc README LICENSE ofed-mpi-selector-proposal.txt +%doc README LICENSE %{_bindir}/mpi-selector %{_bindir}/mpi-selector-menu %{_mandir}/man1/mpi-selector.* @@ -64,5 +63,9 @@ %dir %_libdir/mpi/gcc %changelog +* Tue Aug 21 2007 - kejohnson@suse.de +- Updated source tarball to OFED-1.2.5 release. +- In the spec file, removed autogen.sh from %%build and also + removed ofed-mpi-selector-proposal.txt from %%doc. * Fri Jul 06 2007 - hvogel@suse.de - Initial Package, Version 1.0.0 ++++++ mpi-selector-1.0.0.tar.bz2 ++++++ ++++ 5249 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mpi-selector-1.0.0/autogen.sh new/mpi-selector-1.0.0/autogen.sh --- old/mpi-selector-1.0.0/autogen.sh 2007-07-06 11:26:01.000000000 +0200 +++ new/mpi-selector-1.0.0/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -#!/bin/sh - -rm -f config.guess config.sub install-sh missing mkinstalldirs - -run_and_check() { - local rac_progs="$*" - echo "[Running] $rac_progs" - eval $rac_progs - if test "$?" != 0; then - cat < Found tarball: $tarball" - -# -# get the extension from the tarball (gz or bz2) -# - -extension=`echo $tarball | egrep '\.bz2'` -if test -n "$extension"; then - extension=bz2 -else - extension=gz -fi - -# -# Get the version number -# - -first="`basename $tarball | cut -d- -f3`" -version="`echo $first | sed -e 's/\.tar\.'$extension'//'`" -unset first -echo "--> Found version: $version" - -# -# do we have the spec files? -# - -if test ! -f $specfile; then - echo "can't find $specfile" - exit 1 -fi -echo "--> Found specfile: $specfile" - -# -# Find where the top RPM-building directory is -# - -rpmtopdir="`grep %_topdir $HOME/.rpmmacros | awk '{ print $2 }'`" -if test "$rpmtopdir" != ""; then - if test ! -d "$rpmtopdir"; then - mkdir -p "$rpmtopdir" - mkdir -p "$rpmtopdir/BUILD" - mkdir -p "$rpmtopdir/RPMS" - mkdir -p "$rpmtopdir/RPMS/i386" - mkdir -p "$rpmtopdir/RPMS/i586" - mkdir -p "$rpmtopdir/RPMS/i686" - mkdir -p "$rpmtopdir/RPMS/noarch" - mkdir -p "$rpmtopdir/RPMS/athlon" - mkdir -p "$rpmtopdir/SOURCES" - mkdir -p "$rpmtopdir/SPECS" - mkdir -p "$rpmtopdir/SRPMS" - fi - need_root=0 -elif test -d /usr/src/RPM; then - need_root=1 - rpmtopdir="/usr/src/RPM" -elif test -d /usr/src/packages; then - need_root=1 - rpmtopdir="/usr/src/packages" -else - need_root=1 - rpmtopdir="/usr/src/redhat" -fi -echo "--> Found RPM top dir: $rpmtopdir" - -# -# If we're not root, try to sudo -# - -if test "$need_root" = "1" -a "`whoami`" != "root"; then - echo "--> Trying to sudo: \"$0 $*\"" - echo "------------------------------------------------------------" - sudo -u root sh -c "$0 $tarball" - echo "------------------------------------------------------------" - echo "--> sudo finished" - exit 0 -fi - -# -# make sure we have write access to the directories we need -# - -if test ! -w $rpmtopdir/SOURCES ; then - echo "Problem creating rpms: You do not have a $rpmtopdir directory" - echo "tree or you do not have write access to the $rpmtopdir directory" - echo "tree. Please remedy and try again." - exit 1 -fi -echo "--> Have write access to $rpmtopdir/SOURCES" - -# -# move the tarball file to the rpm directory -# - -cp $tarball $rpmtopdir/SOURCES - -# -# what command should we use? -# RH 8.0 changed from using "rpm -ba" to "rpmbuild -ba". ARRGGH!!! -# - -which rpmbuild 2>&1 >/dev/null -if test "$?" = "0"; then - rpm_cmd="rpmbuild" -else - rpm_cmd="rpm" -fi - - -# -# from the specfile -# - -specdest="$rpmtopdir/SPECS/mpi-selector-$version.spec" -sed -e 's/\$VERSION/'$version'/g' \ - -e 's/\$EXTENSION/'$extension'/g' \ - $specfile > "$specdest" -echo "--> Created destination specfile: $specdest" -release=`egrep -i release: $specdest | cut -d\ -f2` - -# -# Make the SRPM -# - -if test "$build_srpm" = "yes"; then - echo "--> Building the SRPM" - cmd="$rpm_cmd -bs $specdest" - echo "--> $cmd" - eval $cmd - - if test $? != 0; then - echo "*** FAILURE BUILDING SRPM!" - echo "Aborting" - exit 1 - fi - echo "--> Done building the SRPM" -fi - -# -# Make the single RPM -# - -if test "$build_rpm" = "yes"; then - echo "--> Building the RPM" - cmd="$rpm_cmd -bb $rpmbuild_options" - if test "$configure_options" != ""; then - cmd="$cmd --define 'configure_options $configure_options'" - fi - cmd="$cmd $specdest" - echo "--> $cmd" - eval $cmd - - if test $? != 0; then - echo "*** FAILURE BUILDING SINGLE RPM!" - echo "Aborting" - exit 1 - fi - echo "--> Done building the single RPM" -fi - -# -# Done -# - -cat <, 1996. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +if test $# -eq 0; then + echo 1>&2 "Try \`$0 --help' for more information" + exit 1 +fi + +run=: + +# In the cases where this matters, `missing' is being run in the +# srcdir already. +if test -f configure.ac; then + configure_ac=configure.ac +else + configure_ac=configure.in +fi + +msg="missing on your system" + +case "$1" in +--run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi + ;; + + -h|--h|--he|--hel|--help) + echo "\ +$0 [OPTION]... PROGRAM [ARGUMENT]... + +Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +error status if there is no known handling for PROGRAM. + +Options: + -h, --help display this help and exit + -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails + +Supported PROGRAM values: + aclocal touch file \`aclocal.m4' + autoconf touch file \`configure' + autoheader touch file \`config.h.in' + automake touch all \`Makefile.in' files + bison create \`y.tab.[ch]', if possible, from existing .[ch] + flex create \`lex.yy.c', if possible, from existing .c + help2man touch the output file + lex create \`lex.yy.c', if possible, from existing .c + makeinfo touch the output file + tar try tar, gnutar, gtar, then tar without non-portable flags + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to ." + exit $? + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) + echo "missing $scriptversion (GNU Automake)" + exit $? + ;; + + -*) + echo 1>&2 "$0: Unknown \`$1' option" + echo 1>&2 "Try \`$0 --help' for more information" + exit 1 + ;; + +esac + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). +case "$1" in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; + + tar) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 + fi + ;; +esac + +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case "$1" in + aclocal*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`acinclude.m4' or \`${configure_ac}'. You might want + to install the \`Automake' and \`Perl' packages. Grab them from + any GNU archive site." + touch aclocal.m4 + ;; + + autoconf) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the + \`Autoconf' and \`GNU m4' packages. Grab them from any GNU + archive site." + touch configure + ;; + + autoheader) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want + to install the \`Autoconf' and \`GNU m4' packages. Grab them + from any GNU archive site." + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` + test -z "$files" && files="config.h" + touch_files= + for f in $files; do + case "$f" in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; + esac + done + touch $touch_files + ;; + + automake*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. + You might want to install the \`Automake' and \`Perl' packages. + Grab them from any GNU archive site." + find . -type f -name Makefile.am -print | + sed 's/\.am$/.in/' | + while read f; do touch "$f"; done + ;; + + autom4te) + echo 1>&2 "\ +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the + proper tools for further handling them. + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` + test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo "#! /bin/sh" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" + chmod +x $file + exit 1 + fi + ;; + + bison|yacc) + echo 1>&2 "\ +WARNING: \`$1' $msg. You should only need it if + you modified a \`.y' file. You may need the \`Bison' package + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." + rm -f y.tab.c y.tab.h + if [ $# -ne 1 ]; then + eval LASTARG="\${$#}" + case "$LASTARG" in + *.y) + SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" y.tab.c + fi + SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" y.tab.h + fi + ;; + esac + fi + if [ ! -f y.tab.h ]; then + echo >y.tab.h + fi + if [ ! -f y.tab.c ]; then + echo 'main() { return 0; }' >y.tab.c + fi + ;; + + lex|flex) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a \`.l' file. You may need the \`Flex' package + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." + rm -f lex.yy.c + if [ $# -ne 1 ]; then + eval LASTARG="\${$#}" + case "$LASTARG" in + *.l) + SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" lex.yy.c + fi + ;; + esac + fi + if [ ! -f lex.yy.c ]; then + echo 'main() { return 0; }' >lex.yy.c + fi + ;; + + help2man) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` + fi + if [ -f "$file" ]; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit 1 + fi + ;; + + makeinfo) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a \`.texi' or \`.texinfo' file, or any other file + indirectly affecting the aspect of the manual. The spurious + call might also be the consequence of using a buggy \`make' (AIX, + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` + file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 + touch $file + ;; + + tar) + shift + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar "$@" && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar "$@" && exit 0 + fi + firstarg="$1" + if shift; then + case "$firstarg" in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + case "$firstarg" in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + fi + + echo 1>&2 "\ +WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + + *) + echo 1>&2 "\ +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the + proper tools for further handling them. Check the \`README' file, + it often tells you about the needed prerequisites for installing + this package. You may also peek at any GNU archive site, in case + some other package would contain this missing \`$1' program." + exit 1 + ;; +esac + +exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mpi-selector-1.0.0/mpi-selector.spec new/mpi-selector-1.0.0/mpi-selector.spec --- old/mpi-selector-1.0.0/mpi-selector.spec 2007-07-06 11:26:01.000000000 +0200 +++ new/mpi-selector-1.0.0/mpi-selector.spec 1970-01-01 01:00:00.000000000 +0100 @@ -1,201 +0,0 @@ -# -# Copyright (c) 2006-2007 Cisco Systems, Inc. All rights reserved. -# - -############################################################################# -# -# Configuration Options -# -############################################################################# - -# Help for OFED RPMs - -%{!?ofed: %define ofed 0} - -# Should we build a debuginfo RPM or not? -# type: bool (0/1) -%{!?build_debuginfo_rpm: %define build_debuginfo_rpm 0} - -# Should we leave the BUILD_ROOT around? Default: no -# type: bool (0/1) -%{!?leave_build_root: %define leave_build_root 0} - -# Should we use the default "check_files" RPM step (i.e., check for -# unpackaged files)? It is discouraged to disable this, but some -# installers need it (e.g., OFED, because it installs lots of other -# stuff in the BUILD_ROOT before Open MPI). -# type: bool (0/1) -%{!?use_check_files: %define use_check_files 1} - -# Should we use the traditional % build and % install sections? Or -# should we combine them both into % install? This is entirely -# motivated by the OFED installer where, on SLES, the % build macro -# will completely remove the BUILD_ROOT before building (which breaks -# some assumptions in the OFED installer). Ick! -# type: bool (0/1) -%{!?munge_build_into_install: %define munge_build_into_install 0} - -# Where should the shell script startup files go? The default is to -# put them in the package data directory. -# type: string (location of shell startup file directory) -%{!?shell_startup_dir: %define shell_startup_dir %{_datadir}/%{name}} - - -############################################################################# -# -# OFED-specific defaults -# -# Tailored for the peculiar requirements of the OFED installer; not -# necessary for when building this SRPM outside of the OFED installer. -# -############################################################################# - -%if %{ofed} -%define leave_build_root 1 -%define use_check_files 0 -%define munge_build_into_install 1 -%define shell_startup_dir /etc/profile.d -%endif - - -############################################################################# -# -# Configuration Logic -# -############################################################################# - -%if !%{build_debuginfo_rpm} -%define debug_package %{nil} -%endif - -%if !%{use_check_files} -%define __check_files %{nil} -%endif - -%{!?configure_options: %define configure_options %{nil}} - - -############################################################################# -# -# Preamble Section -# -############################################################################# - -Summary: A simple tool to provide site-wide and per-user defaults for which MPI implementation to use -Name: %{?_name:%{_name}}%{!?_name:mpi-selector} -Version: $VERSION -Release: 1 -License: BSD -Group: Applications/System -Source: mpi-selector-%{version}.tar.$EXTENSION -Packager: %{?_packager:%{_packager}}%{!?_packager:%{_vendor}} -Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}} -Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}} -Prefix: %{_prefix} -BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root - -%description -A simple tool that allows system administrators to set a site-wide -default for which MPI implementation is to be used, but also allow -users to set their own defaults MPI implementation, thereby overriding -the site-wide default. - -The default can be changed easily via the mpi-selector command -- -editing of shell startup files is not required. - -############################################################################# -# -# Prepatory Section -# -############################################################################# -%prep -# Unbelievably, some versions of RPM do not first delete the previous -# installation root (e.g., it may have been left over from a prior -# failed build). This can lead to Badness later if there's files in -# there that are not meant to be packaged. HOWEVER: in some cases, we -# do not want to delete the prior RPM_BUILD_ROOT because there may be -# other stuff in there that we need (e.g., the OFED installer installs -# everything into RPM_BUILD_ROOT that OMPI needs to compile, like the -# OpenFabrics drivers). -%if !%{leave_build_root} -rm -rf $RPM_BUILD_ROOT -%endif - -%setup -q -n %{name}-%{version} - -############################################################################# -# -# Build Section -# -############################################################################# - -# See note above about %{munge_build_into_install} -%if %{munge_build_into_install} -%install -%else -%build -%endif - -# There's very little to do in this section: configure and make -%configure %{configure_options} --with-shell-startup-dir=%{shell_startup_dir} -%{__make} - - -############################################################################# -# -# Install Section -# -############################################################################# - -# See note above about %{munge_build_into_install} -%if !%{munge_build_into_install} -%install -%endif -%{__make} install DESTDIR=$RPM_BUILD_ROOT - -# If there's an old site-wide default file, rename it -if test -f %{_sysconf}/mpi-selector; then - mv -f %{_sysconf}/mpi-selector %{_sysconf}mpi-selector.rpmorig -fi - -############################################################################# -# -# Clean Section -# -############################################################################# -%clean -cd / -# Remove installed driver after rpm build finished -rm -rf $RPM_BUILD_DIR/%{name}-%{version} - -# Leave $RPM_BUILD_ROOT in order to build dependent packages, if desired -%if !%{leave_build_root} -test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT -%endif - - -############################################################################# -# -# Files Section -# -############################################################################# - -%files -%defattr(-, root, root, -) -%doc README LICENSE -%{_bindir}/mpi-selector -%{_bindir}/mpi-selector-menu -%{_mandir}/man1/mpi-selector.* -%{_mandir}/man1/mpi-selector-menu.* -%{shell_startup_dir}/mpi-selector.sh -%{shell_startup_dir}/mpi-selector.csh - - -############################################################################# -# -# Changelog -# -############################################################################# -%changelog -* Wed Feb 14 2007 Jeff Squyres -- First version diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mpi-selector-1.0.0/ofed-mpi-selector-proposal.txt new/mpi-selector-1.0.0/ofed-mpi-selector-proposal.txt --- old/mpi-selector-1.0.0/ofed-mpi-selector-proposal.txt 2007-07-06 11:26:01.000000000 +0200 +++ new/mpi-selector-1.0.0/ofed-mpi-selector-proposal.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,183 +0,0 @@ -OFED MPI Selector -Proposal v1.1, 13 Feb 2007 - -Goals: -====== - -- Allow MPI implementations to provide mpivars.[c]sh files to setup - the environment for a particular installation. - -- Provide a simplistic 2-level system of defaults for a default MPI - implementation. System administrators can optionally set a - system-wide default while users can optionally override this default - / set their own personal default MPI. System administrators and - users will not need to edit shell startup files to effect these - changes. - -- Have the OFED installer invoke this functionality to give the system - administrator the option of setting a default MPI when OFED is - installed. - -Methods: -======== - -- A new command "mpi-selector" is introduced as a CLI interface to - the new functionality. - -- MPI's must provide two files: - - mpivars.sh: Bourne-shell syntax for setting up the environment - - mpivars.csh: Csh syntax for setting up the environment - Both files must be "sourceable" from their respective shells. - -- MPI implementations can register their mpivars.[c]sh files with the - mpi-selector interface. This allows sysadmins/users to access the - mpivars files through the centralized mpi-selector interface. - Here's an example registration (assumedly performed when the MPI is - installed): - - shell# mpi-selector --register <name> --source-dir <dir> - - Where: - - <name> is a unique name how the MPI wants to be known - - <dir> is the directory containing that MPI's mpivars.sh and - mpivars.csh files - - Example: - - shell# mpi-selector --register ompi-gnu-1.2 \ - --source-dir /usr/local/ofed/mpi/gcc/openmpi-1.2/bin - -- mpivars files can similarly be unregistered (assumedly when/if the - MPI is uninstalled): - - shell# mpi-selector --unregister <name> - -- The mpi-selector command can be used to show what MPIs are - available (i.e., which MPI's have registered mpivars files): - - shell$ mpi-selector --list - ompi-gnu-1.2 - ompi-icc-1.2 - intel-mpi-1.2.3 - shell$ - -- The mpi-selector command can be used to set a per-user default: - - shell$ mpi-selector --set ompi-icc-1.2 - shell$ - -- The mpi-selector command can be used to unset a per-user default: - - shell$ mpi-selector --unset - shell$ - -- The mpi-selector command can be used to set and unset system-wide - defaults (probably requiring root access) by adding the --system - flag to the above two commands: - - shell$ mpi-selector --set ompi-icc-1.2 --system - shell$ mpi-selector --unset --system - shell$ - -- The mpi-selector command can be used to see if there is a default - set (and indicate on which level the default is set -- per-user, or - system-wide): - - # Set both a system-wide and per-user default - shell# mpi-selector --set ompi-icc-1.2 --system - shell$ mpi-selector --set intel-mpi-1.2.3 - - # Query shows the per-user default, since it trumps the system-wide - # default - shell$ mpi-selector --query - default:intel-mpi-1.2.3 - level:user - - # Remove the per-user default and query now shows the system-wide - # default - shell$ mpi-selector --unset - shell$ mpi-selector --query - default:ompi-icc-1.2 - level:system - - # Remove the system-wide default and then there is no default MPI, - # so nothing is returned - shell# mpi-selector --unset --system - shell$ mpi-selector --query - shell$ - - Note that the outputs of --query are easily parsable with - traditional shell scripting commands (head/tail/grep, cut/awk/sed, - etc.). - -- The OFED installer can invoke mpi-selector to query if any MPI's are - registered. If it finds some, the OFED installer can put up a menu - to ask if a system-wide default is desired, and if so, which one. - Perhaps something like the following: - - Current system-wide MPI default: intel-mpi-1.2.3 - Set the system-wide MPI default to: - - 1. ompi-gcc-1.2 - 2. ompi-icc-1.2 - 3. intel-mpi-1.2.3 - 4. Do not change the system-wide default - 5. Remove the system-wide default - - Choice: - -Shortcomings: -============= - -- The mpi-selector command does not affect the current shell. It only - affects *future* shells. So if you set or unset a default, you need - to start a new shell to see the effect. If we care, future versions - could investigate how to make the change effective in the current - shell, but note that there are other solutions that provide this - functionality (e.g., modules, softenv, etc.). - -Implementation: -=============== - -- Upon registration, mpivars.* files are copied to a back-end - directory somewhere (need to consult with some Linux FHS gurus to - determine an appropriate location), and labeled appropriately. - -- The "--list" option essentially lists the mpivars files that are in - the back-end mpi-selector directory. - -- The "--set" option for per-user defaults essentially creates a sym - link from the mpivars files for the target MPI installation in the - back-end directory to $HOME/.mpivars.[shell]. The "--unset" option - for per-user defaults simply removes $HOME/.mpivars.*. - -- The "--set" option for system-wide defaults sets the target MPI name - in /etc/sysconfig/mpi-selector. The "--unset" option for - system-wide defaults removes this file. - -- Two simple script files are placed in /etc/profile.d (for RHEL; need - to find the equivalent for SLES -- is it the same?): - - mpi-selector.sh - - mpi-selector.csh - These files are essentially (pseudocode -- not showing any error - checking): - - if file_exists($HOME/.mpivars.[shell]) - source $HOME/.mpivars.[shell] - else if file_exists(/etc/sysconfig/mpi-selector) - source /etc/sysconf/mpi-selector.[shell] - source $back_end_mpi_select_dir/$mpi_selector - unset mpi_selector - endif - -- The "--query" option is essentially (pseudocode -- skipping - formatting details, etc.): - - if file_exists($HOME/.mpivars.[shell]) - echo default:`readlink $HOME/.mpivars.[shell] - echo level:user - else if file_exists(/etc/sysconfig/mpi-selector) - source /etc/sysconf/mpi-selector.[shell] - echo default:$mpi_selector - echo level:system - endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mpi-selector-1.0.0/VERSION new/mpi-selector-1.0.0/VERSION --- old/mpi-selector-1.0.0/VERSION 2007-07-06 11:26:01.000000000 +0200 +++ new/mpi-selector-1.0.0/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -1.0.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org