From 73c3924f70f859ebf742941d77ef71b74f0fe689 Mon Sep 17 00:00:00 2001
From: Gregory Ashton <gregory.ashton@ligo.org>
Date: Tue, 3 Dec 2019 14:00:19 +1100
Subject: [PATCH] New version of v2 files: tested and shown to built locally

---
 containers/v2-dockerfile-test-suite-python35 | 17 +++++++++--------
 containers/v2-dockerfile-test-suite-python36 | 17 +++++++++--------
 containers/v2-dockerfile-test-suite-python37 | 17 +++++++++--------
 containers/v2-dockerfile-test-suite-python38 | 17 +++++++++--------
 4 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/containers/v2-dockerfile-test-suite-python35 b/containers/v2-dockerfile-test-suite-python35
index b2a9bb8ba..0ee47163f 100644
--- a/containers/v2-dockerfile-test-suite-python35
+++ b/containers/v2-dockerfile-test-suite-python35
@@ -14,6 +14,11 @@ RUN /bin/bash -c "source activate ${conda_env}"
 RUN conda info
 RUN python --version
 
+# Install pymultinest requirements
+RUN apt-get update
+RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \
+libatlas3-base libatlas-base-dev cmake build-essential gfortran
+
 # Install conda-installable programs
 RUN conda install -n ${conda_env} -y matplotlib numpy scipy pandas astropy flake8
 RUN conda install -n ${conda_env} -c anaconda coverage configargparse future
@@ -28,19 +33,15 @@ RUN pip install --upgrade setuptools coverage-badge
 # Install documentation requirements
 RUN pip install sphinx numpydoc nbsphinx sphinx_rtd_theme sphinx-tabs autodoc
 
+# Install dependencies and samplers
 RUN pip install corner lalsuite theano healpy
-
 RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 pymultinest kombine
 
-# Install pymultinest requirements
-RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \
-libatlas3-base libatlas-base-dev cmake build-essential gfortran
-
-# Install pymultinest
+# Install multinest
 RUN git clone https://github.com/farhanferoz/MultiNest.git \
-&& (cd MultiNest/MultiNest_v3.11_CMake/multinest && mkdir build && cd build && cmake .. && make)
+&& (cd MultiNest/MultiNest_v3.12_CMake/multinest && mkdir build && cd build && cmake .. && make)
 
-ENV LD_LIBRARY_PATH $HOME/MultiNest/MultiNest_v3.11_CMake/multinest/lib:
+ENV LD_LIBRARY_PATH $HOME/MultiNest/MultiNest_v3.12_CMake/multinest/lib:
 
 # Install Polychord
 RUN git clone https://github.com/PolyChord/PolyChordLite.git \
diff --git a/containers/v2-dockerfile-test-suite-python36 b/containers/v2-dockerfile-test-suite-python36
index 6d3edb22a..b7664da77 100644
--- a/containers/v2-dockerfile-test-suite-python36
+++ b/containers/v2-dockerfile-test-suite-python36
@@ -14,6 +14,11 @@ RUN /bin/bash -c "source activate ${conda_env}"
 RUN conda info
 RUN python --version
 
+# Install pymultinest requirements
+RUN apt-get update
+RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \
+libatlas3-base libatlas-base-dev cmake build-essential gfortran
+
 # Install conda-installable programs
 RUN conda install -n ${conda_env} -y matplotlib numpy scipy pandas astropy flake8
 RUN conda install -n ${conda_env} -c anaconda coverage configargparse future
@@ -28,19 +33,15 @@ RUN pip install --upgrade setuptools coverage-badge
 # Install documentation requirements
 RUN pip install sphinx numpydoc nbsphinx sphinx_rtd_theme sphinx-tabs autodoc
 
+# Install dependencies and samplers
 RUN pip install corner lalsuite theano healpy
-
 RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 pymultinest kombine
 
-# Install pymultinest requirements
-RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \
-libatlas3-base libatlas-base-dev cmake build-essential gfortran
-
-# Install pymultinest
+# Install multinest
 RUN git clone https://github.com/farhanferoz/MultiNest.git \
-&& (cd MultiNest/MultiNest_v3.11_CMake/multinest && mkdir build && cd build && cmake .. && make)
+&& (cd MultiNest/MultiNest_v3.12_CMake/multinest && mkdir build && cd build && cmake .. && make)
 
