From e39a1718713545d4250f7bec743e7d4772888843 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Thu, 27 Apr 2006 03:19:07 +0000 Subject: [PATCH] Checkpoint before name changes This commit was SVN r9740. --- contrib/dist/linux/buildswitcherrpm.sh | 15 ++-- .../dist/linux/ompi-switcher-modulefile.spec | 88 ++++++++++--------- .../dist/linux/ompi-switcher-modulefile.tcl | 36 ++++---- 3 files changed, 72 insertions(+), 67 deletions(-) diff --git a/contrib/dist/linux/buildswitcherrpm.sh b/contrib/dist/linux/buildswitcherrpm.sh index 0eec08e2d3..50409171bb 100755 --- a/contrib/dist/linux/buildswitcherrpm.sh +++ b/contrib/dist/linux/buildswitcherrpm.sh @@ -3,6 +3,7 @@ # Copyright (c) 2006 The Trustees of Indiana University and Indiana # University Research and Technology # Corporation. All rights reserved. +# Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. # # @@ -10,8 +11,8 @@ # target="noarch" -specfile="lam-switcher-modulefile.spec" -sourcefile="lam-switcher-modulefile.tcl" +specfile="openmpi-switcher-modulefile.spec" +sourcefile="openmpi-switcher-modulefile.tcl" rpmbuild_options= ######################################################################### @@ -53,7 +54,7 @@ fi first="`basename $tarball | cut -d- -f2`" version="`echo $first | sed -e 's/\.tar\.gz//'`" unset first -echo "--> Found LAM version: $version" +echo "--> Found Open MPI version: $version" # # do we have the spec files? @@ -146,9 +147,9 @@ fi # specdest="$rpmtopdir/SPECS/$specfile" -sed -e 's/LAMVERSION/'$version'/g' $specfile > "$specdest" +sed -e 's/OPENMPIVERSION/'$version'/g' $specfile > "$specdest" -echo "--> Building the OSCAR LAM modulefile RPM" +echo "--> Building the OSCAR Open MPI modulefile RPM" cmd="$rpm_cmd -ba --target=$target $rpmbuild_options $specdest" echo "--> $cmd" @@ -162,7 +163,7 @@ if test $? != 0; then echo "Aborting" exit 1 fi -echo "--> Done building the OSCAR LAM modulefile RPM" +echo "--> Done building the OSCAR Open MPI modulefile RPM" # # Done @@ -171,7 +172,7 @@ echo "--> Done building the OSCAR LAM modulefile RPM" cat < 1; then - switcher mpi --rm-name lam-%{version} --force --silent + switcher mpi --rm-name openmpi-%{version} --force --silent fi . /etc/profile.d/00-modules.sh -switcher mpi --add-name lam-%{version} %{_pkgdatadir} --force --silent +switcher mpi --add-name openmpi-%{version} %{_pkgdatadir} --force --silent ############################################################################# @@ -163,17 +165,17 @@ switcher mpi --add-name lam-%{version} %{_pkgdatadir} --force --silent # same shell that "rpm -ivh ..." the switcher/modules RPM's, in which # case, the environment for those packages will not yet have been # setup. This is important to do *before* we are uninstalled because -# of the case where "rpm -Uvh lam-module..." is used; the current RPM -# will be uninstalled and then the new one will be installed. If we -# are %postun here, then the new RPM will be installed, and then this -# will run, which will remove the [new] tag from switcher, which is -# obviously not what we want. +# of the case where "rpm -Uvh openmpi-module..." is used; the current +# RPM will be uninstalled and then the new one will be installed. If +# we are %postun here, then the new RPM will be installed, and then +# this will run, which will remove the [new] tag from switcher, which +# is obviously not what we want. # Grrr... It seems that "rpm -ivh a.rpm b.rpm c.rpm" is smart enough # to re-order the order of installation to ensure that dependencies # are met. However, "rpm -e a b c" does *not* order the # uninstallations to ensure that dependencies are still met. So if -# someone does "rpm -e switcher modules lam-module", it is quite +# someone does "rpm -e switcher modules openmpi-module", it is quite # possible that rpm will uninstall switcher and/or modules *before* # this RPM is uninstalled. As such, the following lines will fail, # which will cause all kinds of Badness. Arrggh!! So we have to test @@ -193,7 +195,7 @@ if test "$1" == 0; then # If this RPM was the system default switcher module, then # both print a warning and remove the system default. - if test "$default" = "lam-%{version}"; then + if test "$default" = "openmpi-%{version}"; then echo "WARNING: This RPM was the default MPI implementation!" echo "WARNING: There is no NO DEFAULT MPI implementation!" switcher mpi = none --system --force --silent @@ -201,7 +203,7 @@ if test "$1" == 0; then # Remove this module's name from the switcher repository - switcher mpi --rm-name lam-%{version} --force --silent + switcher mpi --rm-name openmpi-%{version} --force --silent fi fi @@ -213,7 +215,7 @@ fi ############################################################################# %files %defattr(-,root,root) -%{_pkgdatadir}/lam-%{version} +%{_pkgdatadir}/openmpi-%{version} ############################################################################# diff --git a/contrib/dist/linux/ompi-switcher-modulefile.tcl b/contrib/dist/linux/ompi-switcher-modulefile.tcl index e67d6d9104..df65db6c47 100644 --- a/contrib/dist/linux/ompi-switcher-modulefile.tcl +++ b/contrib/dist/linux/ompi-switcher-modulefile.tcl @@ -3,30 +3,32 @@ # Copyright (c) 2006 The Trustees of Indiana University and Indiana # University Research and Technology # Corporation. All rights reserved. +# Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow # # $HEADER$ -# This modulefile is a dispatcher for other LAM modulefiles. It looks -# around the environment of the machine and determines which LAM -# modulefile to load (i.e., which LAM installation to use). +# This modulefile is a dispatcher for other Open MPI modulefiles. It +# looks around the environment of the machine and determines which +# Open MPI modulefile to load (i.e., which Open MPI installation to +# use). proc ModulesHelp { } { puts stderr "\tThis module acts as a dispatcher to automatically" - puts stderr "\tload the 'right' LAM/MPI installation into your" - puts stderr "\tenvironment based on what LAM/MPI installations are" + puts stderr "\tload the 'right' Open MPI installation into your" + puts stderr "\tenvironment based on what Open MPI installations are" puts stderr "\tavailable and the environment available on this machine." } -module-whatis "Automatically select an appropriate LAM/MPI modulefile to load." +module-whatis "Automatically select an appropriate Open MPI modulefile to load." # Don't let any other MPI module be loaded while this one is loaded conflict mpi -# Directory where we'll find the LAM modulefiles. +# Directory where we'll find the Open MPI modulefiles. set modulefiledir /opt/modules/modulefiles @@ -35,7 +37,7 @@ set modulefiledir /opt/modules/modulefiles set have_blcr [file exists /usr/lib/libcr.so] set have_gm [file exists /usr/lib/libgm.so] -# Get the version number of the LAM represented by this modulefile +# Get the version number of the Open MPI represented by this modulefile set version [lindex [split [module-info name] "-"] 1] @@ -45,18 +47,18 @@ set version [lindex [split [module-info name] "-"] 1] # statement in the final else clause will ensure that this module is # actually not loaded. So fail silently, but under protest. ;-) -set dir "$modulefiledir/lam" +set dir "$modulefiledir/openmpi" if { $have_blcr == 1 && $have_gm == 1 && - [file exists $dir/lam-with-blcr-and-gm-oscar-$version] } { - module load $dir/lam-with-blcr-and-gm-oscar-$version + [file exists $dir/openmpi-with-blcr-and-gm-$version] } { + module load $dir/openmpi-with-blcr-and-gm-$version } elseif { $have_blcr == 0 && $have_gm == 1 && - [file exists $dir/lam-with-gm-oscar-$version] } { - module load $dir/lam-with-gm-oscar-$version + [file exists $dir/openmpi-with-gm-$version] } { + module load $dir/openmpi-with-gm-$version } elseif { $have_blcr == 1 && $have_gm == 0 && - [file exists $dir/lam-with-blcr-oscar-$version] } { - module load $dir/lam-with-blcr-oscar-$version -} elseif { [file exists $dir/lam-oscar-$version] } { - module load $dir/lam-oscar-$version + [file exists $dir/openmpi-with-blcr-$version] } { + module load $dir/openmpi-with-blcr-$version +} elseif { [file exists $dir/openmpi-$version] } { + module load $dir/openmpi-$version } else { break }