Updated FEniCS to version 1.4.0 and added RHEL 7.0 support

diff --git a/DTM++.toolbox/platforms/supported/fedora20.platform b/DTM++.toolbox/platforms/supported/fedora20.platform
index db6fe3a22efa5f127033a02adb8d58fe49a95cd0..75d2e12e6032b66d4b069de41f7d4cc900aa18e5 100644 (file)
--- a/DTM++.toolbox/platforms/supported/fedora20.platform
+++ b/DTM++.toolbox/platforms/supported/fedora20.platform
@@ -27,7 +27,8 @@ default UMFPACK_INCLUDE_DIR=/usr/include/suitesparse
 
 # Define the packages this platform needs
 PACKAGES=(
-once:hwloc
+#once:hwloc
+once:superlu_dist
 once:hdf5
 once:p4est
 once:trilinos

diff --git a/FEniCS/packages/FEniCS.package b/FEniCS/packages/FEniCS.package
index 11353d5e43104775ca5172cf7a699b1994efcc16..e3905128b1d9a04034b0ef0bd01dea20a5382f7b 100644 (file)
--- a/FEniCS/packages/FEniCS.package
+++ b/FEniCS/packages/FEniCS.package
@@ -1,5 +1,5 @@
 NAME=FEniCS
-VERSION=1.3.0
+VERSION=1.4.0
 BUILDCHAIN=ignore
 
 MODULEFILE_PATH=${INSTALL_PATH}/conf/modulefiles/candi/toolbox/${NAME}

diff --git a/FEniCS/packages/dolfin-stable.package b/FEniCS/packages/dolfin-stable.package
index 2571e31efbe0c83da1a3528f68e656d7e6e35e78..8f728ea41aaed320db52ac720dbefafb54f07280 100644 (file)
--- a/FEniCS/packages/dolfin-stable.package
+++ b/FEniCS/packages/dolfin-stable.package
@@ -1,14 +1,6 @@
-VERSION=1.3.0
+VERSION=1.4.0
 NAME=dolfin-${VERSION}
 SOURCE=https://bitbucket.org/fenics-project/dolfin/downloads/
 PACKING=.tar.gz
-CHECKSUM=bc5b9f18ee7738b2e9e6768c7aa57c58
+CHECKSUM=b736119d524590b6bd0484f09893e018
 
-package_specific_setup () {
-    # Let CMake picks correct VTK, follow-up of issue151
-    # https://bitbucket.org/fenics-project/dolfin/issue/151
-    # Applies to DOLFIN 1.3.0, not applicable to 1.3.0+.
-    if [ "$VERSION" == "1.3.0" ]; then
-      patch -p1 --forward < ${ORIG_DIR}/FEniCS/patches/dolfin-1.3.0-vtk.patch || true
-    fi
-}

diff --git a/FEniCS/packages/ffc-stable.package b/FEniCS/packages/ffc-stable.package
index 3ebbaccf55f8ebc222c794dae1cff42a59310465..69fc07880f70597aae25c0f8a0fd86ed68be1ba9 100644 (file)
--- a/FEniCS/packages/ffc-stable.package
+++ b/FEniCS/packages/ffc-stable.package
@@ -1,5 +1,5 @@
-VERSION=1.3.0
+VERSION=1.4.0
 NAME=ffc-${VERSION}
 SOURCE=https://bitbucket.org/fenics-project/ffc/downloads/
 PACKING=.tar.gz
-CHECKSUM=d57f736ff0b756935a5ffd7c8b30247b
+CHECKSUM=cac802fbbf869911fdd82b72c51a7771

diff --git a/FEniCS/packages/fiat-stable.package b/FEniCS/packages/fiat-stable.package
index 0de3b061d0b6d6bbba9c04dae65d34489cf04da5..46249a8919fa0df6565a93590696765a2cc6aad9 100644 (file)
--- a/FEniCS/packages/fiat-stable.package
+++ b/FEniCS/packages/fiat-stable.package
@@ -1,6 +1,6 @@
-VERSION=1.3.0
+VERSION=1.4.0
 NAME=fiat-${VERSION}
 SOURCE=https://bitbucket.org/fenics-project/fiat/downloads/
 PACKING=.tar.gz
-CHECKSUM=e12267262b97a40fea97c0dad9804dd7
+CHECKSUM=da9c38cf394594091ec4ac2ff652e170
 

diff --git a/FEniCS/packages/instant-stable.package b/FEniCS/packages/instant-stable.package
index 5cd2c8b3712bd6afd4aed73dc48db4d69b7590bf..8096741f7097f139db458e884058771875bb03a6 100644 (file)
--- a/FEniCS/packages/instant-stable.package
+++ b/FEniCS/packages/instant-stable.package
@@ -1,5 +1,5 @@
-VERSION=1.3.0
+VERSION=1.4.0
 NAME=instant-${VERSION}
 SOURCE=https://bitbucket.org/fenics-project/instant/downloads/
 PACKING=.tar.gz
-CHECKSUM=5c25d2ce48ee761a7113f7a80b25327e
+CHECKSUM=e6fa58eb5df4401aac8542110dc1d220

diff --git a/FEniCS/packages/ipython.package b/FEniCS/packages/ipython.package
index b351ee6cabc704d447d9ca9aa2c8230866b9b5b9..5a0ddd8869c5b8fc7cc5e2aee7949819bd4bba48 100644 (file)
--- a/FEniCS/packages/ipython.package
+++ b/FEniCS/packages/ipython.package
@@ -1,6 +1,7 @@
-VERSION=0.11
+VERSION=2.1.0
 NAME=ipython-${VERSION}
-SOURCE=http://archive.ipython.org/release/${VERSION}/
+SOURCE=https://github.com/ipython/ipython/releases/download/rel-${VERSION}/
 PACKING=.tar.gz
+CHECKSUM=785c7b6364c6a0dd34aa4ea970cf83b9
 BUILDCHAIN=python
 

diff --git a/FEniCS/packages/libadjoint.package b/FEniCS/packages/libadjoint.package
index a16fa26faa27b3c14292dbbd6f1e65d031ab2b9d..8c3c1626d0522f6f81304e1dfd7ad3b926178183 100644 (file)
--- a/FEniCS/packages/libadjoint.package
+++ b/FEniCS/packages/libadjoint.package
@@ -1,8 +1,6 @@
 NAME=libadjoint
-SOURCE=lp:
-PACKING=bzr
-BUILDCHAIN=custom
+SOURCE=https://bitbucket.org/dolfin-adjoint/
+PACKING=hg
+BUILDCHAIN=cmake
+CONFOPTS="-DBUILD_SHARED_LIBS:BOOL=ON"
 
-package_specific_build () {
-    make install prefix=${INSTALL_PATH}
-}

diff --git a/FEniCS/packages/matplotlib.package b/FEniCS/packages/matplotlib.package
index 35519cfdf9f8fbfcc32aecef584320c7848a8b2e..63cb5a33f62462de7f0fbd5505a8144b1e6692a6 100644 (file)
--- a/FEniCS/packages/matplotlib.package
+++ b/FEniCS/packages/matplotlib.package
@@ -1,4 +1,6 @@
-NAME=matplotlib-1.0.1
-SOURCE=http://sourceforge.net/projects/matplotlib/files/matplotlib/$NAME/
+VERSION=1.3.1
+NAME=matplotlib-${VERSION}
+SOURCE=http://downloads.sourceforge.net/matplotlib/
 PACKING=.tar.gz
+CHECKSUM=444624ad58de05f9029b0b5811e11c17
 BUILDCHAIN=python

diff --git a/FEniCS/packages/mpfr.package b/FEniCS/packages/mpfr.package
index 6e20f8af618c340a8e7b5291f27ca046f9cc537e..1ea02a6ef8f65415496a10d7a3acf45b310c40ee 100644 (file)
--- a/FEniCS/packages/mpfr.package
+++ b/FEniCS/packages/mpfr.package
@@ -2,13 +2,9 @@ VERSION=3.1.2
 NAME=mpfr-${VERSION}
 SOURCE=http://www.mpfr.org/mpfr-3.1.2/
 PACKING=.tar.bz2
-BUILDCHAIN=custom
+BUILDCHAIN=autotools
 
-package_specific_build () {
-    ./configure --prefix=${INSTALL_PATH} --enable-shared=yes --with-gmp=${GMP_DIR}
-    make -j ${PROCS}
-    make install
-}
+CONFOPTS="--enable-shared=yes --with-gmp=${GMP_DIR}"
 
 package_specific_register () {
     export MPFR_DIR=${INSTALL_PATH}

diff --git a/FEniCS/packages/numpy.package b/FEniCS/packages/numpy.package
index 04cf65701c6c3cc5ee46ee44e330b61795d1148e..507aad63b27f39c83997c7de74c2fd715d5570ba 100644 (file)
--- a/FEniCS/packages/numpy.package
+++ b/FEniCS/packages/numpy.package
@@ -1,6 +1,7 @@
-NAME=numpy-1.6.2
+NAME=numpy-1.8.1
 SOURCE=http://downloads.sourceforge.net/numpy/
 PACKING=.tar.gz
+CHECKSUM=be95babe263bfa3428363d6db5b64678
 BUILDCHAIN=python
 
 package_specific_setup () {
@@ -24,8 +25,6 @@ library_dirs = ${LAPACKANDBLAS_DIR}
 atlas_libs = lapack, blas
 " > site.cfg
     fi
-
-    python setup.py build --fcompiler=gnu95
 }
 
 package_specific_register () {

diff --git a/FEniCS/packages/petsc4py.package b/FEniCS/packages/petsc4py.package
new file mode 100644 (file)
index 0000000..779b3f2
--- /dev/null
+++ b/FEniCS/packages/petsc4py.package
@@ -0,0 +1,11 @@
+VERSION=3.4
+NAME=petsc4py-${VERSION}
+SOURCE=https://bitbucket.org/petsc/petsc4py/downloads/
+PACKING=.tar.gz
+CHECKSUM=f6a2914fe3c057b0bf0eac4330a071ea
+BUILDCHAIN=python
+
+package_specific_setup () {
+    patch -p1 --forward < ${ORIG_DIR}/FEniCS/patches/petsc4py-c++11.patch || true
+}
+

diff --git a/FEniCS/packages/scipy.package b/FEniCS/packages/scipy.package
index f837bd94db6a232fb131408a69fe5245d50e6d15..1c6b981f2474ddcb1542cdb67b40f6c31798e598 100644 (file)
--- a/FEniCS/packages/scipy.package
+++ b/FEniCS/packages/scipy.package
@@ -1,6 +1,7 @@
-NAME=scipy-0.12.0
+NAME=scipy-0.14.0
 SOURCE=http://downloads.sourceforge.net/scipy/
 PACKING=.tar.gz
+CHECKSUM=d7c7f4ccf8b07b08d6fe49d5cd51f85d
 BUILDCHAIN=python
 
 package_specific_setup () {
@@ -32,3 +33,4 @@ umfpack_libs = umfpack
 " >> site.cfg
     fi
 }
+

diff --git a/FEniCS/packages/sympy.package b/FEniCS/packages/sympy.package
index 6f69395ffa751a67a9e2e0708e9f8a7d2d191063..c807fbb5405397c8129e919d52d6a2805bc05a93 100644 (file)
--- a/FEniCS/packages/sympy.package
+++ b/FEniCS/packages/sympy.package
@@ -1,4 +1,5 @@
 NAME=sympy-0.7.1
 SOURCE=http://pypi.python.org/packages/source/s/sympy/
 PACKING=.tar.gz
+CHECKSUM=3847b5ed5c1531bf3c1b849dc2337253
 BUILDCHAIN=python

diff --git a/FEniCS/packages/trilinos.package b/FEniCS/packages/trilinos.package
index d380abd8e8622e6fc0322e2adae44e3b3de92d0e..7f038ea9b91426647e0ac0c119f5ad89085068f2 100644 (file)
--- a/FEniCS/packages/trilinos.package
+++ b/FEniCS/packages/trilinos.package
@@ -12,6 +12,9 @@ CONFOPTS="-D Trilinos_ENABLE_OpenMP:BOOL=OFF \
           -D TPL_ENABLE_TBB:BOOL=OFF \
           -D Trilinos_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=ON \
           -D Trilinos_ENABLE_Epetra:BOOL=ON \
+          -D Trilinos_ENABLE_EpetraExt:BOOL=ON \
+          -D Trilinos_ENABLE_Amesos:BOOL=ON \
+          -D Trilinos_ENABLE_Belos:BOOL=ON \
           -D Trilinos_ENABLE_ML:BOOL=ON \
           -D Trilinos_ENABLE_PyTrilinos:BOOL=ON \
           -D Trilinos_ENABLE_TESTS:BOOL=OFF \

diff --git a/FEniCS/packages/ufl-stable.package b/FEniCS/packages/ufl-stable.package
index 7ba629e1ebc0fe39c2b697180717469b2568aa92..3fcbf25f03c802b770cc99c6b6936e4eae4e8463 100644 (file)
--- a/FEniCS/packages/ufl-stable.package
+++ b/FEniCS/packages/ufl-stable.package
@@ -1,5 +1,5 @@
-VERSION=1.3.0
+VERSION=1.4.0
 NAME=ufl-${VERSION}
 SOURCE=https://bitbucket.org/fenics-project/ufl/downloads/
 PACKING=.tar.gz
-CHECKSUM=c57de98161c10bbbc0339ef2d1a4749d
+CHECKSUM=4c04628f3dd8e68bbfe7af0f4ed583eb

diff --git a/FEniCS/platforms/supported/fedora19.platform b/FEniCS/platforms/supported/fedora19.platform
index 18fe032c149ee30ccea05f5bd0128c92cd2cdd8c..e191c0323873c4f2a332d6c913bf0d3bf638d821 100644 (file)
--- a/FEniCS/platforms/supported/fedora19.platform
+++ b/FEniCS/platforms/supported/fedora19.platform
@@ -51,7 +51,6 @@ once:vtkwithqt
 # once:scotch
 fiat
 ferari
-ufc
 ufl
 ffc
 # syfi

diff --git a/FEniCS/platforms/supported/fedora20.platform b/FEniCS/platforms/supported/fedora20.platform
index 4ea59cbdbd13cec080dcb46149d8ecf100b90716..9783c174b3e61c7009fc722e36eef943894f0b5f 100644 (file)
--- a/FEniCS/platforms/supported/fedora20.platform
+++ b/FEniCS/platforms/supported/fedora20.platform
@@ -41,6 +41,11 @@ default UMFPACK_INCLUDE_DIR=/usr/include/suitesparse
 PACKAGES=(
 skip:FEniCS-prepare
 once:mpi4py
+once:numpy
+once:scipy
+once:matplotlib
+once:ipython
+once:sympy
 once:hdf5
 once:boost
 once:swig
@@ -54,7 +59,6 @@ once:scotch
 # once:pastix
 fiat
 ferari
-ufc
 ufl
 ffc
 # syfi

diff --git a/FEniCS/platforms/supported/rhel6.platform b/FEniCS/platforms/supported/rhel6.platform
index 5ae711e43701b76f9c6ecea468d86e99a806302b..21021a8d6f2704b0a94b2f0c16808805bf9942c6 100644 (file)
--- a/FEniCS/platforms/supported/rhel6.platform
+++ b/FEniCS/platforms/supported/rhel6.platform
@@ -41,6 +41,11 @@ skip:FEniCS-prepare
 once:boost
 once:pcre
 once:scientificpython
+once:numpy
+once:scipy
+once:matplotlib
+once:ipython
+once:sympy
 once:cgal
 once:bazaar
 once:scons
@@ -55,7 +60,6 @@ once:armadillo
 once:scotch
 fiat
 ferari
-ufc
 ufl
 ffc
 # syfi

diff --git a/FEniCS/platforms/supported/rhel7.platform b/FEniCS/platforms/supported/rhel7.platform
new file mode 100644 (file)
index 0000000..baae925
--- /dev/null
+++ b/FEniCS/platforms/supported/rhel7.platform
@@ -0,0 +1,73 @@
+# RHEL 7
+
+# This build script assumes that you have several packages already
+# installed via RHEL's yum using the following command:
+#
+# su -c 'yum install -y redhat-lsb bzr bzrtools subversion \
+# libxml2-devel gcc gcc-c++ openmpi-devel openmpi numpy swig wget \
+# atlas-devel suitesparse-devel blas-devel \
+# lapack-devel cln-devel ginac-devel python-devel cmake \
+# ScientificPython mpfr-devel armadillo-devel gmp-devel CGAL-devel \
+# cppunit-devel flex bison bzip2-devel python-ply eigen3 scotch scotch-devel \
+# hdf5 hdf5-devel vtk-devel vtk-python vtk-qt vtk-qt-python \
+# vtk-qt-tcl vtk-tcl vtk-testing vtkdata.noarch vtk \
+# netcdf-cxx netcdf-cxx-devel netcdf netcdf-devel '
+#
+# If you have multiple MPI libraries installed, make sure the
+# appropriate version is selected. For this, on a 32-bit operating
+# system, run:
+#
+# module load openmpi-i386
+#
+# or on a 64-bit operating system, run:
+#
+# module load openmpi-x86_64
+#
+# After Dorsal has completed, please make sure the following
+# environment variable is set before running any Python DOLFIN
+# programs:
+#
+# export BOOST_DIR=${INSTALL_PATH}
+#
+# Also, if you are using SELinux, you may need to disable it to run
+# DOLFIN programs.
+##
+
+# Platform specific variables
+default PETSC_ARCH=linux-gnu-cxx-opt
+default SCOTCH_ARCH=pc_linux2
+default UMFPACK_INCLUDE_DIR=/usr/include/suitesparse
+
+# Define the packages this platform needs
+PACKAGES=(
+skip:FEniCS-prepare
+once:boost
+once:pcre
+once:scientificpython
+once:numpy
+once:scipy
+once:matplotlib
+once:ipython
+once:sympy
+once:cgal
+once:bazaar
+once:scons
+once:mtl
+once:hdf5
+once:parmetis
+once:swig
+once:trilinos
+once:petsc
+once:slepc
+once:armadillo
+once:scotch
+fiat
+ferari
+ufl
+ffc
+# syfi
+viper
+instant
+dolfin
+skip:FEniCS
+)

diff --git a/FEniCS/platforms/supported/ubuntu13.platform b/FEniCS/platforms/supported/ubuntu13.platform
index ad240350678924f74703cb51315b176fb939a70a..561267b25f1a39d8e9070a19abdd9dc5d845ef5a 100644 (file)
--- a/FEniCS/platforms/supported/ubuntu13.platform
+++ b/FEniCS/platforms/supported/ubuntu13.platform
@@ -31,7 +31,6 @@ petsc
 slepc
 fiat
 #ferari
-ufc
 ufl
 ffc
 instant

diff --git a/candi.sh b/candi.sh
index 3ef631ecce82e94e463cd73c350844c088351c2e..149bbbded8b79d99b6db337a5de8c6bd80d85921 100755 (executable)
--- a/candi.sh
+++ b/candi.sh
@@ -338,6 +338,14 @@ guess_platform() {
             "Schrödinger’s Cat"*) echo fedora19;;
             Heisenbug*)           echo fedora20;;
         esac
+    elif [ -f /etc/redhat-release ]
+    then
+        local RHELNAME=`gawk '{if (match($0,/\((.*)\)/,f)) print f[1]}' /etc/redhat-release`
+        case ${RHELNAME} in
+            "Tikanga"*) echo rhel5;;
+            "Santiago"*) echo rhel6;;
+            "Maipo"*) echo rhel7;;
+        esac
     elif [ -x /usr/bin/sw_vers ]
     then
         local MACOSVER=$(sw_vers -productVersion)

