From 7c521ed7e678d381f9360ed352113d986cb9bf8b Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Sun, 7 Jul 2013 12:59:07 -0400 Subject: [PATCH] ThirdParty: adding the hwloc package --- ThirdParty/AllClean.stage3 | 3 + ThirdParty/AllMake.stage3 | 8 ++ ThirdParty/rpmBuild/SPECS/hwloc-1.7.1.spec | 151 +++++++++++++++++++++ etc/prefs.csh-EXAMPLE | 18 ++- etc/prefs.sh-EXAMPLE | 18 ++- etc/settings.csh | 6 + etc/settings.sh | 6 + 7 files changed, 202 insertions(+), 8 deletions(-) create mode 100644 ThirdParty/rpmBuild/SPECS/hwloc-1.7.1.spec diff --git a/ThirdParty/AllClean.stage3 b/ThirdParty/AllClean.stage3 index ed6fdfae3..4aff389aa 100755 --- a/ThirdParty/AllClean.stage3 +++ b/ThirdParty/AllClean.stage3 @@ -73,6 +73,9 @@ uninstallPackage ParMetis-3.1.1 # PyFoam uninstallPackage PyFoam-0.6.1 +# hwloc +uninstallPackage hwloc-1.7.1 + echo echo ======================================== echo Done ThirdParty AllClean: Stage3 diff --git a/ThirdParty/AllMake.stage3 b/ThirdParty/AllMake.stage3 index a26cba459..d1884e354 100755 --- a/ThirdParty/AllMake.stage3 +++ b/ThirdParty/AllMake.stage3 @@ -136,6 +136,14 @@ else echo "" fi +# hwloc +if [ -z "$HWLOC_SYSTEM" ] +then + ( rpm_make -p hwloc-1.7.1 -s hwloc-1.7.1.spec -u http://www.open-mpi.org/software/hwloc/v1.7/downloads/hwloc-1.7.1.tar.gz ) +else + echo "Using system installed hwloc" + echo "" +fi echo ======================================== echo Done ThirdParty AllMake: Stage3 diff --git a/ThirdParty/rpmBuild/SPECS/hwloc-1.7.1.spec b/ThirdParty/rpmBuild/SPECS/hwloc-1.7.1.spec new file mode 100644 index 000000000..c4cd90557 --- /dev/null +++ b/ThirdParty/rpmBuild/SPECS/hwloc-1.7.1.spec @@ -0,0 +1,151 @@ +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | +# \\ / A nd | Copyright held by original author +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of OpenFOAM. +# +# OpenFOAM 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 of the License, or (at your +# option) any later version. +# +# OpenFOAM 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 OpenFOAM; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# +# Script +# RPM spec file for hwloc-1.7.1 +# +# Description +# RPM spec file for creating a relocatable RPM +# +# Author: +# Martin Beaudoin, Hydro-Quebec, (2013) +# +#------------------------------------------------------------------------------ + +# We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable +%{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)} +%{expand:%%define _WM_OPTIONS %(echo $WM_OPTIONS)} + +# Disable the generation of debuginfo packages +%define debug_package %{nil} + +# The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory +%define _topdir %{_WM_THIRD_PARTY_DIR}/rpmBuild +%define _tmppath %{_topdir}/tmp + +# Will install the package directly $WM_THIRD_PARTY_DIR +# Some comments about package relocation: +# By using this prefix for the Prefix: parameter in this file, you will make this +# package relocatable. +# +# This is fine, as long as your software is itself relocatable. +# +# Simply take note that libraries built with libtool are not relocatable because the +# prefix we specify will be hard-coded in the library .la files. +# Ref: http://sourceware.org/autobook/autobook/autobook_80.html +# +# In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will +# not be able to reutilize this RPM, even though it is relocatable. You will need to +# regenerate the RPM. +# +%define _prefix %{_WM_THIRD_PARTY_DIR} + +%define name hwloc +%define release %{_WM_OPTIONS} +%define version 1.7.1 + +%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root + +BuildRoot: %{buildroot} +Summary: hwloc +License: the New BSD license +Name: %{name} +Version: %{version} +Release: %{release} +URL: http://www.open-mpi.org/software/hwloc/v1.7/downloads/hwloc-1.7.1.tar.gz +Source: %url/%{name}-%{version}.tar.gz +Prefix: %{_prefix} +Group: Development/Tools + + +%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS} + +%description +%{summary} + +%prep +%setup -q + +%build + # export WM settings in a form that GNU configure recognizes + [ -n "$WM_CC" ] && export CC="$WM_CC" + [ -n "$WM_CXX" ] && export CXX="$WM_CXX" + [ -n "$WM_CFLAGS" ] && export CFLAGS="$WM_CFLAGS" + [ -n "$WM_CXXFLAGS" ] && export CXXFLAGS="$WM_CXXFLAGS" + [ -n "$WM_LDFLAGS" ] && export LDFLAGS="$WM_LDFLAGS" + + ./configure \ + --prefix=%{_installPrefix} + + [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1 + make -j $WM_NCOMPPROCS + +%install + make install DESTDIR=$RPM_BUILD_ROOT + + # Creation of OpenFOAM specific .csh and .sh files" + + echo "" + echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "" + # + # Generate package specific .sh file for OpenFOAM + # +mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc +cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export HWLOC_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS +export HWLOC_BIN_DIR=\$HWLOC_DIR/bin + +# Enable access to the runtime package applications +[ -d \$HWLOC_BIN_DIR ] && _foamAddPath \$HWLOC_BIN_DIR +DOT_SH_EOF + + # + # Generate package specific .csh file for OpenFOAM + # +cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +setenv HWLOC_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS +setenv HWLOC_BIN_DIR \$HWLOC_DIR/bin + +if ( -e \$HWLOC_BIN_DIR ) then + _foamAddPath \$HWLOC_BIN_DIR +endif +DOT_CSH_EOF + + #finally, generate a .tgz file for systems where using rpm for installing packages + # as a non-root user might be a problem. + (mkdir -p %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz packages/%{name}-%{version}) + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{_installPrefix} + diff --git a/etc/prefs.csh-EXAMPLE b/etc/prefs.csh-EXAMPLE index 9599a5195..f6df78398 100644 --- a/etc/prefs.csh-EXAMPLE +++ b/etc/prefs.csh-EXAMPLE @@ -44,7 +44,7 @@ # ~~~~~~~~~~~~~~~~~~~~~~ # # Normally, you don't need to set more than these 3 env. variables -# The other openmpi related variables will be initialized using +# The other openmpi related variables will be initialized using # the command mpicc --showme: # #setenv WM_MPLIB SYSTEMOPENMPI @@ -58,7 +58,7 @@ # Specify system installed ThirdParty packages/libraries # NB: The packages installed under $WM_THIRD_PARTY_DIR -# will always override these values. +# will always override these values. # So build your ThirdParty directory accordingly. # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -114,6 +114,16 @@ #setenv PYTHON_DIR path_to_system_installed_python #setenv PYTHON_BIN_DIR $PYTHON_DIR/bin +# System installed PyFoam +#setenv PYFOAM_SYSTEM 1 +#setenv PYFOAM_DIR path_to_system_installed_python +#setenv PYFOAM_BIN_DIR $PYFOAM_DIR/bin + +# System installed hwloc +#setenv HWLOC_SYSTEM 1 +#setenv HWLOC_DIR path_to_system_installed_hwloc +#setenv HWLOC_BIN_DIR $HWLOC_DIR/bin + # System installed Qt # This is the only package we assume is system installed by default. # So we don't use a variable called QT_SYSTEM, but instead a variable @@ -126,9 +136,9 @@ # properly initialized. # # If you choose instead to use the ThirdParty version of QT, only uncomment -# the variable QT_THIRD_PARTY and set it to 1. Keep the initialization +# the variable QT_THIRD_PARTY and set it to 1. Keep the initialization # of the variables QT_DIR nd QT_BIN_DIR commented. The QT ThirdParty scripts -# will take care of setting the variables QT_DIR and QT_BIN_DIR to the +# will take care of setting the variables QT_DIR and QT_BIN_DIR to the # proper values. # #setenv QT_THIRD_PARTY 1 diff --git a/etc/prefs.sh-EXAMPLE b/etc/prefs.sh-EXAMPLE index 990207083..080826808 100644 --- a/etc/prefs.sh-EXAMPLE +++ b/etc/prefs.sh-EXAMPLE @@ -46,7 +46,7 @@ compilerInstall=System # ~~~~~~~~~~~~~~~~~~~~~~ # # Normally, you don't need to set more than these 3 env. variables -# The other openmpi related variables will be initialized using +# The other openmpi related variables will be initialized using # the command mpicc --showme: # #export WM_MPLIB=SYSTEMOPENMPI @@ -60,7 +60,7 @@ compilerInstall=System # Specify system installed ThirdParty packages/libraries # NB: The packages installed under $WM_THIRD_PARTY_DIR -# will always override these values. +# will always override these values. # So build your ThirdParty directory accordingly. # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -116,6 +116,16 @@ compilerInstall=System #export PYTHON_DIR=path_to_system_installed_python #export PYTHON_BIN_DIR=$PYTHON_DIR/bin +# System installed PyFoam +#export PYFOAM_SYSTEM=1 +#export PYFOAM_DIR=path_to_system_installed_python +#export PYFOAM_BIN_DIR=$PYFOAM_DIR/bin + +# System installed hwloc +#export HWLOC_SYSTEM=1 +#export HWLOC_DIR=path_to_system_installed_hwloc +#export HWLOC_BIN_DIR=$HWLOC_DIR/bin + # System installed Qt # This is the only package we assume is system installed by default. # So we don't use a variable called QT_SYSTEM, but instead a variable @@ -128,9 +138,9 @@ compilerInstall=System # properly initialized. # # If you choose instead to use the ThirdParty version of QT, only uncomment -# the variable QT_THIRD_PARTY and set it to 1. Keep the initialization +# the variable QT_THIRD_PARTY and set it to 1. Keep the initialization # of the variables QT_DIR nd QT_BIN_DIR commented. The QT ThirdParty scripts -# will take care of setting the variables QT_DIR and QT_BIN_DIR to the +# will take care of setting the variables QT_DIR and QT_BIN_DIR to the # proper values. # #export QT_THIRD_PARTY=1 diff --git a/etc/settings.csh b/etc/settings.csh index d71a3ac52..fb7e1e276 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -456,6 +456,12 @@ if ( $?PYFOAM_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/PyFoam-0.6.1/plat _foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.1/platforms/noarch/etc/PyFoam-0.6.1.csh endif +# hwloc +# ~~~~~ +if ( $?HWLOC_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/hwloc-1.7.1/platforms/$WM_OPTIONS ) then + _foamSource $WM_THIRD_PARTY_DIR/packages/hwloc-1.7.1/platforms/$WM_OPTIONS/etc/hwloc-1.7.1.csh +endif + # QT # ~~~~~ if ( $?QT_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/qt-everywhere-opensource-src-4.7.4/platforms/$WM_OPTIONS )then diff --git a/etc/settings.sh b/etc/settings.sh index cb7c1e5cb..042269c11 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -545,6 +545,12 @@ export MPI_BUFFER_SIZE } [ "$FOAM_VERBOSE" -a "$PS1" ] && echo " PYFOAM_DIR is initialized to: $PYFOAM_DIR" +# Load hwloc +# ~~~~~~~~~~~ +[ -z "$HWLOC_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/hwloc-1.7.1/platforms/$WM_OPTIONS ] && { + _foamSource $WM_THIRD_PARTY_DIR/packages/hwloc-1.7.1/platforms/$WM_OPTIONS/etc/hwloc-1.7.1.sh +} +[ "$FOAM_VERBOSE" -a "$PS1" ] && echo " HWLOC_DIR is initialized to: $HWLOC_DIR" # Load QT # ~~~~~~~