Commit b3dd7220 authored by Adam Mercer's avatar Adam Mercer

migrate pe_NRSur7dq2 branch

parent 837952ed
image: docker:latest
variables:
DOCKER_DRIVER: overlay
# GIT_DEPTH: 1
COMMIT: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
BRANCH: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
LAL_DIR: $CI_PROJECT_DIR/opt/lalsuite
stages:
- level0
- level1
- level2
- level3
- level4
- nightly
- container
- tag
before_script:
- ulimit -S -c 0
- export VERBOSE="true"
- export PATH=/usr/lib/ccache:$PATH
- export CCACHE_DIR=${PWD}/ccache
- export PKG_CONFIG_PATH=${LAL_DIR}/lib/pkgconfig
- mkdir -p opt/lalsuite
cache:
key: $CI_JOB_NAME
paths:
- ccache
level0:lal:
image: ligo/lalsuite-dev:jessie
stage: level0
script:
- cd lal
- ./00boot
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make dist
- tar xf lal-*.tar.xz
- cd lal-*
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make -j4 V=1
- make -j4 V=1 check
- make -j4 install
- make -j4 install-html
artifacts:
expire_in: 3h
paths:
- opt/lalsuite
only:
- pushes
level1:lalframe:
image: ligo/lalsuite-dev:jessie
stage: level1
script:
- cd lalframe
- ./00boot
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make dist
- tar xf lalframe-*.tar.xz
- cd lalframe-*
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make -j4 V=1
- make -j4 V=1 check
- make -j4 install
- make -j4 install-html
artifacts:
expire_in: 3h
paths:
- opt/lalsuite
dependencies:
- level0:lal
only:
- pushes
level1:lalmetaio:
image: ligo/lalsuite-dev:jessie
stage: level1
script:
- cd lalmetaio
- ./00boot
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make dist
- tar xf lalmetaio-*.tar.xz
- cd lalmetaio-*
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make -j4 V=1
- make -j4 V=1 check
- make -j4 install
- make -j4 install-html
artifacts:
expire_in: 3h
paths:
- opt/lalsuite
dependencies:
- level0:lal
only:
- pushes
level1:lalsimulation:
image: ligo/lalsuite-dev:jessie
stage: level1
script:
- cd lalsimulation
- ./00boot
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make dist
- tar xf lalsimulation-*.tar.xz
- cd lalsimulation-*
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make -j4 V=1
- make -j4 V=1 check
- make -j4 install
- make -j4 install-html
artifacts:
expire_in: 3h
paths:
- opt/lalsuite
dependencies:
- level0:lal
only:
- pushes
level1:lalxml:
image: ligo/lalsuite-dev:jessie
stage: level1
script:
- cd lalxml
- ./00boot
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make dist
- tar xf lalxml-*.tar.xz
- cd lalxml-*
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make -j4 V=1
- make -j4 V=1 check
- make -j4 install
- make -j4 install-html
artifacts:
expire_in: 3h
paths:
- opt/lalsuite
dependencies:
- level0:lal
only:
- pushes
level2:lalburst:
image: ligo/lalsuite-dev:jessie
stage: level2
script:
- cd lalburst
- ./00boot
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make dist
- tar xf lalburst-*.tar.xz
- cd lalburst-*
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make -j4 V=1
- make -j4 V=1 check
- make -j4 install
- make -j4 install-html
artifacts:
expire_in: 3h
paths:
- opt/lalsuite
dependencies:
- level1:lalmetaio
- level1:lalsimulation
only:
- pushes
level2:lalinspiral:
image: ligo/lalsuite-dev:jessie
stage: level2
script:
- cd lalinspiral
- ./00boot
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make dist
- tar xf lalinspiral-*.tar.xz
- cd lalinspiral-*
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make -j4 V=1
- make -j4 V=1 check
- make -j4 install
- make -j4 install-html
artifacts:
expire_in: 3h
paths:
- opt/lalsuite
dependencies:
- level1:lalframe
- level1:lalmetaio
- level1:lalsimulation
only:
- pushes
level2:lalpulsar:
image: ligo/lalsuite-dev:jessie
stage: level2
script:
- cd lalpulsar
- ./00boot
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make dist
- tar xf lalpulsar-*.tar.xz
- cd lalpulsar-*
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make -j4 V=1
- make -j4 V=1 check
- make -j4 install
- make -j4 install-html
artifacts:
expire_in: 3h
paths:
- opt/lalsuite
dependencies:
- level1:lalxml
only:
- pushes
level2:lalstochastic:
image: ligo/lalsuite-dev:jessie
stage: level2
script:
- cd lalstochastic
- ./00boot
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make dist
- tar xf lalstochastic-*.tar.xz
- cd lalstochastic-*
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make -j4 V=1
- make -j4 V=1 check
- make -j4 install
- make -j4 install-html
artifacts:
expire_in: 3h
paths:
- opt/lalsuite
dependencies:
- level1:lalmetaio
only:
- pushes
level3:laldetchar:
image: ligo/lalsuite-dev:jessie
stage: level3
script:
- cd laldetchar
- ./00boot
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make dist
- tar xf laldetchar-*.tar.xz
- cd laldetchar-*
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make -j4 V=1
- make -j4 V=1 check
- make -j4 install
- make -j4 install-html
artifacts:
expire_in: 3h
paths:
- opt/lalsuite
dependencies:
- level2:lalburst
only:
- pushes
level3:lalinference:
image: ligo/lalsuite-dev:jessie
stage: level3
script:
- cd lalinference
- ./00boot
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make dist
- tar xf lalinference-*.tar.xz
- cd lalinference-*
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make -j4 V=1
- make -j4 V=1 check
- make -j4 install
- make -j4 install-html
artifacts:
expire_in: 3h
paths:
- opt/lalsuite
dependencies:
- level2:lalburst
- level2:lalinspiral
- level2:lalpulsar
only:
- pushes
level4:lalapps:
image: ligo/lalsuite-dev:jessie
stage: level4
script:
- cd lalapps
- ./00boot
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make dist
- tar xf lalapps-*.tar.xz
- cd lalapps-*
- ./configure --enable-swig --enable-doxygen --prefix=${LAL_DIR}
- make -j4 V=1
- make -j4 V=1 check
- make -j4 install
- make -j4 install-html
artifacts:
expire_in: 3h
paths:
- opt/lalsuite
dependencies:
- level2:lalstochastic
- level3:laldetchar
- level3:lalinference
only:
- pushes
nightly:top-level:el7:
image: ligo/lalsuite-dev:el7
stage: nightly
script:
- ./00boot
- ./configure --enable-swig --enable-doxygen
- make -j4 distcheck
only:
- schedules
- web
nightly:top-level:jessie:
image: ligo/lalsuite-dev:jessie
stage: nightly
script:
- ./00boot
- ./configure --enable-swig --enable-doxygen
- make -j4 distcheck
only:
- schedules
- web
nightly:top-level:stretch:
image: ligo/lalsuite-dev:stretch
stage: nightly
script:
- ./00boot
- ./configure --enable-swig --enable-doxygen
- make -j4 distcheck
only:
- schedules
- web
nightly:top-level:trusty:
image: skymoo/ligo-lalsuite-dev:trusty
stage: nightly
script:
- ./00boot
- ./configure --disable-swig --enable-doxygen
- make -j4 distcheck
only:
- schedules
- web
nightly:top-level:xenial:
image: skymoo/ligo-lalsuite-dev:xenial
stage: nightly
script:
- ./00boot
- ./configure --disable-swig --enable-doxygen
- make -j4 distcheck
only:
- schedules
- web
nightly:top-level:buster:
image: skymoo/ligo-lalsuite-dev:buster
stage: nightly
script:
- ./00boot
- ./configure --enable-swig-python --enable-doxygen
- make -j4 distcheck
only:
- schedules
- web
allow_failure: true
nightly:mpi:jessie:
image: ligo/lalsuite-dev:jessie
stage: nightly
script:
- ./00boot
- ./configure --enable-swig --enable-doxygen --enable-mpi
- make -j4 distcheck
only:
- schedules
- web
nightly:openmp:jessie:
image: ligo/lalsuite-dev:jessie
stage: nightly
script:
- ./00boot
- ./configure --enable-swig --enable-doxygen --enable-openmp
- make -j4 distcheck
only:
- schedules
- web
nightly:python3:stretch:
image: ligo/lalsuite-dev:stretch
stage: nightly
script:
- ./00boot
- PYTHON=python3 ./configure --enable-swig --enable-doxygen
- make -j4 distcheck
only:
- schedules
- web
pages:
image: ligo/lalsuite-dev:stretch
stage: nightly
script:
- ./00boot
- ./configure --enable-doxygen --prefix=${LAL_DIR}
- make -j4 install-html
- cp -r ${LAL_DIR}/share/doc public/
artifacts:
paths:
- public
only:
- master@adam-mercer/lalsuite-git-lfs
- schedules
- web
except:
- pushes
dockerize:
stage: container
before_script: []
script:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker build --pull -t $COMMIT -t $BRANCH .
- docker push $COMMIT
dependencies:
- level4:lalapps
only:
- pushes
tagged:
stage: tag
only:
- tags
before_script: []
script:
- docker tag $COMMIT $TAG
- docker push $TAG
FROM ligo/lalsuite-runtime:jessie
COPY /opt/lalsuite /opt/lalsuite
ENV LD_LIBRARY_PATH="/opt/lalsuite/lib" \
OCTAVE_PATH="/opt/lalsuite/lib/x86_64-linux-gnu/octave/3.8.2/site/oct/x86_64-pc-linux-gnu" \
PATH="/opt/lalsuite/bin:${PATH}" \
PKG_CONFIG_PATH="/opt/lalsuite/lib/pkgconfig" \
PYTHONPATH="/opt/lalsuite/lib/python2.7/site-packages" \
# LALSuite
This is the main LALSuite development repository, past development is
captured in the repository below:
https://git.ligo.org/lscsoft/lalsuite-archive
This new repository utilizes [git-lfs](https://wiki.ligo.org/DASWG/GitLFS#Install_the_git_LFS_client) for the managament of large files and as such `git-lfs` needs to be installed and configured to correctly clone this repository. After installing `git-lfs` it can be configured using:
```
$ git lfs install
```
This only needs to be done once for each machine you access the repository. It can then be cloned using:
```
$ git clone git@git.ligo.org:lscsoft/lalsuite.git
```
......@@ -2203,8 +2203,7 @@ class BinnedLnPDF(BinnedDensity):
return InterpBinnedArray(self)
def at_centres(self):
with numpy.errstate(divide = "ignore", invalid = "ignore"):
return numpy.log(super(BinnedLnPDF, self).at_centres()) - self.norm
return numpy.log(super(BinnedLnPDF, self).at_centres()) - self.norm
def marginalize(self, dim):
new = super(BinnedLnPDF, self).marginalize(dim)
......@@ -2249,11 +2248,6 @@ class BinnedLnPDF(BinnedDensity):
self.norm = other.norm + math.log1p(math.exp(self.norm - other.norm))
return self
def __add__(self, other):
self = super(BinnedLnPDF, self).__add__(other)
self.normalize()
return self
def copy(self):
new = super(BinnedLnPDF, self).copy()
new.norm = self.norm
......
......@@ -377,8 +377,7 @@ LALSimulateCoherentGW( LALStatus *stat,
} else {
output->sampleUnits = CWsignal->a->sampleUnits;
}
if( snprintf( output->name, LALNameLength, "response to %s", CWsignal->a->name ) >= LALNameLength )
ABORT( stat, SIMULATECOHERENTGWH_ENUL, SIMULATECOHERENTGWH_MSGENUL );
snprintf( output->name, LALNameLength, "response to %s", CWsignal->a->name );
}
/* Define temporary variables to access the data of CWsignal->a,
......
......@@ -112,12 +112,15 @@ extern const int lalNoDebug;
} while ( 0 )
#define ABORT( statusptr, code, mesg ) \
do { if ( (statusptr)->statusPtr ) FREESTATUSPTR( statusptr ); \
do { if ( 1 ) \
{ \
if ( (statusptr)->statusPtr ) FREESTATUSPTR( statusptr ); \
SETSTATUS( statusptr, code, mesg ); \
if ( code ) \
(void) LALError( statusptr, "ABORT:" ); \
(void) LALTrace( statusptr, 1 ); \
return; \
} \
} while ( 0 )
#ifdef LAL_NDEBUG
......
......@@ -353,8 +353,8 @@ int WriteFrame(int argc,char *argv[],struct CommandLineArgsTag CLA)
/* Filters file checksum and cvs info (first 2 lines in filters file) */
{
char buffer[1280];
snprintf(buffer, sizeof(buffer), "Filters file checksum and header: %s\n%s",
char buffer[1024];
snprintf(buffer, sizeof buffer, "Filters file checksum and header: %s\n%s",
InputData.filter_chksum, InputData.filter_vc_info);
XLALFrameAddFrHistory(frame, __FILE__, buffer);
}
......
......@@ -3287,11 +3287,14 @@ void BankEfficiencyParseGetInt(
{
CHAR *tmp;
CHAR msg[2048];
CHAR *tmp1;
tmp1 = argv[*bank_index+1];
if ( argv[*bank_index+1] != NULL )
{
*data = strtol(argv[*bank_index+1], &tmp , 10);
if (*data==0 && argv[*bank_index+1][0] != '0')
if (*data==0 && tmp1[0] != '0')
{
sprintf(msg, "Expect a int after option %s (got %s)\n ",
argv[*bank_index],
......@@ -3302,8 +3305,9 @@ void BankEfficiencyParseGetInt(
}
else
{
sprintf(msg, "Expect a int after option %s (got NULL)\n ",
argv[*bank_index]);
sprintf(msg, "Expect a int after option %s (got %s)\n ",
argv[*bank_index],
argv[*bank_index+1]);
fprintf(stderr, "%s", msg);
exit( 1 );
}
......@@ -3334,11 +3338,13 @@ void BankEfficiencyParseGetDouble(
{
CHAR *tmp;
CHAR msg[2048];
CHAR *tmp2 ;
tmp2 = argv[*bank_index+1];
if (argv[*bank_index+1] != NULL)
{
*data = strtod(argv[*bank_index+1], &tmp );
if (*data == 0 && argv[*bank_index+1][0]!='0')
if (*data == 0 && tmp2[0]!='0')
{
sprintf(msg, "Expect a float after option %s (got %s)\n ",
argv[*bank_index],
......@@ -3348,8 +3354,9 @@ void BankEfficiencyParseGetDouble(
}
else