From 17a3fbc9a98e996ad5d619bf97366329819bd50b Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Mon, 10 Jul 2017 12:41:00 -0500
Subject: [PATCH] Use MPICH from package manager

---
 .travis.yml             |  7 ++++---
 tests/travis_install.sh | 13 +------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c1d3c86b21..b842b3bb19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,10 @@ addons:
     packages:
     - gfortran
     - g++
+    - mpich
+    - libmpich-dev
 cache:
   directories:
-  - $HOME/mpich_install
   - $HOME/hdf5_install
   - $HOME/phdf5_install
   - $HOME/nndc_hdf5
@@ -32,10 +33,10 @@ before_install:
   - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION six numpy scipy h5py=2.5 pandas
   - source activate test-environment
 
-  # Install GCC, MPICH, HDF5, PHDF5
+  # Install GCC, HDF5, PHDF5
   - ./tests/travis_install.sh
   - export FC=gfortran
-  - export MPI_DIR=$HOME/mpich_install
+  - export MPI_DIR=/usr
   - export PHDF5_DIR=$HOME/phdf5_install
   - export HDF5_DIR=$HOME/hdf5_install
 
diff --git a/tests/travis_install.sh b/tests/travis_install.sh
index d32101214c..02f84fd3e9 100755
--- a/tests/travis_install.sh
+++ b/tests/travis_install.sh
@@ -2,24 +2,13 @@
 
 set -ev
 
-# Build MPICH
-if [[ ! -e $HOME/mpich_install/bin/mpiexec ]]; then
-    wget -q http://www.mpich.org/static/downloads/3.2/mpich-3.2.tar.gz
-    tar -xzvf mpich-3.2.tar.gz >/dev/null 2>&1
-    cd mpich-3.2
-    ./configure --prefix=$HOME/mpich_install -q
-    make -j 2 &> /dev/null
-    make install &> /dev/null
-    cd ..
-fi
-
 # Build PHDF5
 if [[ ! -e $HOME/phdf5_install/bin/h5pfc ]]; then
     wget -q https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.1/src/hdf5-1.10.1.tar.bz2
     tar -xjf hdf5-1.10.1.tar.bz2
     mv hdf5-1.10.1 phdf5-1.10.1
     cd phdf5-1.10.1
-    CC=$HOME/mpich_install/bin/mpicc FC=$HOME/mpich_install/bin/mpif90 \
+    CC=/usr/bin/mpicc FC=/usr/bin/mpif90 \
       ./configure --prefix=$HOME/phdf5_install -q \
       --enable-fortran --enable-parallel
     make -j 2 &> /dev/null