From 20026431a383785b3ebfeee6d82896174b457a6b Mon Sep 17 00:00:00 2001
From: Patrick Godwin <patrick.godwin@ligo.org>
Date: Tue, 5 Feb 2019 08:13:30 -0800
Subject: [PATCH] update O3 optimized makefiles to include datamon dep

---
 .../Makefile.ligosoftware_gcc_gstlal          | 36 +++++++++++++++++--
 .../optimized/Makefile.ligosoftware_icc_all   | 36 +++++++++++++++++--
 2 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/gstlal-inspiral/share/O3/optimized/Makefile.ligosoftware_gcc_gstlal b/gstlal-inspiral/share/O3/optimized/Makefile.ligosoftware_gcc_gstlal
index bc389e5944..13cfc327f3 100644
--- a/gstlal-inspiral/share/O3/optimized/Makefile.ligosoftware_gcc_gstlal
+++ b/gstlal-inspiral/share/O3/optimized/Makefile.ligosoftware_gcc_gstlal
@@ -26,6 +26,7 @@ PATCH_DIR:=${PWD}/patches
 INSTALL_DIR:=${LAL_PATH}
 
 GSTLAL_REPO:=${PWD}/git/gstlal
+DATAMON_REPO:=${PWD}/git/datamon
 LIGOSEGMENTS_REPO:=${PWD}/git/ligo-segments
 PYTHONLIGOLW_REPO:=${PWD}/git/python-ligo-lw
 GLUE_REPO:=${PWD}/git/glue
@@ -36,6 +37,7 @@ DEPS_DIR:=/path/to/deps/dir
 
 # Set to build from git (0 = tarball, 1 = git)
 GSTLAL_GIT=1
+DATAMON_GIT=1
 LIGOSEGMENTS_GIT=0
 PYTHONLIGOLW_GIT=0
 GLUE_GIT=0
@@ -46,6 +48,7 @@ LALSUITE_GIT=0
 # an unknown branch.
 #
 GSTLAL_GIT_BRANCH="master"
+DATAMON_GIT_BRANCH="master"
 LIGOSEGMENTS_GIT_BRANCH="master"
 PYTHONLIGOLW_GIT_BRANCH="master"
 GLUE_GIT_BRANCH="master"
@@ -57,6 +60,7 @@ GSTLALCALIBRATION=gstlal-calibration-1.2.1
 GSTLALBURST=gstlal-burst-0.0.5
 GSTLALUGLY=gstlal-ugly-1.5.5
 GSTLAL=gstlal-1.4.1
+DATAMON=datamon-0.1.0
 LIGOSEGMENTS=ligo-segments-1.1.1
 PYTHONLIGOLW=python-ligo-lw-1.4.0
 GLUE=lscsoft-glue-1.60.0
@@ -76,6 +80,7 @@ GSTLALCALIB_TARGET=$(INSTALL_DIR)/bin/gstlal_compute_strain
 GSTLALBURST_TARGET=$(INSTALL_DIR)/lib/libgstlalburst.so
 GSTLALUGLY_TARGET=$(INSTALL_DIR)/lib/gstreamer-1.0/libgstnds.so
 GSTLAL_TARGET=$(INSTALL_DIR)/lib/libgstlal.so
+DATAMON_TARGET=$(INSTALL_DIR)/lib/python2.7/site-packages/datamon-0.1.0-py2.7.egg
 LIGOSEGMENTS_TARGET=$(INSTALL_DIR)/lib/python2.7/site-packages/ligo_segments-1.1.1-py2.7-linux-x86_64.egg
 PYTHONLIGOLW_TARGET=$(INSTALL_DIR)/lib/python2.7/site-packages/python_ligo_lw-1.4.0-py2.7.egg-info
 GLUE_TARGET=$(INSTALL_DIR)/bin/dmtdq_seg_insert
@@ -95,6 +100,7 @@ GSTLALCALIB_TAR_TARGET=$(TAR_DIR)/$(GSTLALCALIBRATION).tar.gz
 GSTLALBURST_TAR_TARGET=$(TAR_DIR)/$(GSTLALBURST).tar.gz
 GSTLALUGLY_TAR_TARGET=$(TAR_DIR)/$(GSTLALUGLY).tar.gz
 GSTLAL_TAR_TARGET=$(TAR_DIR)/$(GSTLAL).tar.gz
+DATAMON_TAR_TARGET=$(TAR_DIR)/$(DATAMON).tar.gz
 LIGOSEGMENTS_TAR_TARGET=$(TAR_DIR)/$(LIGOSEGMENTS).tar.gz
 PYTHONLIGOLW_TAR_TARGET=$(TAR_DIR)/$(PYTHONLIGOLW).tar.gz
 GLUE_TAR_TARGET=$(TAR_DIR)/$(GLUE).tar.gz
@@ -110,6 +116,7 @@ LAL_TAR_TARGET=$(TAR_DIR)/$(LAL).tar.xz
 
 # git repos
 GSTLAL_GIT_TARGET=$(GSTLAL_REPO)/TODO.md
+DATAMON_GIT_TARGET=$(DATAMON_REPO)/README.md
 LIGOSEGMENTS_GIT_TARGET=$(LIGOSEGMENTS_REPO)/README.rst
 PYTHONLIGOLW_GIT_TARGET=$(PYTHONLIGOLW_REPO)/MANIFEST.in
 GLUE_GIT_TARGET=$(GLUE_REPO)/README
@@ -180,7 +187,7 @@ check :
 # gstlal (all)
 gstlal : $(LOGS_DIR)/gstlal.txt
 
-$(LOGS_DIR)/gstlal.txt : $(LOGS_DIR)/ligo-segments.txt $(GSTLAL_TARGET) $(GSTLALUGLY_TARGET) $(GSTLALBURST_TARGET) $(GSTLALCALIB_TARGET) $(GSTINSPIRAL_TARGET) $(GSTLALBURST_TARGET)
+$(LOGS_DIR)/gstlal.txt : $(LOGS_DIR)/datamon.txt $(GSTLAL_TARGET) $(GSTLALUGLY_TARGET) $(GSTLALBURST_TARGET) $(GSTLALCALIB_TARGET) $(GSTINSPIRAL_TARGET) $(GSTLALBURST_TARGET)
 	@echo $^ | sed -e "s@ @\n@g" > $@
 
 # gstlal-inspiral
@@ -236,7 +243,7 @@ $(GSTLALUGLY_TARGET) : $(GSTLAL_TARGET)
 	fi ;
 
 # gstlal
-$(GSTLAL_TARGET) : $(LIGOSEGMENTS_TARGET)
+$(GSTLAL_TARGET) : $(DATAMON_TARGET)
 	@echo $(GREEN)gstlal$(WHITE) 1>&2
 	if [ "${GSTLAL_GIT}" = "1" ]; then \
 		cd $(GSTLAL_REPO)/gstlal && echo | ./00init.sh ; \
@@ -248,6 +255,21 @@ $(GSTLAL_TARGET) : $(LIGOSEGMENTS_TARGET)
 		cd $(SRC_DIR)/$(GSTLAL) && make -j$(CORES) && make install -j$(CORES) ; \
 	fi ;
 
+# datamon
+datamon : $(LOGS_DIR)/datamon.txt
+
+$(LOGS_DIR)/datamon.txt : $(LOGS_DIR)/ligo-segments.txt $(DATAMON_TARGET)
+	@echo $^ | sed -e "s@ @\n@g" > $@
+
+$(DATAMON_TARGET) : $(LIGOSEGMENTS_TARGET)
+	@echo $(GREEN)datamon$(WHITE) 1>&2
+	if [ "${DATAMON_GIT}" = "1" ]; then \
+		cd $(DATAMON_REPO) && python setup.py install --prefix=$(INSTALL_DIR) ; \
+	else \
+		tar -xzf $(TAR_DIR)/$(DATAMON).tar.gz -C $(SRC_DIR) ; \
+		cd $(SRC_DIR)/$(DATAMON) && python setup.py install --prefix=$(INSTALL_DIR) ; \
+	fi ;
+
 # ligo-segments
 ligo-segments : $(LOGS_DIR)/ligo-segments.txt
 
@@ -456,6 +478,16 @@ $(PATCH_DIR)/gst1.14.patch : $(LOGS_DIR)
 # git repos
 $(LOGS_DIR) :
 	mkdir -p $(SRC_DIR) $(INSTALL_DIR) $(PATCH_DIR) $(TAR_DIR)
+	if [ "${DATAMON_GIT}" = "1" ]; then \
+		if [ -f $@ ] ; then \
+			echo "datamon git repo exists" ; \
+		else \
+			mkdir -p $(DATAMON_REPO) ; \
+			git clone -b $(DATAMON_GIT_BRANCH) https://git.ligo.org/gstlal-visualisation/datamon.git $(DATAMON_REPO) ; \
+		fi ; \
+	else \
+		wget --no-check-certificate http://software.ligo.org/lscsoft/source/$(DATAMON).tar.gz --directory-prefix=$(TAR_DIR) -nc ; \
+	fi ;
 	if [ "${LALSUITE_GIT}" = "1" ]; then \
 		if [ -f $@ ] ; then \
 			echo "Lalsuite git repo exists" ; \