diff --git a/deal.II/platforms/supported/rhel7.platform b/deal.II/platforms/supported/rhel7.platform
new file mode 100644 (file)
index 0000000..8379e34
--- /dev/null
+++ b/deal.II/platforms/supported/rhel7.platform
@@ -0,0 +1,25 @@
+# RHEL 7
+
+# This build script assumes that you have several packages already
+# installed via RHEL's yum using the following command:
+#
+# su -c 'yum install -y svn git wget \
+# @development-tools gcc-c++ cmake \
+# blas blas-devel lapack lapack-devel \
+# doxygen graphviz graphviz-devel qt-devel '
+# 
+# ARPACK: arpack arpack-devel
+# METIS: metis metis-devel
+#
+##
+
+#
+# Define the packages this platform needs
+PACKAGES=(
+once:hdf5
+once:p4est
+once:trilinos
+once:petsc
+once:slepc
+dealii
+)

diff --git a/gcc/platforms/supported/rhel7.platform b/gcc/platforms/supported/rhel7.platform
new file mode 100644 (file)
index 0000000..f2b97bb
--- /dev/null
+++ b/gcc/platforms/supported/rhel7.platform
@@ -0,0 +1,18 @@
+# RHEL 7
+
+# This build script assumes that you have several packages already
+# installed via RHEL's yum using the following command:
+#
+# su -c 'yum install -y \
+# @development-tools gcc-c++ \
+# glibc glibc-devel glibc.i686 glibc-devel.i686 \
+# libmpc libmpc-devel mpfr mpfr-devel gmp gmp-devel \
+# gzip bzip2 '
+#
+##
+
+# Define the packages this platform needs
+PACKAGES=(
+once:gcc
+)
+

