From 2a0b888ff954db5385975c9c811e18992b43ac70 Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Thu, 6 Aug 2015 09:55:24 +0100 Subject: [PATCH] openmpi-1.8.8 --- ThirdParty/AllMake.stage2 | 8 +++----- .../SPECS/{openmpi-1.8.7.spec => openmpi-1.8.8.spec} | 4 ++-- etc/bashrc | 2 +- etc/cshrc | 2 +- etc/prefs.csh-EXAMPLE | 4 ++-- etc/prefs.sh-EXAMPLE | 4 ++-- etc/settings.csh | 6 +++--- etc/settings.sh | 6 +++--- 8 files changed, 17 insertions(+), 19 deletions(-) rename ThirdParty/rpmBuild/SPECS/{openmpi-1.8.7.spec => openmpi-1.8.8.spec} (99%) diff --git a/ThirdParty/AllMake.stage2 b/ThirdParty/AllMake.stage2 index 33a31c2a5..062c6dff0 100755 --- a/ThirdParty/AllMake.stage2 +++ b/ThirdParty/AllMake.stage2 @@ -97,14 +97,12 @@ then -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*$" ] && { - 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 \ + echo "Building openmpi 1.8.8" + ( 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"') - #( 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.8.spec similarity index 99% rename from ThirdParty/rpmBuild/SPECS/openmpi-1.8.7.spec rename to ThirdParty/rpmBuild/SPECS/openmpi-1.8.8.spec index 60c6e924f..78530a615 100644 --- a/ThirdParty/rpmBuild/SPECS/openmpi-1.8.7.spec +++ b/ThirdParty/rpmBuild/SPECS/openmpi-1.8.8.spec @@ -22,7 +22,7 @@ # along with foam-extend. If not, see . # # Script -# RPM spec file for openmpi-1.8.7 +# RPM spec file for openmpi-1.8.8 # # Description # RPM spec file for creating a relocatable RPM @@ -62,7 +62,7 @@ %define name openmpi %define release %{_WM_OPTIONS} -%define version 1.8.7 +%define version 1.8.8 %define buildroot %{_topdir}/BUILD/%{name}-%{version}-root diff --git a/etc/bashrc b/etc/bashrc index 08e6cd23d..bff56b656 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_187=1 +export WM_THIRD_PARTY_USE_OPENMPI_188=1 # # For AllMake.stage3 diff --git a/etc/cshrc b/etc/cshrc index ddce0c96a..30df3cc36 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_187 1 +setenv WM_THIRD_PARTY_USE_OPENMPI_188 1 # # For AllMake.stage3 diff --git a/etc/prefs.csh-EXAMPLE b/etc/prefs.csh-EXAMPLE index 1ff932dab..85d2227d9 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_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_188 1 +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_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 9d82faf8a..33f3ce212 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_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_188=1 +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_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 2feca66eb..68b97b7c4 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_187 != 0 && -d $WM_THIRD_PARTY_DIR/packages/openmpi-1.8.7/platforms/$WM_OPTIONS ) then - set mpi_version=openmpi-1.8.7 + 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.8 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 _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 71a92dadd..ea573e647 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_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 - mpi_version=openmpi-1.8.7 + mpi_version=openmpi-1.8.8 if [ "$FOAM_VERBOSE" -a "$PS1" ] 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 _foamSource $WM_THIRD_PARTY_DIR/packages/$mpi_version/platforms/$WM_OPTIONS/etc/$mpi_version.sh