exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

openmpi-1.8.8

Browse source
This commit is contained in:
Hrvoje Jasak 2015-08-06 09:55:24 +01:00
parent 29d577235f
commit 2a0b888ff9
8 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ThirdParty/AllMake.stage2 vendored
View file

@ -97,14 +97,12 @@ then
-f --define '_configureAdditionalArgs "$WM_THIRD_PARTY_USE_OPENMPI_165_ConfigureAdditionalArgs"') -f --define '_configureAdditionalArgs "$WM_THIRD_PARTY_USE_OPENMPI_165_ConfigureAdditionalArgs"')
} }
# openmpi 1.8.7 # openmpi 1.8.8
# #
[ ! -z "$WM_THIRD_PARTY_USE_OPENMPI_1*$" ] && { [ ! -z "$WM_THIRD_PARTY_USE_OPENMPI_1*$" ] && {
echo "Building openmpi 1.8.7" echo "Building openmpi 1.8.8"
( 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 \ ( rpm_make -p openmpi-1.8.8 -s openmpi-1.8.8.spec -u http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.8.tar.gz \
-f --define '_configureAdditionalArgs "$WM_THIRD_PARTY_USE_OPENMPI_165_ConfigureAdditionalArgs"') -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 else
echo "Using system installed OpenMPI" echo "Using system installed OpenMPI"

4
ThirdParty/rpmBuild/SPECS/openmpi-1.8.7.spec → ThirdParty/rpmBuild/SPECS/openmpi-1.8.8.spec vendored
View file

@ -22,7 +22,7 @@
# along with foam-extend. If not, see <http://www.gnu.org/licenses/>. # along with foam-extend. If not, see <http://www.gnu.org/licenses/>.
# #
# Script # Script
# RPM spec file for openmpi-1.8.7 # RPM spec file for openmpi-1.8.8
# #
# Description # Description
# RPM spec file for creating a relocatable RPM # RPM spec file for creating a relocatable RPM
@ -62,7 +62,7 @@
%define name openmpi %define name openmpi
%define release %{_WM_OPTIONS} %define release %{_WM_OPTIONS}
%define version 1.8.7 %define version 1.8.8
%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root %define buildroot %{_topdir}/BUILD/%{name}-%{version}-root

2
etc/bashrc
View file

@ -89,7 +89,7 @@ export WM_THIRD_PARTY_USE_CMAKE_322=1
# #
# For AllMake.stage2 # For AllMake.stage2
export WM_THIRD_PARTY_USE_OPENMPI_187=1 export WM_THIRD_PARTY_USE_OPENMPI_188=1
# #
# For AllMake.stage3 # For AllMake.stage3

2
etc/cshrc
View file

@ -81,7 +81,7 @@ setenv WM_THIRD_PARTY_USE_CMAKE_322 1
# #
# For AllMake.stage2 # For AllMake.stage2
setenv WM_THIRD_PARTY_USE_OPENMPI_187 1 setenv WM_THIRD_PARTY_USE_OPENMPI_188 1
# #
# For AllMake.stage3 # For AllMake.stage3

4
etc/prefs.csh-EXAMPLE
View file

@ -195,8 +195,8 @@ setenv WM_THIRD_PARTY_USE_CMAKE_322 1
# #
# For AllMake.stage2 # For AllMake.stage2
setenv WM_THIRD_PARTY_USE_OPENMPI_187 1 setenv WM_THIRD_PARTY_USE_OPENMPI_188 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_188_ConfigureAdditionalArgs '--enable-mpi-cxx --with-verbs=/usr --with-verbs-libdir=/usr/lib64'
#setenv WM_THIRD_PARTY_USE_OPENMPI_165 1 #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_165_ConfigureAdditionalArgs '--enable-mpi-cxx --with-openib=/usr --with-openib-libdir=/usr/lib64'
#setenv WM_THIRD_PARTY_USE_OPENMPI_15 1 #setenv WM_THIRD_PARTY_USE_OPENMPI_15 1

4
etc/prefs.sh-EXAMPLE
View file

@ -205,8 +205,8 @@ export WM_THIRD_PARTY_USE_CMAKE_322=1
# #
# For AllMake.stage2 # For AllMake.stage2
export WM_THIRD_PARTY_USE_OPENMPI_187=1 export WM_THIRD_PARTY_USE_OPENMPI_188=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_188_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=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_165_ConfigureAdditionalArgs='--enable-mpi-cxx --with-openib=/usr --with-openib-libdir=/usr/lib64'
#export WM_THIRD_PARTY_USE_OPENMPI_15=1 #export WM_THIRD_PARTY_USE_OPENMPI_15=1

6
etc/settings.csh
View file

@ -161,11 +161,11 @@ set mpi_version=unknown
switch ("$WM_MPLIB") switch ("$WM_MPLIB")
case OPENMPI: case OPENMPI:
if ($?WM_THIRD_PARTY_USE_OPENMPI_187 != 0 && -d $WM_THIRD_PARTY_DIR/packages/openmpi-1.8.7/platforms/$WM_OPTIONS ) then if ($?WM_THIRD_PARTY_USE_OPENMPI_188 != 0 && -d $WM_THIRD_PARTY_DIR/packages/openmpi-1.8.8/platforms/$WM_OPTIONS ) then
set mpi_version=openmpi-1.8.7 set mpi_version=openmpi-1.8.8
if ($?FOAM_VERBOSE && $?prompt) then if ($?FOAM_VERBOSE && $?prompt) then
echo "Using openmpi-1.8.7 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version" echo "Using openmpi-1.8.8 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version"
endif endif
_foamSource $WM_THIRD_PARTY_DIR/packages/$mpi_version/platforms/$WM_OPTIONS/etc/$mpi_version.csh _foamSource $WM_THIRD_PARTY_DIR/packages/$mpi_version/platforms/$WM_OPTIONS/etc/$mpi_version.csh

6
etc/settings.sh
View file

@ -213,12 +213,12 @@ unset MPI_ARCH_PATH
mpi_version=unknown mpi_version=unknown
case "$WM_MPLIB" in case "$WM_MPLIB" in
OPENMPI) OPENMPI)
if [ ! -z $WM_THIRD_PARTY_USE_OPENMPI_187 ] && [ -e $WM_THIRD_PARTY_DIR/packages/openmpi-1.8.7/platforms/$WM_OPTIONS ] if [ ! -z $WM_THIRD_PARTY_USE_OPENMPI_188 ] && [ -e $WM_THIRD_PARTY_DIR/packages/openmpi-1.8.8/platforms/$WM_OPTIONS ]
then then
mpi_version=openmpi-1.8.7 mpi_version=openmpi-1.8.8
if [ "$FOAM_VERBOSE" -a "$PS1" ] if [ "$FOAM_VERBOSE" -a "$PS1" ]
then then
echo "Using openmpi-1.8.7 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version" echo "Using openmpi-1.8.8 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version"
fi fi
_foamSource $WM_THIRD_PARTY_DIR/packages/$mpi_version/platforms/$WM_OPTIONS/etc/$mpi_version.sh _foamSource $WM_THIRD_PARTY_DIR/packages/$mpi_version/platforms/$WM_OPTIONS/etc/$mpi_version.sh