-ENV LD_LIBRARY_PATH $HOME/MultiNest/MultiNest_v3.11_CMake/multinest/lib:
+ENV LD_LIBRARY_PATH $HOME/MultiNest/MultiNest_v3.12_CMake/multinest/lib:
 
 # Install Polychord
 RUN git clone https://github.com/PolyChord/PolyChordLite.git \
diff --git a/containers/v2-dockerfile-test-suite-python37 b/containers/v2-dockerfile-test-suite-python37
index 10574c3f5..4d920e2b1 100644
--- a/containers/v2-dockerfile-test-suite-python37
+++ b/containers/v2-dockerfile-test-suite-python37
@@ -14,6 +14,11 @@ RUN /bin/bash -c "source activate ${conda_env}"
 RUN conda info
 RUN python --version
 
+# Install pymultinest requirements
+RUN apt-get update
+RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \
+libatlas3-base libatlas-base-dev cmake build-essential gfortran
+
 # Install conda-installable programs
 RUN conda install -n ${conda_env} -y matplotlib numpy scipy pandas astropy flake8
 RUN conda install -n ${conda_env} -c anaconda coverage configargparse future
@@ -28,19 +33,15 @@ RUN pip install --upgrade setuptools coverage-badge
 # Install documentation requirements
 RUN pip install sphinx numpydoc nbsphinx sphinx_rtd_theme sphinx-tabs autodoc
 
+# Install dependencies and samplers
 RUN pip install corner lalsuite theano healpy
-
 RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 pymultinest kombine
 
-# Install pymultinest requirements
-RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \
-libatlas3-base libatlas-base-dev cmake build-essential gfortran
-
-# Install pymultinest
+# Install multinest
 RUN git clone https://github.com/farhanferoz/MultiNest.git \
-&& (cd MultiNest/MultiNest_v3.11_CMake/multinest && mkdir build && cd build && cmake .. && make)
+&& (cd MultiNest/MultiNest_v3.12_CMake/multinest && mkdir build && cd build && cmake .. && make)
 
-ENV LD_LIBRARY_PATH $HOME/MultiNest/MultiNest_v3.11_CMake/multinest/lib:
+ENV LD_LIBRARY_PATH $HOME/MultiNest/MultiNest_v3.12_CMake/multinest/lib:
 
 # Install Polychord
 RUN git clone https://github.com/PolyChord/PolyChordLite.git \
diff --git a/containers/v2-dockerfile-test-suite-python38 b/containers/v2-dockerfile-test-suite-python38
index 050a31645..b7efcf7a0 100644
--- a/containers/v2-dockerfile-test-suite-python38
+++ b/containers/v2-dockerfile-test-suite-python38
@@ -14,6 +14,11 @@ RUN /bin/bash -c "source activate ${conda_env}"
 RUN conda info
 RUN python --version
 
+# Install pymultinest requirements
+RUN apt-get update
+RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \
+libatlas3-base libatlas-base-dev cmake build-essential gfortran
+
 # Install conda-installable programs
 RUN conda install -n ${conda_env} -y matplotlib numpy scipy pandas astropy flake8
 RUN conda install -n ${conda_env} -c anaconda coverage configargparse future
@@ -28,19 +33,15 @@ RUN pip install --upgrade setuptools coverage-badge
 # Install documentation requirements
 RUN pip install sphinx numpydoc nbsphinx sphinx_rtd_theme sphinx-tabs autodoc
 
+# Install dependencies and samplers
 RUN pip install corner lalsuite theano healpy
-
 RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 pymultinest kombine
 
-# Install pymultinest requirements
-RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \
-libatlas3-base libatlas-base-dev cmake build-essential gfortran
-
-# Install pymultinest
+# Install multinest
 RUN git clone https://github.com/farhanferoz/MultiNest.git \
-&& (cd MultiNest/MultiNest_v3.11_CMake/multinest && mkdir build && cd build && cmake .. && make)
+&& (cd MultiNest/MultiNest_v3.12_CMake/multinest && mkdir build && cd build && cmake .. && make)
 
-ENV LD_LIBRARY_PATH $HOME/MultiNest/MultiNest_v3.11_CMake/multinest/lib:
+ENV LD_LIBRARY_PATH $HOME/MultiNest/MultiNest_v3.12_CMake/multinest/lib:
 
 # Install Polychord
 RUN git clone https://github.com/PolyChord/PolyChordLite.git \
-- 
GitLab