There will be a short amount of downtime, for git.ligo.org, docs.ligo.org, and chat.ligo.org, starting around approximately 10am CDT on Tuesday 18th June 2019. This is to enable access controls for GitLab Pages. More information can be found here.

Commit f6466b3a authored by James Clark's avatar James Clark

Container cleanup

parent b5359b23
......@@ -19,7 +19,7 @@ test:master:
- master
stage: test
script:
- docker run -u $(id -u):$(id -g) $CI_REGISTRY_IMAGE:latest "/opt/bayeswave/test/test-bayeswave.sh"
- docker run -u $(id -u):$(id -g) $CI_REGISTRY_IMAGE:latest "/opt/lscsoft/bayeswave/test/test-bayeswave.sh"
docker:production:
only:
......@@ -34,7 +34,7 @@ test:production:
- stable
stage: test
script:
- docker run -u $(id -u):$(id -g) $CI_REGISTRY_IMAGE:production "/opt/bayeswave/test/test-bayeswave.sh"
- docker run -u $(id -u):$(id -g) $CI_REGISTRY_IMAGE:production "/opt/lscsoft/bayeswave/test/test-bayeswave.sh"
docker:testing:
only:
......@@ -49,4 +49,4 @@ test:testing:
- testing
stage: test
script:
- docker run -u $(id -u):$(id -g) $CI_REGISTRY_IMAGE:testing "/opt/bayeswave/test/test-bayeswave.sh"
- docker run -u $(id -u):$(id -g) $CI_REGISTRY_IMAGE:testing "/opt/lscsoft/bayeswave/test/test-bayeswave.sh"
......@@ -4,14 +4,12 @@ RUN echo "Building bayeswave"
MAINTAINER James Alexander Clark <james.clark@ligo.org>
# Dependencies
USER root
RUN apt-get update && apt-get install --assume-yes \
build-essential \
pkg-config \
python-pip \
git
RUN python -m pip install --upgrade setuptools pip acor
RUN python -m pip install --upgrade setuptools
# Copy and build BayesWave
WORKDIR /
......@@ -21,15 +19,15 @@ COPY install.sh /
COPY src /src
copy etc/bayeswave-user-env.sh /etc/bayeswave-user-env.sh
COPY BayesWaveUtils /BayesWaveUtils
RUN sh install.sh /opt/bayeswave
COPY test /opt/bayeswave/test
RUN sh install.sh /opt/lscsoft/bayeswave
COPY test /opt/lscsoft/bayeswave/test
RUN rm -rf .git install.sh /src /BayesWaveUtils /etc/bayeswave-user-env.sh
RUN mkdir -p /cvmfs /hdfs /hadoop
# BayesWave env
ENV PATH /opt/bayeswave/bin:${PATH}
ENV LD_LIBRARY_PATH /opt/bayeswave/lib:${LD_LIBRARY_PATH}
ENV PYTHONPATH /opt/bayeswave/lib/python2.7/site-packages:${PYTHONPATH}
ENV PATH /opt/lscsoft/bayeswave/bin:${PATH}
ENV LD_LIBRARY_PATH /opt/lscsoft/bayeswave/lib:${LD_LIBRARY_PATH}
ENV PYTHONPATH /opt/lscsoft/bayeswave/lib/python2.7/site-packages:${PYTHONPATH}
ENTRYPOINT ["/bin/bash"]
......
......@@ -136,11 +136,6 @@ set your environment accordingly. Note that there is an environment script
## BayesWaveUtils
**Requirements**
* acor: a python port of a fast autocorrelation routine is required by
`megasky.py`. This is not part of the LSC software stack and must be
installed manually. Details can be found at
[PyPi](https://pypi.org/project/acor/). The quick and dirty solution is
simply: `pip install acor --user`
* Swig-wrapped LALSuite: provides an easy interface for reading `sim-inspiral`
tables from XML
* Glue: provides tools for segment generation and HTCondor workflows management.
......
......@@ -146,7 +146,7 @@ utils=/opt/bayeswave/utils
* The container can see your `/home`: you are free to point to your own
versions of the bayeswave executables for e.g., code development.
* No bayeswave installation required (You do still need BayesWavePipe, though)
* All dependencies, including `acor`, are baked into the image
* All dependencies are baked into the image
* You are guarenteed to find exactly the same image on all clusters (with
CVMFS) when you use that image path: no need to maintain multiple
BayesWave installations at different sites!
......
#!/bin/bash
# single ifo example with trivial MCMC iterations
BayesWave \
--ifo H1 --H1-flow 32 \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment