From 660dae60a6d4acd07503d3703e9026be3b22881a Mon Sep 17 00:00:00 2001
From: Alexander Pace <alexander.pace@Lligo.org>
Date: Wed, 24 Oct 2018 12:55:42 -0700
Subject: [PATCH] added --disable-massmodel option to turn off installation of
lnP_template_signal_BBH_logm_reweighted_mchirp.hdf5. Made madification to
.gitlab-ci.yml
---
.gitlab-ci.yml | 10 ++--------
gstlal-inspiral/configure.ac | 22 ++++++++++++++++++++++
gstlal-inspiral/share/Makefile.am | 8 +++++++-
3 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dee06f4bd3..f6d649bab0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,7 +63,6 @@ level0:gstlal:
image: aepace/gstlal-dev:stretch-mkl
stage: level0
script:
- #- echo "$PWD" > ./pwd_output.out
- cd gstlal
- ./00init.sh
- ./configure --prefix=${GSTLAL_DIR}
@@ -73,7 +72,6 @@ level0:gstlal:
expire_in: 3h
paths:
- ${GSTLAL_DIR}
- - gstlal
when: always
only:
- pushes
@@ -94,7 +92,6 @@ level1:gstlal-ugly:
expire_in: 3h
paths:
- ${GSTLAL_DIR}
- - gstlal-ugly
when: always
only:
- pushes
@@ -115,7 +112,6 @@ level2:gstlal-calibration:
expire_in: 3h
paths:
- ${GSTLAL_DIR}
- - gstlal-calibration
when: always
only:
- pushes
@@ -129,14 +125,13 @@ level2:gstlal-inspiral:
script:
- cd gstlal-inspiral
- ./00init.sh
- - ./configure --prefix=${GSTLAL_DIR}
+ - ./configure --prefix=${GSTLAL_DIR} --disable-massmodel
- make
- make install
artifacts:
expire_in: 3h
paths:
- ${GSTLAL_DIR}
- - gstlal-inspiral
when: always
only:
- pushes
@@ -157,7 +152,6 @@ level2:gstlal-burst:
expire_in: 3h
paths:
- ${GSTLAL_DIR}
- - gstlal-burst
when: always
only:
- pushes
@@ -200,7 +194,7 @@ gstlal-verify:
# -------------------------------------------------------------------
- cd gstlal-inspiral
- ./00init.sh
- - ./configure --prefix=${GSTLAL_DIR}
+ - ./configure --prefix=${GSTLAL_DIR} --disable-massmodel
- make
- make install
- cd ..
diff --git a/gstlal-inspiral/configure.ac b/gstlal-inspiral/configure.ac
index 06c299fd8c..b93b7368e2 100644
--- a/gstlal-inspiral/configure.ac
+++ b/gstlal-inspiral/configure.ac
@@ -295,6 +295,28 @@ AC_SUBST([GSL_CFLAGS])
AC_SUBST([GSL_LIBS])
+#
+# Enable mass model data
+#
+
+
+AC_ARG_ENABLE(
+ [massmodel],
+ AS_HELP_STRING([--enable-massmodel], [enable/disable installation of hdf5 mass model data [default=yes]]),
+ [:],
+ [enable_massmodel=yes])
+
+AS_IF([test "x$enable_massmodel" != "xyes"], [
+ AC_MSG_WARN([Disabling copying of hdf5 mass model data])
+ HAVE_MASSMODEL="no"
+],[
+ AC_MSG_WARN([Copying hdf5 mass model data to $prefix/share])
+ HAVE_MASSMODEL="yes"
+])
+
+
+AM_CONDITIONAL([COND_MASSMODEL], [test "x$enable_massmodel" == "xyes"])
+
#
# Output configure information
#
diff --git a/gstlal-inspiral/share/Makefile.am b/gstlal-inspiral/share/Makefile.am
index 9052fed92a..0b6250e65a 100644
--- a/gstlal-inspiral/share/Makefile.am
+++ b/gstlal-inspiral/share/Makefile.am
@@ -1,4 +1,8 @@
-SUBDIRS = population_models
+if COND_MASSMODEL
+MASSMODELS = population_models
+else
+MASSMODELS =
+endif
dist_pkgdata_DATA = \
de_calc_likelihood.sql \
@@ -23,3 +27,5 @@ inspiral_snr_pdf.xml.gz :
--horizon-distances H1=100,L1=0 \
--horizon-distances H1=100,L1=100 \
--min-instruments 1
+
+SUBDIRS = $(MASSMODELS)
--
GitLab