Skip to content

Commit

Permalink
Only install pypar if parallel set
Browse files Browse the repository at this point in the history
  • Loading branch information
stoiver committed Nov 23, 2017
1 parent cc4e567 commit cce4bc4
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions tools/install_conda_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@ ANUGA_PARALLEL=openmpi
brew update
brew install openmpi

# Install pypar
git clone https://github.com/daleroberts/pypar.git;
pushd pypar;
python setup.py install;
popd;

# Install miniconda
wget https://repo.continuum.io/miniconda/Miniconda2-latest-MacOSX-x86_64.sh -O miniconda.sh ;
Expand All @@ -42,6 +37,15 @@ conda create -n anuga_env -c conda-forge --yes python=$PYTHON_VERSION pip numpy

source activate anuga_env

# Install pypar if parallel set
if [[ "$ANUGA_PARALLEL" == "mpich2" || "$ANUGA_PARALLEL" == "openmpi" ]]; then
git clone https://github.com/daleroberts/pypar.git;
pushd pypar;
python setup.py install;
popd;
fi


# python 2.6 doesn't have argparse by default
if [[ "$PYTHON_VERSION" == "2.6" ]]; then conda install --yes argparse; fi

Expand Down

0 comments on commit cce4bc4

Please sign in to comment.