diff --git a/local-DTM++.toolbox.cfg b/local-DTM++.toolbox.cfg
index dd7130f440089155cf3cced49177293955c92341..aad0bdc3916c47e27be9f3734f2fa62165b13310 100644 (file)
--- a/local-DTM++.toolbox.cfg
+++ b/local-DTM++.toolbox.cfg
@@ -7,6 +7,8 @@
 PROJECT=DTM++.toolbox
 CLEAN_BUILD=false
 COMPILER=native-openmpi
+#COMPILER=gcc-4.9.0-mvapich2-1.9
+
 # How many processes would you like to build using?
 PROCS=1
 
@@ -30,4 +32,3 @@ INSTALL_PATH=${PREFIX_PATH}/${PROJECT}/${COMPILER}
 # installed.
 STABLE_BUILD=true
 #STABLE_BUILD=false
-

diff --git a/local-FEniCS.cfg b/local-FEniCS.cfg
index 8e0ca080c73405ac93976afa1e0537927f39b3bc..2bbc77c6299d05b5825b8ee4456fb5acc55dbc53 100644 (file)
--- a/local-FEniCS.cfg
+++ b/local-FEniCS.cfg
@@ -27,8 +27,8 @@ INSTALL_PATH=${PREFIX_PATH}/${PROJECT}/${COMPILER}
 PROCS=1
 
 # Would you like to build stable versions of projects?
