diff --git a/ThirdParty/AllMake.stage2 b/ThirdParty/AllMake.stage2 index 12e8b42bc..33a31c2a5 100755 --- a/ThirdParty/AllMake.stage2 +++ b/ThirdParty/AllMake.stage2 @@ -97,14 +97,14 @@ then -f --define '_configureAdditionalArgs "$WM_THIRD_PARTY_USE_OPENMPI_165_ConfigureAdditionalArgs"') } - # openmpi 1.8.4 + # openmpi 1.8.7 # [ ! -z "$WM_THIRD_PARTY_USE_OPENMPI_1*$" ] && { - echo "Building openmpi 1.8.4" - #( rpm_make -p openmpi-1.8.4 -s openmpi-1.8.4.spec -u http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.4.tar.gz \ - # -f --define '_configureAdditionalArgs "$WM_THIRD_PARTY_USE_OPENMPI_165_ConfigureAdditionalArgs"') - ( rpm_make -p openmpi-1.8.4 -s openmpi-1.8.4.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/openmpi-1.8.4.tar.gz \ + echo "Building openmpi 1.8.7" + ( rpm_make -p openmpi-1.8.7 -s openmpi-1.8.7.spec -u http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.7.tar.gz \ -f --define '_configureAdditionalArgs "$WM_THIRD_PARTY_USE_OPENMPI_165_ConfigureAdditionalArgs"') + #( rpm_make -p openmpi-1.8.6 -s openmpi-1.8.6.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/openmpi-1.8.6.tar.gz \ + # -f --define '_configureAdditionalArgs "$WM_THIRD_PARTY_USE_OPENMPI_165_ConfigureAdditionalArgs"') } else echo "Using system installed OpenMPI" diff --git a/ThirdParty/rpmBuild/SPECS/openmpi-1.8.7.spec b/ThirdParty/rpmBuild/SPECS/openmpi-1.8.7.spec new file mode 100644 index 000000000..60c6e924f --- /dev/null +++ b/ThirdParty/rpmBuild/SPECS/openmpi-1.8.7.spec @@ -0,0 +1,265 @@ +#------------------------------------------------------------------------------ +# ========= | +# \\ / 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 openmpi-1.8.7 +# +# Description +# RPM spec file for creating a relocatable RPM +# +# Author: +# Martin Beaudoin, Hydro-Quebec, (2015) +# +#------------------------------------------------------------------------------ + +# 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 openmpi +%define release %{_WM_OPTIONS} +%define version 1.8.7 + +%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root + +BuildRoot: %{buildroot} +Summary: openmpi +License: Unkown +Name: %{name} +Version: %{version} +Release: %{release} +URL: http://www.open-mpi.org/software/ompi/v1.8/downloads +Source: %url/%{name}-%{version}.tar.gz +Prefix: %{_prefix} +Group: Development/Tools + + +%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS} + +#-------------------------------------------------------------------------- +# +# Here, we define default compiling options for openmpi +# +# One can override the option on the commande line : --define='MACRO EXPR' +# +%{!?_configureAdditionalArgs: %define _configureAdditionalArgs Undefined} + + +%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" + + set +x + echo "" + echo "Compilation options:" + echo " _configureAdditionalArgs : %{_configureAdditionalArgs}" + echo "" + set -x + + unset mpiWith + # Enable GridEngine if it appears to be in use + # If you don't want any integration with SGE, simply unset the SGE + # environment variable + if [ -n "$SGE_ROOT" ] + then + mpiWith="$mpiWith --with-sge" + else + mpiWith="$mpiWith --without-sge" + mpiWith="$mpiWith --enable-mca-no-build=ras-gridengine,pls-gridengine" + fi + + # Infiniband support + # Adjust according to your local paths + # if [ -d /usr/local/ofed -a -d /usr/local/ofed/lib64 ] + # then + # mpiWith="$mpiWith --with-openib=/usr/local/ofed" + # mpiWith="$mpiWith --with-openib-libdir=/usr/local/ofed/lib64" + # fi + + ./configure \ + --prefix=%{_installPrefix} \ + --exec_prefix=%{_installPrefix} \ + --enable-mpirun-prefix-by-default \ + --enable-orterun-prefix-by-default \ + --enable-shared \ + --enable-mpi-cxx \ + --disable-static \ + --disable-mpi-f77 \ + --disable-mpi-f90 \ + --without-slurm \ + --enable-mpi-profile $mpiWith \ + --disable-vt \ + `echo %{?_configureAdditionalArgs}` + + [ -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 +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +export OPENMPI_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS +export OPENMPI_BIN_DIR=\$OPENMPI_DIR/bin +export OPENMPI_LIB_DIR=\$OPENMPI_DIR/lib + +# Enable access to the package runtime applications and libraries +[ -d \$OPENMPI_BIN_DIR ] && _foamAddPath \$OPENMPI_BIN_DIR +[ -d \$OPENMPI_LIB_DIR ] && _foamAddLib \$OPENMPI_LIB_DIR + +export MPI_HOME=\$OPENMPI_DIR +export MPI_ARCH_PATH=\$MPI_HOME +export OPAL_PREFIX=\$MPI_ARCH_PATH + +# We initialize the rest of the environment using mpicc --showme: +export OPENMPI_INCLUDE_DIR="\`mpicc --showme:incdirs\`" +export OPENMPI_COMPILE_FLAGS="\`mpicc --showme:compile\`" +export OPENMPI_LINK_FLAGS="\`mpicc --showme:link\`" + +# Set the foam-extend compilation flags +export PINC=\$OPENMPI_COMPILE_FLAGS +export PLIBS=\$OPENMPI_LINK_FLAGS + + +if [ "\$FOAM_VERBOSE" -a "\$PS1" ] +then + echo " Environment variables defined for OpenMPI:" + echo " OPENMPI_BIN_DIR : \$OPENMPI_BIN_DIR" + echo " OPENMPI_LIB_DIR : \$OPENMPI_LIB_DIR" + echo " OPENMPI_INCLUDE_DIR : \$OPENMPI_INCLUDE_DIR" + echo " OPENMPI_COMPILE_FLAGS : \$OPENMPI_COMPILE_FLAGS" + echo " OPENMPI_LINK_FLAGS : \$OPENMPI_LINK_FLAGS" + echo "" + echo " MPI_HOME : \$MPI_HOME" + echo " MPI_ARCH_PATH : \$MPI_ARCH_PATH" + echo " OPAL_PREFIX : \$OPAL_PREFIX" + echo " PINC : \$PINC" + echo " PLIBS : \$PLIBS" +fi +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 +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +setenv OPENMPI_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS +setenv OPENMPI_BIN_DIR \$OPENMPI_DIR/bin +setenv OPENMPI_LIB_DIR \$OPENMPI_DIR/lib + +# Enable access to the package runtime applications and libraries +if ( -e \$OPENMPI_BIN_DIR ) then + _foamAddPath \$OPENMPI_BIN_DIR +endif + +if ( -e \$OPENMPI_LIB_DIR ) then + _foamAddLib \$OPENMPI_LIB_DIR +endif + +setenv MPI_HOME \$OPENMPI_DIR +setenv MPI_ARCH_PATH \$MPI_HOME +setenv OPAL_PREFIX \$MPI_ARCH_PATH + +# We initialize the rest of the environment using mpicc --showme: +setenv OPENMPI_INCLUDE_DIR "\`mpicc --showme:incdirs\`" +setenv OPENMPI_COMPILE_FLAGS "\`mpicc --showme:compile\`" +setenv OPENMPI_LINK_FLAGS "\`mpicc --showme:link\`" + +# Set the foam-extend compilation flags +setenv PINC "\$OPENMPI_COMPILE_FLAGS" +setenv PLIBS "\$OPENMPI_LINK_FLAGS" + + +if (\$?FOAM_VERBOSE && \$?prompt) then + echo " Environment variables defined for OpenMPI:" + echo " OPENMPI_BIN_DIR : \$OPENMPI_BIN_DIR" + echo " OPENMPI_LIB_DIR : \$OPENMPI_LIB_DIR" + echo " OPENMPI_INCLUDE_DIR : \$OPENMPI_INCLUDE_DIR" + echo " OPENMPI_COMPILE_FLAGS : \$OPENMPI_COMPILE_FLAGS" + echo " OPENMPI_LINK_FLAGS : \$OPENMPI_LINK_FLAGS" + echo "" + echo " MPI_HOME : \$MPI_HOME" + echo " MPI_ARCH_PATH : \$MPI_ARCH_PATH" + echo " OPAL_PREFIX : \$OPAL_PREFIX" + echo " PINC : \$PINC" + echo " PLIBS : \$PLIBS" +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 d7bc08684..08e6cd23d 100755 --- a/etc/bashrc +++ b/etc/bashrc @@ -89,7 +89,7 @@ export WM_THIRD_PARTY_USE_CMAKE_322=1 # # For AllMake.stage2 -export WM_THIRD_PARTY_USE_OPENMPI_184=1 +export WM_THIRD_PARTY_USE_OPENMPI_187=1 # # For AllMake.stage3 diff --git a/etc/cshrc b/etc/cshrc index 2c016f20e..ddce0c96a 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -81,7 +81,7 @@ setenv WM_THIRD_PARTY_USE_CMAKE_322 1 # # For AllMake.stage2 -setenv WM_THIRD_PARTY_USE_OPENMPI_184 1 +setenv WM_THIRD_PARTY_USE_OPENMPI_187 1 # # For AllMake.stage3 @@ -153,7 +153,7 @@ if ( ! $?WM_PRECISION_OPTION ) setenv WM_PRECISION_OPTION DP # WM_COMPILE_OPTION = Opt | Debug | Prof if ( ! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION Opt -#setenv WM_COMPILE_OPTION Opt +setenv WM_COMPILE_OPTION Opt #setenv WM_COMPILE_OPTION Debug # WM_MPLIB = SYSTEMOPENMPI | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI | MVAPICH2 diff --git a/etc/prefs.csh-EXAMPLE b/etc/prefs.csh-EXAMPLE index cf61f1232..1ff932dab 100644 --- a/etc/prefs.csh-EXAMPLE +++ b/etc/prefs.csh-EXAMPLE @@ -195,8 +195,8 @@ setenv WM_THIRD_PARTY_USE_CMAKE_322 1 # # For AllMake.stage2 -setenv WM_THIRD_PARTY_USE_OPENMPI_184 1 -#setenv WM_THIRD_PARTY_USE_OPENMPI_184_ConfigureAdditionalArgs '--enable-mpi-cxx --with-openib=/usr --with-openib-libdir=/usr/lib64' +setenv WM_THIRD_PARTY_USE_OPENMPI_187 1 +setenv WM_THIRD_PARTY_USE_OPENMPI_187_ConfigureAdditionalArgs '--enable-mpi-cxx --with-openib=/usr --with-openib-libdir=/usr/lib64' #setenv WM_THIRD_PARTY_USE_OPENMPI_165 1 #setenv WM_THIRD_PARTY_USE_OPENMPI_165_ConfigureAdditionalArgs '--enable-mpi-cxx --with-openib=/usr --with-openib-libdir=/usr/lib64' #setenv WM_THIRD_PARTY_USE_OPENMPI_15 1 diff --git a/etc/prefs.sh-EXAMPLE b/etc/prefs.sh-EXAMPLE index 1a964b35c..9d82faf8a 100644 --- a/etc/prefs.sh-EXAMPLE +++ b/etc/prefs.sh-EXAMPLE @@ -205,8 +205,8 @@ export WM_THIRD_PARTY_USE_CMAKE_322=1 # # For AllMake.stage2 -export WM_THIRD_PARTY_USE_OPENMPI_184=1 -export WM_THIRD_PARTY_USE_OPENMPI_184_ConfigureAdditionalArgs='--enable-mpi-cxx --with-openib=/usr --with-openib-libdir=/usr/lib64' +export WM_THIRD_PARTY_USE_OPENMPI_187=1 +export WM_THIRD_PARTY_USE_OPENMPI_187_ConfigureAdditionalArgs='--enable-mpi-cxx --with-openib=/usr --with-openib-libdir=/usr/lib64' #export WM_THIRD_PARTY_USE_OPENMPI_165=1 #export WM_THIRD_PARTY_USE_OPENMPI_165_ConfigureAdditionalArgs='--enable-mpi-cxx --with-openib=/usr --with-openib-libdir=/usr/lib64' #export WM_THIRD_PARTY_USE_OPENMPI_15=1 diff --git a/etc/settings.csh b/etc/settings.csh index f655e01cb..2feca66eb 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -161,11 +161,11 @@ set mpi_version=unknown switch ("$WM_MPLIB") case OPENMPI: - if ($?WM_THIRD_PARTY_USE_OPENMPI_184 != 0 && -d $WM_THIRD_PARTY_DIR/packages/openmpi-1.8.4/platforms/$WM_OPTIONS ) then - set mpi_version=openmpi-1.8.4 + if ($?WM_THIRD_PARTY_USE_OPENMPI_187 != 0 && -d $WM_THIRD_PARTY_DIR/packages/openmpi-1.8.7/platforms/$WM_OPTIONS ) then + set mpi_version=openmpi-1.8.7 if ($?FOAM_VERBOSE && $?prompt) then - echo "Using openmpi-1.8.4 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version" + echo "Using openmpi-1.8.7 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version" endif _foamSource $WM_THIRD_PARTY_DIR/packages/$mpi_version/platforms/$WM_OPTIONS/etc/$mpi_version.csh diff --git a/etc/settings.sh b/etc/settings.sh index 5e4d63671..71a92dadd 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -213,12 +213,12 @@ unset MPI_ARCH_PATH mpi_version=unknown case "$WM_MPLIB" in OPENMPI) - if [ ! -z $WM_THIRD_PARTY_USE_OPENMPI_184 ] && [ -e $WM_THIRD_PARTY_DIR/packages/openmpi-1.8.4/platforms/$WM_OPTIONS ] + if [ ! -z $WM_THIRD_PARTY_USE_OPENMPI_187 ] && [ -e $WM_THIRD_PARTY_DIR/packages/openmpi-1.8.7/platforms/$WM_OPTIONS ] then - mpi_version=openmpi-1.8.4 + mpi_version=openmpi-1.8.7 if [ "$FOAM_VERBOSE" -a "$PS1" ] then - echo "Using openmpi-1.8.4 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version" + echo "Using openmpi-1.8.7 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version" fi _foamSource $WM_THIRD_PARTY_DIR/packages/$mpi_version/platforms/$WM_OPTIONS/etc/$mpi_version.sh