diff --git a/gstlal-inspiral/share/O3/optimized/Makefile.ligosoftware_icc_all b/gstlal-inspiral/share/O3/optimized/Makefile.ligosoftware_icc_all
index 5e47486742..0d65716595 100644
--- a/gstlal-inspiral/share/O3/optimized/Makefile.ligosoftware_icc_all
+++ b/gstlal-inspiral/share/O3/optimized/Makefile.ligosoftware_icc_all
@@ -37,6 +37,7 @@ else
 endif
 
 GSTLAL_REPO:=${PWD}/git/gstlal
+DATAMON_REPO:=${PWD}/git/datamon
 LIGOSEGMENTS_REPO:=${PWD}/git/ligo-segments
 PYTHONLIGOLW_REPO:=${PWD}/git/python-ligo-lw
 GLUE_REPO:=${PWD}/git/glue
@@ -44,6 +45,7 @@ LALSUITE_REPO:=${PWD}/git/lalsuite
 
 # Set to build from git (0 = tarball, 1 = git)
 GSTLAL_GIT=1
+DATAMON_GIT=1
 LIGOSEGMENTS_GIT=0
 PYTHONLIGOLW_GIT=0
 GLUE_GIT=0
@@ -54,6 +56,7 @@ LALSUITE_GIT=0
 # an unknown branch.
 #
 GSTLAL_GIT_BRANCH="master"
+DATAMON_GIT_BRANCH="master"
 LIGOSEGMENTS_GIT_BRANCH="master"
 PYTHONLIGOLW_GIT_BRANCH="master"
 GLUE_GIT_BRANCH="master"
@@ -65,6 +68,7 @@ GSTLALCALIBRATION=gstlal-calibration-1.2.1
 GSTLALBURST=gstlal-burst-0.0.5
 GSTLALUGLY=gstlal-ugly-1.5.5
 GSTLAL=gstlal-1.4.1
+DATAMON=datamon-0.1.0
 LIGOSEGMENTS=ligo-segments-1.1.1
 PYTHONLIGOLW=python-ligo-lw-1.4.0
 GLUE=lscsoft-glue-1.60.0
@@ -97,6 +101,7 @@ GSTLALCALIB_TARGET=$(INSTALL_DIR)/bin/gstlal_compute_strain
 GSTLALBURST_TARGET=$(INSTALL_DIR)/lib/libgstlalburst.so
 GSTLALUGLY_TARGET=$(INSTALL_DIR)/lib/gstreamer-1.0/libgstnds.so
 GSTLAL_TARGET=$(INSTALL_DIR)/lib/libgstlal.so
+DATAMON_TARGET=$(INSTALL_DIR)/lib/python2.7/site-packages/datamon-0.1.0-py2.7.egg
 LIGOSEGMENTS_TARGET=$(INSTALL_DIR)/lib/python2.7/site-packages/ligo_segments-1.1.1-py2.7-linux-x86_64.egg
 PYTHONLIGOLW_TARGET=$(INSTALL_DIR)/lib/python2.7/site-packages/python_ligo_lw-1.4.0-py2.7.egg-info
 GLUE_TARGET=$(INSTALL_DIR)/bin/dmtdq_seg_insert
@@ -130,6 +135,7 @@ GSTLALCALIB_TAR_TARGET=$(TAR_DIR)/$(GSTLALCALIBRATION).tar.gz
 GSTLALBURST_TAR_TARGET=$(TAR_DIR)/$(GSTLALBURST).tar.gz
 GSTLALUGLY_TAR_TARGET=$(TAR_DIR)/$(GSTLALUGLY).tar.gz
 GSTLAL_TAR_TARGET=$(TAR_DIR)/$(GSTLAL).tar.gz
+DATAMON_TAR_TARGET=$(TAR_DIR)/$(DATAMON).tar.gz
 LIGOSEGMENTS_TAR_TARGET=$(TAR_DIR)/$(LIGOSEGMENTS).tar.gz
 PYTHONLIGOLW_TAR_TARGET=$(TAR_DIR)/$(PYTHONLIGOLW).tar.gz
 GLUE_TAR_TARGET=$(TAR_DIR)/$(GLUE).tar.gz
@@ -158,6 +164,7 @@ FFTW_TAR_TARGET=$(TAR_DIR)/$(FFTW).tar.gz
 
 # git repos
 GSTLAL_GIT_TARGET=$(GSTLAL_REPO)/TODO.md