-#STABLE_BUILD=true
-STABLE_BUILD=false
+STABLE_BUILD=true
+#STABLE_BUILD=false
 # Would you like to use snapshots when using STABLE_BUILD=false?
 USE_SNAPSHOTS=false
 

diff --git a/local-deal.II.cfg b/local-deal.II.cfg
index 7f3a792592e5ed658fb735f02cc5406e4e24cfde..fa9dbd174176d8b573072b995165a91bdb450bde 100644 (file)
--- a/local-deal.II.cfg
+++ b/local-deal.II.cfg
@@ -52,6 +52,7 @@ DEAL_CONFOPTS=" \
 # Prefix directory
 PREFIX_PATH=~/apps/candi
 COMPILER=native-openmpi
+#COMPILER=gcc-4.9.0-openmpi-1.6.5
 
 # Where do you want the downloaded source files to go?
 DOWNLOAD_PATH=${PREFIX_PATH}/src

diff --git a/mpi/packages/mpich.package b/mpi/packages/mpich.package
index 2c2a1d6f2b09c18700f4dcc67fa1b2856485dc32..10f7f22e078c192bfcb84f7f333171aff97acb0e 100644 (file)
--- a/mpi/packages/mpich.package
+++ b/mpi/packages/mpich.package
@@ -9,6 +9,7 @@ PROCS=1
 CONFOPTS="-q CFLAGS=-fPIC CXXFLAGS=-fPIC FFLAGS=-fPIC FCFLAGS=-fPIC"
 INSTALL_PATH=${INSTALL_PATH}/${COMPILER}/${NAME}
 
