Commit a0102a4e authored by Adam Mercer's avatar Adam Mercer
Browse files

migrate eccentricity_tides 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
```
......@@ -401,7 +401,6 @@ UNUSED static struct allocNode *FindAlloc(void *p)
return AllocHashTblFind(&key);
}
static void *PadAlloc(size_t * p, size_t n, int keep, const char *func)
{
size_t i;
......@@ -516,7 +515,6 @@ static void *UnPadAlloc(void *p, int keep, const char *func)
return q;
}
static void *PushAlloc(void *p, size_t n, const char *file, int line)
{
struct allocNode *newnode;
......@@ -564,7 +562,6 @@ static void *PopAlloc(void *p, const char *func)
return p;
}
static void *ModAlloc(void *p, void *q, size_t n, const char *func,
const char *file, int line)
{
......
......@@ -34,7 +34,6 @@ void DFUNC (
XLALFree(sequence);
}
SEQUENCETYPE *CFUNC (
size_t length
)
......
......@@ -1143,6 +1143,9 @@ REAL8 calculate_lalsim_snr(SimInspiralTable *inj, char *IFOname, REAL8FrequencyS
polarization=inj->polarization;
REAL8 latitude=inj->latitude;
REAL8 longitude=inj->longitude;
REAL8 eccentricity = inj->eccentricity;
REAL8 f_ecc = inj->f_ecc;
INT4 ecc_order = inj->ecc_order;
LIGOTimeGPS epoch;
memcpy(&epoch,&(inj->geocent_end_time),sizeof(LIGOTimeGPS));
......@@ -1185,10 +1188,13 @@ REAL8 calculate_lalsim_snr(SimInspiralTable *inj, char *IFOname, REAL8FrequencyS
COMPLEX16FrequencySeries *hptilde=NULL;
COMPLEX16FrequencySeries *hctilde=NULL;
//passing f_ecc, ecc_order through LALDict. by KGWG 2017/07/13
XLALDictInsertREAL8Value(LALpars, "f_ecc", f_ecc);
XLALDictInsertINT4Value(LALpars, "ecc_order", ecc_order);
//We do not pass the polarization here, we assume it is taken into account when projecting h+,x onto the detector.
XLAL_TRY(ret=XLALSimInspiralChooseFDWaveform(&hptilde,&hctilde, m1, m2,
s1x, s1y, s1z, s2x, s2y, s2z,
LAL_PC_SI * 1.0e6, iota, phi0, 0., 0., 0.,
LAL_PC_SI * 1.0e6, iota, phi0, 0., eccentricity, 0.,
deltaF, f_min, 0.0, 0.0,
LALpars,approx),errnum);
XLALDestroyDict(LALpars);
......@@ -1280,7 +1286,7 @@ REAL8 calculate_lalsim_snr(SimInspiralTable *inj, char *IFOname, REAL8FrequencyS
timeHplus->data->data[j]*=window->data->data[j];
for (j=0; j<(UINT4) timeHcross->data->length; ++j)
timeHcross->data->data[j]*=window->data->data[j];
for (j=0; j<(UINT4) freqHplus->data->length; ++j)
{
freqHplus->data->data[j]=0.0+I*0.0;
......@@ -1340,7 +1346,7 @@ REAL8 calculate_lalsim_snr(SimInspiralTable *inj, char *IFOname, REAL8FrequencyS
if ( psd )
{
psd = XLALInterpolatePSD(psd, deltaF);
}
}
for (j=lower; j<=(UINT4) upper; ++j)
{
/* derive template (involving location/orientation parameters) from given plus/cross waveforms: */
......
......@@ -23,6 +23,7 @@
#include <stdio.h>
#include <lal/LALMalloc.h>
#include <lal/Date.h>
#include <lal/GenerateInspiral.h>
#include <lal/LALInference.h>
......@@ -302,6 +303,9 @@ INT4 init_ptmcmc(LALInferenceRunState *runState) {
/* Make a single model just to count dimensions */
model = LALInferenceInitCBCModel(runState);
ndim = LALInferenceGetVariableDimensionNonFixedChooseVectors(model->params, count_vectors);
/* added by hwlee and KGWG to free memory for model at 19 sep 2016 */
LALInferenceDestroyInferenceModel(model);
XLALFree(model);
/* Build the temperature ladder */
ladder = LALInferenceBuildHybridTempLadder(runState, ndim);
......@@ -329,6 +333,11 @@ INT4 init_ptmcmc(LALInferenceRunState *runState) {
thread->temperature = ladder[thread->id];
thread->proposal = &LALInferenceCyclicProposal;
//DEBUG hwlee here I think proposalArgs should be Destroyed if not NULL
if(thread->proposalArgs) {
LALInferenceClearVariables(thread->proposalArgs);
XLALFree(thread->proposalArgs);
}
thread->proposalArgs = LALInferenceParseProposalArgs(runState);
thread->cycle = LALInferenceSetupDefaultInspiralProposalCycle(thread->proposalArgs);
......@@ -659,7 +668,6 @@ ProcessParamsTable *LALInferenceContinueMCMC(char *infileName) {
return procParams;
}
int main(int argc, char *argv[]){
INT4 mpirank;
ProcessParamsTable *procParams = NULL, *ppt = NULL;
......@@ -722,7 +730,12 @@ int main(int argc, char *argv[]){
if (mpirank == 0) printf("sampling...\n");
runState->algorithm(runState);
/* added by hwlee and KGWG to remove allocated resources at 26 Sep 2016 */
LALInferenceDestroyRunState(runState);
runState = NULL;
if (mpirank == 0) printf(" ========== main(): finished. ==========\n");
MPI_Finalize();
return XLAL_SUCCESS;
......
......@@ -60,7 +60,7 @@
#define CVS_DATE "$Date$"
#define CVS_NAME_STRING "$Name$"