+DATAMON_GIT_TARGET=$(DATAMON_REPO)/README.md
 LIGOSEGMENTS_GIT_TARGET=$(LIGOSEGMENTS_REPO)/README.rst
 PYTHONLIGOLW_GIT_TARGET=$(PYTHONLIGOLW_REPO)/MANIFEST.in
 GLUE_GIT_TARGET=$(GLUE_REPO)/README
@@ -272,7 +279,7 @@ check :
 	@if [ -f $(LOGS_DIR)/gstlal.txt ] ; then ls $(LOGS_DIR)/gstlal.txt >> $(LOGS_DIR)/all.txt ; fi ;
 	@ls -ltrh $$(cat $(LOGS_DIR)/all.txt)
 
-$(LOGS_DIR)/gstlal.txt : $(LOGS_DIR)/glue.txt $(GSTLAL_TARGET) $(GSTLALUGLY_TARGET) $(GSTLALBURST_TARGET) $(GSTLALCALIB_TARGET) $(GSTINSPIRAL_TARGET)
+$(LOGS_DIR)/gstlal.txt : $(LOGS_DIR)/datamon.txt $(GSTLAL_TARGET) $(GSTLALUGLY_TARGET) $(GSTLALBURST_TARGET) $(GSTLALCALIB_TARGET) $(GSTINSPIRAL_TARGET)
 	@echo $^ | sed -e "s@ @\n@g" > $@
 
 # gstlal-inspiral
@@ -328,7 +335,7 @@ $(GSTLALUGLY_TARGET) : $(GSTLAL_TARGET)
 	fi ;
 
 # gstlal
-$(GSTLAL_TARGET) : $(LIGOSEGMENTS_TARGET)
+$(GSTLAL_TARGET) : $(DATAMON_TARGET)
 	@echo $(GREEN)gstlal$(WHITE) 1>&2
 	if [ "${GSTLAL_GIT}" = "1" ]; then \
 		cd $(GSTLAL_REPO)/gstlal && echo | ./00init.sh ; \
@@ -340,6 +347,21 @@ $(GSTLAL_TARGET) : $(LIGOSEGMENTS_TARGET)
 		cd $(SRC_DIR)/$(GSTLAL) && make -j$(CORES) && make install -j$(CORES) ; \
 	fi ;
 
+# datamon
+datamon : $(LOGS_DIR)/datamon.txt
+
+$(LOGS_DIR)/datamon.txt : $(LOGS_DIR)/ligo-segments.txt $(DATAMON_TARGET)
+	@echo $^ | sed -e "s@ @\n@g" > $@
+
+$(DATAMON_TARGET) : $(LIGOSEGMENTS_TARGET)
+	@echo $(GREEN)datamon$(WHITE) 1>&2
+	if [ "${DATAMON_GIT}" = "1" ]; then \
+		cd $(DATAMON_REPO) && python setup.py install --prefix=$(INSTALL_DIR) ; \
+	else \
+		tar -xzf $(TAR_DIR)/$(DATAMON).tar.gz -C $(SRC_DIR) ; \
+		cd $(SRC_DIR)/$(DATAMON) && python setup.py install --prefix=$(INSTALL_DIR) ; \
+	fi ;
+
 # ligo-segments
 ligo-segments : $(LOGS_DIR)/ligo-segments.txt
 
@@ -745,6 +767,16 @@ $(FFTW_TAR_TARGET) : $(LOGS_DIR)
 # git repos
 $(LOGS_DIR) :
 	mkdir -p $(SRC_DIR) $(INSTALL_DIR) $(PATCH_DIR) $(TAR_DIR) $(PYTHON_DIR)
+	if [ "${DATAMON_GIT}" = "1" ]; then \
+		if [ -f $@ ] ; then \
+			echo "datamon git repo exists" ; \
+		else \
+			mkdir -p $(DATAMON_REPO) ; \
+			git clone -b $(DATAMON_GIT_BRANCH) https://git.ligo.org/gstlal-visualisation/datamon.git $(DATAMON_REPO) ; \
+		fi ; \
+	else \
+		wget --no-check-certificate http://software.ligo.org/lscsoft/source/$(DATAMON).tar.gz --directory-prefix=$(TAR_DIR) -nc ; \
+	fi ;
 	if [ "${LALSUITE_GIT}" = "1" ]; then \
 		if [ -f $@ ] ; then \
 			echo "Lalsuite git repo exists" ; \
-- 
GitLab