+INSTALL_PATH=${INSTALL_PATH}/${NAME}
 MODULEFILE_PATH=${INSTALL_PATH}/conf/modulefiles/compiler/mpi/${COMPILER}
 CONFIG_FILE=${MODULEFILE_PATH}/${NAME}
 
@@ -17,14 +18,13 @@ package_specific_conf() {
     # Generate modulefile
 
     mkdir -p ${MODULEFILE_PATH}
+    CONFIG_FILE=${MODULEFILE_PATH}/${NAME}
     rm -f $CONFIG_FILE
     echo "#%Module 1.0
 #
 # ${NAME} against ${COMPILER}
 #
 
-conflict compiler
-
 prepend-path           PATH            ${PATH}
 prepend-path           MANPATH         ${MANPATH}
 prepend-path            INFOPATH       ${INFOPATH}
@@ -43,15 +43,15 @@ setenv                      MPI_SYSCONFIG   ${INSTALL_PATH}/etc
 setenv                 MPI_INCLUDE     ${INSTALL_PATH}/include
 setenv                 MPI_LIB         ${INSTALL_PATH}/lib
 setenv                 MPI_MAN         ${INSTALL_PATH}/share/man
-setenv                 MPI_COMPILER    mpich-x86_64
-setenv                 MPI_SUFFIX      _mpich
+setenv                 MPI_COMPILER    openmpi-x86_64
+setenv                 MPI_SUFFIX      _openmpi
 setenv                 MPI_HOME        ${INSTALL_PATH}
 
 setenv                 CC              ${INSTALL_PATH}/bin/mpicc
 setenv                 CXX             ${INSTALL_PATH}/bin/mpic++
 setenv                 FC              ${INSTALL_PATH}/bin/mpif90
 setenv                 FF              ${INSTALL_PATH}/bin/mpif77
-setenv                 F90             ${INSTALL_PATH}/mpif90
+setenv                 F90             ${INSTALL_PATH}/bin/mpif90
 setenv                 F77             ${INSTALL_PATH}/bin/mpif77
 " >> $CONFIG_FILE
 

diff --git a/mpi/packages/mpich2.package b/mpi/packages/mpich2.package
index 502cc056626efc1e50ce1fa9bb987a60a7b3a807..0a32aad81f21bf7e9c29ce0a730b76d1781eaea4 100644 (file)
--- a/mpi/packages/mpich2.package
+++ b/mpi/packages/mpich2.package
@@ -9,6 +9,7 @@ PROCS=1
 CONFOPTS="-q CFLAGS=-fPIC CXXFLAGS=-fPIC FFLAGS=-fPIC FCFLAGS=-fPIC"
 INSTALL_PATH=${INSTALL_PATH}/${COMPILER}/${NAME}
 
+INSTALL_PATH=${INSTALL_PATH}/${NAME}
 MODULEFILE_PATH=${INSTALL_PATH}/conf/modulefiles/compiler/mpi/${COMPILER}
 CONFIG_FILE=${MODULEFILE_PATH}/${NAME}
 
@@ -17,14 +18,13 @@ package_specific_conf() {
     # Generate modulefile
 
     mkdir -p ${MODULEFILE_PATH}
+    CONFIG_FILE=${MODULEFILE_PATH}/${NAME}
     rm -f $CONFIG_FILE
     echo "#%Module 1.0
 #
 # ${NAME} against ${COMPILER}
 #
 
-conflict compiler
-
 prepend-path           PATH            ${PATH}
 prepend-path           MANPATH         ${MANPATH}
 prepend-path            INFOPATH       ${INFOPATH}
@@ -43,15 +43,15 @@ setenv                      MPI_SYSCONFIG   ${INSTALL_PATH}/etc
 setenv                 MPI_INCLUDE     ${INSTALL_PATH}/include
 setenv                 MPI_LIB         ${INSTALL_PATH}/lib
 setenv                 MPI_MAN         ${INSTALL_PATH}/share/man
-setenv                 MPI_COMPILER    mpich-x86_64
-setenv                 MPI_SUFFIX      _mpich
+setenv                 MPI_COMPILER    openmpi-x86_64
+setenv                 MPI_SUFFIX      _openmpi
 setenv                 MPI_HOME        ${INSTALL_PATH}
 
 setenv                 CC              ${INSTALL_PATH}/bin/mpicc
 setenv                 CXX             ${INSTALL_PATH}/bin/mpic++
 setenv                 FC              ${INSTALL_PATH}/bin/mpif90
 setenv                 FF              ${INSTALL_PATH}/bin/mpif77
-setenv                 F90             ${INSTALL_PATH}/mpif90
+setenv                 F90             ${INSTALL_PATH}/bin/mpif90
 setenv                 F77             ${INSTALL_PATH}/bin/mpif77
 " >> $CONFIG_FILE
 

diff --git a/mpi/packages/mvapich2.package b/mpi/packages/mvapich2.package
new file mode 100644 (file)
index 0000000..d0c6a4d
--- /dev/null
+++ b/mpi/packages/mvapich2.package
@@ -0,0 +1,66 @@
+VERSION=1.9
+NAME=mvapich2-${VERSION}
+SOURCE=http://mvapich.cse.ohio-state.edu/download/mvapich2/
+PACKING=.tgz
+CHECKSUM=5dc58ed08fd3142c260b70fe297e127c
+BUILDCHAIN=autotools
+
+CONFOPTS="--enable-shared"
+#CONFOPTS="--enable-error-messages=all --enable-g=dbg --enable-debuginfo" // for debugging
+
+INSTALL_PATH=${INSTALL_PATH}/${NAME}
+MODULEFILE_PATH=${INSTALL_PATH}/conf/modulefiles/compiler/mpi/${COMPILER}
+CONFIG_FILE=${MODULEFILE_PATH}/${NAME}
+
+# **********************************************************************************
+package_specific_conf() {
+    # Generate modulefile
+
+    mkdir -p ${MODULEFILE_PATH}
+    CONFIG_FILE=${MODULEFILE_PATH}/${NAME}
+    rm -f $CONFIG_FILE
+    echo "#%Module 1.0
+#
+# ${NAME} against ${COMPILER}
+#
+
+prepend-path           PATH            ${PATH}
+prepend-path           MANPATH         ${MANPATH}
+prepend-path            INFOPATH       ${INFOPATH}
+prepend-path           LD_LIBRARY_PATH ${LD_LIBRARY_PATH}
+prepend-path           LD_RUN_PATH     ${LD_RUN_PATH}
+
+setenv                 LIBDIR          ${LIBDIR}
+setenv                 LDFLAGS         \"${LDFLAGS}\"
+
+prepend-path           PATH            ${INSTALL_PATH}/bin
+prepend-path           LD_LIBRARY_PATH ${INSTALL_PATH}/lib
+prepend-path           MANPATH         ${INSTALL_PATH}/share/man
+
+setenv                 MPI_BIN         ${INSTALL_PATH}/bin
+setenv                 MPI_SYSCONFIG   ${INSTALL_PATH}/etc
+setenv                 MPI_INCLUDE     ${INSTALL_PATH}/include
+setenv                 MPI_LIB         ${INSTALL_PATH}/lib
+setenv                 MPI_MAN         ${INSTALL_PATH}/share/man
+setenv                 MPI_COMPILER    mvapich2-x86_64
+setenv                 MPI_SUFFIX      _mvapich2
+setenv                 MPI_HOME        ${INSTALL_PATH}
+
+setenv                 CC              ${INSTALL_PATH}/bin/mpicc
+setenv                 CXX             ${INSTALL_PATH}/bin/mpic++
+setenv                 FC              ${INSTALL_PATH}/bin/mpif90
+setenv                 FF              ${INSTALL_PATH}/bin/mpif77
+setenv                 F90             ${INSTALL_PATH}/bin/mpif90
+setenv                 F77             ${INSTALL_PATH}/bin/mpif77
+" >> $CONFIG_FILE
+
+    echo
+    echo "${NAME} has now been installed in"
+    echo
+    cecho ${GOOD} "    ${INSTALL_PATH}"
+    echo
+    echo "To update your environment variables, use the created modulefile:"
+    echo
+    cecho ${GOOD} "    $CONFIG_FILE"
+    echo
+}

diff --git a/mpi/platforms/supported/fedora19.platform b/mpi/platforms/supported/fedora19.platform
index 8b72349f4384e18dbde2653d7eef4668b4fba799..0f6d2e88e3becfa33eaf134fc80032d71c18eef2 100644 (file)
--- a/mpi/platforms/supported/fedora19.platform
+++ b/mpi/platforms/supported/fedora19.platform
@@ -1,4 +1,4 @@
-# Fedora 20
+# Fedora 19
 
 # This build script assumes that you have installed
 # an appropriate C/C++ and Fortran compiler.
@@ -7,7 +7,8 @@
 
 # Define the packages this platform needs
 PACKAGES=(
-#mpich2
-#mpich
-openmpi
+#once:mpich2
+#once:mpich
+#once:openmpi
+once:mvapich2
 )

diff --git a/mpi/platforms/supported/fedora20.platform b/mpi/platforms/supported/fedora20.platform
index e72b2f0e8d3e9714bd9525f43a09cc7cc18370e6..b4c08d5d6244ff3aaa4d19f168c7a2ebceceff8b 100644 (file)
--- a/mpi/platforms/supported/fedora20.platform
+++ b/mpi/platforms/supported/fedora20.platform
@@ -9,5 +9,7 @@
 PACKAGES=(
 #once:mpich2
 #once:mpich
-once:openmpi
+#once:openmpi
+once:mvapich2
 )
+

diff --git a/mpi/platforms/supported/rhel6.platform b/mpi/platforms/supported/rhel6.platform
index 06f8aebe938e9585c16ffe701c38edf45259046f..50168f7a94340df757277a8045d5f4ea8718c77c 100644 (file)
--- a/mpi/platforms/supported/rhel6.platform
+++ b/mpi/platforms/supported/rhel6.platform
@@ -8,7 +8,9 @@
 
 # Define the packages this platform needs
 PACKAGES=(
-once:mpich2
+#once:mvapich2
+#once:mpich2
 #once:mpich
-#once:openmpi
+once:openmpi
 )
+

diff --git a/mpi/platforms/supported/rhel7.platform b/mpi/platforms/supported/rhel7.platform
new file mode 100644 (file)
index 0000000..7ea5004
--- /dev/null
+++ b/mpi/platforms/supported/rhel7.platform
@@ -0,0 +1,14 @@
+# RHEL 7
+
+# This build script assumes that you have installed
+# an appropriate C/C++ and Fortran compiler.
+#
+# su -c 'yum install -y libtool-ltdl libtool-ltdl-devel'
+##
+
+# Define the packages this platform needs
+PACKAGES=(
+#once:mpich2
+#once:mpich
+once:openmpi
+)