From a2c84e56d7219494fb0f335ea000cb3d12e3bee5 Mon Sep 17 00:00:00 2001 From: Gregory Ashton <gregory.ashton@ligo.org> Date: Fri, 25 Jan 2019 09:19:42 +1100 Subject: [PATCH] Update testing docker containers * Adds the roq_data from the public repo to /roq_basis * Removes the version specifications from the scipy install. These are not actually being used at all, just creating junk files. --- containers/Dockerfile-test-suite-python27 | 11 ++++++++++- containers/Dockerfile-test-suite-python37 | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/containers/Dockerfile-test-suite-python27 b/containers/Dockerfile-test-suite-python27 index 7a4172877..d886488d2 100644 --- a/containers/Dockerfile-test-suite-python27 +++ b/containers/Dockerfile-test-suite-python27 @@ -20,7 +20,7 @@ echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \ echo "conda activate base" >> ~/.bashrc # Install conda-installable programs -RUN conda install -y numpy>=1.9 scipy>=0.16 matplotlib>=2.0 pandas +RUN conda install -y numpy scipy matplotlib pandas RUN conda install -c conda-forge deepdish @@ -60,3 +60,12 @@ RUN git clone https://github.com/PolyChord/PolyChordLite.git \ # Install PTMCMCSampler RUN git clone https://github.com/jellis18/PTMCMCSampler.git \ && (cd PTMCMCSampler && python setup.py install) + +# Add the ROQ data to the image +RUN mkdir roq_basis \ + && cd roq_basis \ + && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/B_linear.npy \ + && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/B_quadratic.npy \ + && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/fnodes_linear.npy \ + && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/fnodes_quadratic.npy \ + && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/params.dat \ diff --git a/containers/Dockerfile-test-suite-python37 b/containers/Dockerfile-test-suite-python37 index 763927fe4..753120cf6 100644 --- a/containers/Dockerfile-test-suite-python37 +++ b/containers/Dockerfile-test-suite-python37 @@ -21,7 +21,7 @@ echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \ echo "conda activate base" >> ~/.bashrc # Install conda-installable programs -RUN conda install -y numpy>=1.9 scipy>=0.16 matplotlib>=2.0 pandas +RUN conda install -y numpy scipy matplotlib pandas RUN conda install -c conda-forge deepdish @@ -64,3 +64,12 @@ RUN git clone https://github.com/PolyChord/PolyChordLite.git \ # Install PTMCMCSampler RUN git clone https://github.com/jellis18/PTMCMCSampler.git \ && (cd PTMCMCSampler && python setup.py install) + +# Add the ROQ data to the image +RUN mkdir roq_basis \ + && cd roq_basis \ + && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/B_linear.npy \ + && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/B_quadratic.npy \ + && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/fnodes_linear.npy \ + && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/fnodes_quadratic.npy \ + && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/params.dat \ -- GitLab