From 1e973d5fe638babb435c4c9238adeeb89d78ad01 Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Wed, 27 Jun 2018 18:40:28 -0400 Subject: [PATCH] ThirdParty: bumping hwloc to version 2.0.1 --- ThirdParty/AllMake.stage3 | 7 + ThirdParty/rpmBuild/SPECS/hwloc-2.0.1.spec | 149 +++++++++++++++++++++ etc/bashrc | 2 +- etc/cshrc | 2 +- etc/prefs.csh-EXAMPLE | 3 +- etc/prefs.sh-EXAMPLE | 3 +- etc/prefs.sh.mingw | 1 + etc/settings.csh | 3 + etc/settings.sh | 3 + 9 files changed, 169 insertions(+), 4 deletions(-) create mode 100644 ThirdParty/rpmBuild/SPECS/hwloc-2.0.1.spec diff --git a/ThirdParty/AllMake.stage3 b/ThirdParty/AllMake.stage3 index 7f2aaabae..4ce9fbab9 100755 --- a/ThirdParty/AllMake.stage3 +++ b/ThirdParty/AllMake.stage3 @@ -191,6 +191,13 @@ fi # hwloc if [ -z "$HWLOC_SYSTEM" ] then + # hwloc 2.0.1 + # + [ ! -z "$WM_THIRD_PARTY_USE_HWLOC_201" ] && { + echo "Building hwloc 2.0.1" + ( rpm_make -p hwloc-2.0.1 -s hwloc-2.0.1.spec -u http://www.open-mpi.org/software/hwloc/v2.0/downloads/hwloc-2.0.1.tar.gz ) + # ( rpm_make -p hwloc-2.0.1 -s hwloc-2.0.1.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/hwloc-2.0.1.tar.gz ) + } # hwloc 1.10.1 # [ ! -z "$WM_THIRD_PARTY_USE_HWLOC_1101" ] && { diff --git a/ThirdParty/rpmBuild/SPECS/hwloc-2.0.1.spec b/ThirdParty/rpmBuild/SPECS/hwloc-2.0.1.spec new file mode 100644 index 000000000..e5db37875 --- /dev/null +++ b/ThirdParty/rpmBuild/SPECS/hwloc-2.0.1.spec @@ -0,0 +1,149 @@ +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | foam-extend: Open Source CFD +# \\ / O peration | +# \\ / A nd | For copyright notice see file Copyright +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of foam-extend. +# +# foam-extend 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 3 of the License, or (at your +# option) any later version. +# +# foam-extend 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 foam-extend. If not, see . +# +# Script +# RPM spec file for hwloc-2.0.1 +# +# Description +# RPM spec file for creating a relocatable RPM +# +# Author: +# Martin Beaudoin (2018) +# +#------------------------------------------------------------------------------ + +# 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 2.0.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/v2.0/downloads/hwloc-2.0.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 foam-extend specific .csh and .sh files" + + echo "" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" + echo "" + # + # Generate package specific .sh file for foam-extend + # +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 foam-extend + # +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/bashrc b/etc/bashrc index 6da62fd0a..bc0be3e30 100755 --- a/etc/bashrc +++ b/etc/bashrc @@ -107,7 +107,7 @@ export WM_THIRD_PARTY_USE_MESQUITE_212=1 export WM_THIRD_PARTY_USE_SCOTCH_604=1 export WM_THIRD_PARTY_USE_PARMETIS_403=1 export WM_THIRD_PARTY_USE_PYFOAM_064=1 -export WM_THIRD_PARTY_USE_HWLOC_1101=1 +export WM_THIRD_PARTY_USE_HWLOC_201=1 # # For AllMake.stage4 diff --git a/etc/cshrc b/etc/cshrc index 5e7a3b200..b695d7bfa 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -93,7 +93,7 @@ setenv WM_THIRD_PARTY_USE_MESQUITE_212 1 setenv WM_THIRD_PARTY_USE_SCOTCH_604 1 setenv WM_THIRD_PARTY_USE_PARMETIS_403 1 setenv WM_THIRD_PARTY_USE_PYFOAM_064 1 -setenv WM_THIRD_PARTY_USE_HWLOC_1101 1 +setenv WM_THIRD_PARTY_USE_HWLOC_201 1 # # For AllMake.stage4 diff --git a/etc/prefs.csh-EXAMPLE b/etc/prefs.csh-EXAMPLE index e8b838bd5..db0e87e98 100644 --- a/etc/prefs.csh-EXAMPLE +++ b/etc/prefs.csh-EXAMPLE @@ -231,7 +231,8 @@ setenv WM_THIRD_PARTY_USE_SCOTCH_604 1 setenv WM_THIRD_PARTY_USE_PARMETIS_403 1 #setenv WM_THIRD_PARTY_USE_ZOLTAN_36 1 setenv WM_THIRD_PARTY_USE_PYFOAM_064 1 -setenv WM_THIRD_PARTY_USE_HWLOC_1101 1 +setenv WM_THIRD_PARTY_USE_HWLOC_201 1 +#setenv WM_THIRD_PARTY_USE_HWLOC_1101 1 #setenv WM_THIRD_PARTY_USE_HWLOC_172 1 # diff --git a/etc/prefs.sh-EXAMPLE b/etc/prefs.sh-EXAMPLE index bd4c04fd9..a0df31222 100644 --- a/etc/prefs.sh-EXAMPLE +++ b/etc/prefs.sh-EXAMPLE @@ -244,7 +244,8 @@ export WM_THIRD_PARTY_USE_SCOTCH_604=1 export WM_THIRD_PARTY_USE_PARMETIS_403=1 #export WM_THIRD_PARTY_USE_ZOLTAN_36=1 export WM_THIRD_PARTY_USE_PYFOAM_064=1 -export WM_THIRD_PARTY_USE_HWLOC_1101=1 +export WM_THIRD_PARTY_USE_HWLOC_201=1 +#export WM_THIRD_PARTY_USE_HWLOC_1101=1 #export WM_THIRD_PARTY_USE_HWLOC_172=1 # diff --git a/etc/prefs.sh.mingw b/etc/prefs.sh.mingw index 99e46fd58..07acfccaa 100644 --- a/etc/prefs.sh.mingw +++ b/etc/prefs.sh.mingw @@ -230,6 +230,7 @@ export PARAVIEW_BIN_DIR=$PARAVIEW_DIR/bin #export WM_THIRD_PARTY_USE_PARMETIS_403=1 ##export WM_THIRD_PARTY_USE_ZOLTAN_36=1 #export WM_THIRD_PARTY_USE_PYFOAM_064=1 +#export WM_THIRD_PARTY_USE_HWLOC_201=1 #export WM_THIRD_PARTY_USE_HWLOC_1101=1 #export WM_THIRD_PARTY_USE_HWLOC_172=1 diff --git a/etc/settings.csh b/etc/settings.csh index 710502e3b..187163500 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -609,6 +609,9 @@ endif # hwloc # ~~~~~ +if ( $?HWLOC_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_HWLOC_201 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/hwloc-2.0.1/platforms/$WM_OPTIONS ) then + _foamSource $WM_THIRD_PARTY_DIR/packages/hwloc-2.0.1/platforms/$WM_OPTIONS/etc/hwloc-2.0.1.csh +endif if ( $?HWLOC_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_HWLOC_1101 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/hwloc-1.10.1/platforms/$WM_OPTIONS ) then _foamSource $WM_THIRD_PARTY_DIR/packages/hwloc-1.10.1/platforms/$WM_OPTIONS/etc/hwloc-1.10.1.csh endif diff --git a/etc/settings.sh b/etc/settings.sh index 46f0db02a..01ca5b2cd 100755 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -731,6 +731,9 @@ fi # Load hwloc # ~~~~~~~~~~~ +[ -z "$HWLOC_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_HWLOC_201 ] && [ -e $WM_THIRD_PARTY_DIR/packages/hwloc-2.0.1/platforms/$WM_OPTIONS ] && { + _foamSource $WM_THIRD_PARTY_DIR/packages/hwloc-2.0.1/platforms/$WM_OPTIONS/etc/hwloc-2.0.1.sh +} [ -z "$HWLOC_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_HWLOC_1101 ] && [ -e $WM_THIRD_PARTY_DIR/packages/hwloc-1.10.1/platforms/$WM_OPTIONS ] && { _foamSource $WM_THIRD_PARTY_DIR/packages/hwloc-1.10.1/platforms/$WM_OPTIONS/etc/hwloc-1.10.1.sh }