From 13825bf245eb0b30b4c4c72553b4b662a52b51b3 Mon Sep 17 00:00:00 2001
From: Duncan Meacher <duncan.meacher@ligo.org>
Date: Thu, 15 Feb 2018 15:43:26 -0600
Subject: [PATCH] Removed pylal from optmised post-O2 Makefile
---
.../Makefile.ligosoftware_icc_gstreamer-1.0 | 55 +++++--------------
1 file changed, 14 insertions(+), 41 deletions(-)
diff --git a/gstlal-inspiral/share/post_O2/optimised/Makefile.ligosoftware_icc_gstreamer-1.0 b/gstlal-inspiral/share/post_O2/optimised/Makefile.ligosoftware_icc_gstreamer-1.0
index 4697455af9..3c94ffe212 100644
--- a/gstlal-inspiral/share/post_O2/optimised/Makefile.ligosoftware_icc_gstreamer-1.0
+++ b/gstlal-inspiral/share/post_O2/optimised/Makefile.ligosoftware_icc_gstreamer-1.0
@@ -27,13 +27,11 @@ LOGS_DIR:=logs
PATCH_DIR:=${PWD}/patches
INSTALL_DIR:=${LAL_PATH}
GSTLAL_REPO:=${PWD}/git/gstlal
-PYLAL_REPO:=${PWD}/git/pylal
GLUE_REPO:=${PWD}/git/glue
LALSUITE_REPO:=${PWD}/git/lalsuite
# Set to build from git (0 = tarball, 1 = git)
GSTLAL_GIT=1
-PYLAL_GIT=1
GLUE_GIT=1
LALSUITE_GIT=1
@@ -42,7 +40,6 @@ LALSUITE_GIT=1
# an unknown branch.
#
GSTLAL_GIT_BRANCH="master"
-PYLAL_GIT_BRANCH="master"
GLUE_GIT_BRANCH="master"
LALSUITE_GIT_BRANCH="master"
@@ -52,7 +49,6 @@ GSTLALCALIBRATION=gstlal-calibration-1.1.7
GSTLALUGLY=gstlal-ugly-1.3.1
GSTLAL=gstlal-1.2.1
DOXYGEN=doxygen-1.8.9.1
-PYLAL=pylal-0.13.1
GLUE=glue-1.54.1
LALAPPS=lalapps-6.21.0
LALSTOCHASTIC=lalstochastic-1.1.20
@@ -75,10 +71,12 @@ GSTPYTHON=gst-python-1.4.0
GSTPLUGINSGOOD=gst-plugins-good-1.4.5
GSTPLUGINSBASE=gst-plugins-base-1.4.5
GSTREAMER=gstreamer-1.4.5
-GINTRO=gobject-introspection-1.50.0
+# CIT, LLO, LHO
+#GINTRO=gobject-introspection-1.50.0
+#UWM
+GINTRO=gobject-introspection-1.42.0
GSL=gsl-1.16
ORC=orc-0.4.26
-#PYFFTW=pyFFTW-0.10.4
PYFFTW=pyFFTW-0.9.0
FFTW=fftw-3.3.5
@@ -88,7 +86,6 @@ GSTLALCALIB_TARGET=$(INSTALL_DIR)/bin/gstlal_compute_strain
GSTLALUGLY_TARGET=$(INSTALL_DIR)/lib/gstreamer-1.0/libgstnds.so
GSTLAL_TARGET=$(INSTALL_DIR)/lib/libgstlal.so
DOXYGEN_TARGET=$(INSTALL_DIR)/bin/doxygen
-PYLAL_TARGET=$(INSTALL_DIR)/etc/pylal-user-env.sh
GLUE_TARGET=$(INSTALL_DIR)/bin/dmtdq_seg_insert
LALAPPS_TARGET=$(INSTALL_DIR)/bin/lalapps_psinject
LALSTOCH_TARGET=$(INSTALL_DIR)/lib/liblalstochastic.so
@@ -115,8 +112,10 @@ GINTRO_TARGET=$(INSTALL_DIR)/lib/libgirepository-1.0.so
GSL_2_TARGET=$(INSTALL_DIR)/lib/pkgconfig/gsl.pc.orig
GSL_1_TARGET=$(INSTALL_DIR)/lib/libgsl.so
ORC_TARGET=$(INSTALL_DIR)/lib/liborc-0.4.so
-PYFFTW_TARGET=$(INSTALL_DIR)/lib64/python2.7/site-packages/pyfftw/pyfftw.so
-#PYFFTW_TARGET=$(INSTALL_DIR)/lib/python2.7/site-packages/pyfftw/pyfftw.so
+# CIT, LLO, LHO
+#PYFFTW_TARGET=$(INSTALL_DIR)/lib64/python2.7/site-packages/pyfftw/pyfftw.so
+#UWM
+PYFFTW_TARGET=$(INSTALL_DIR)/lib/python2.7/site-packages/pyfftw/pyfftw.so
FFTW_TARGET=$(INSTALL_DIR)/lib/libfftw3.so
# tarballs
@@ -125,7 +124,6 @@ GSTLALCALIB_TAR_TARGET=$(TAR_DIR)/$(GSTLALCALIBRATION).tar.gz
GSTLALUGLY_TAR_TARGET=$(TAR_DIR)/$(GSTLALUGLY).tar.gz
GSTLAL_TAR_TARGET=$(TAR_DIR)/$(GSTLAL).tar.gz
DOXYGEN_TAR_TARGET=$(TAR_DIR)/$(DOXYGEN).src.tar.gz
-PYLAL_TAR_TARGET=$(TAR_DIR)/$(PYLAL).tar.gz
GLUE_TAR_TARGET=$(TAR_DIR)/$(GLUE).tar.gz
LALAPPS_TAR_TARGET=$(TAR_DIR)/$(LALAPPS).tar.xz
LALSTOCH_TAR_TARGET=$(TAR_DIR)/$(LALSTOCHASTIC).tar.xz
@@ -306,30 +304,15 @@ $(GSTLAL_TARGET) : $(DOXYGEN_TARGET)
# doxygen
doxygen : logs/doxygen.txt
-logs/doxygen.txt : $(LOGS_DIR)/pylal.txt $(DOXYGEN_TARGET)
+logs/doxygen.txt : $(LOGS_DIR)/glue.txt $(DOXYGEN_TARGET)
@echo $^ | sed -e "s@ @\n@g" > $@
-$(DOXYGEN_TARGET) : $(PYLAL_TARGET)
+$(DOXYGEN_TARGET) : $(GLUE_TARGET)
@echo $(GREEN)doxygen$(WHITE) 1>&2
tar -xf $(TAR_DIR)/$(DOXYGEN).src.tar.gz -C $(SRC_DIR)
cd $(SRC_DIR)/$(DOXYGEN) && ./configure --prefix=$(INSTALL_DIR)
cd $(SRC_DIR)/$(DOXYGEN) && make -j$(CORES) && make install -j$(CORES)
-# pylal
-pylal : logs/pylal.txt
-
-logs/pylal.txt : $(LOGS_DIR)/glue.txt $(PYLAL_TARGET)
- @echo $^ | sed -e "s@ @\n@g" > $@
-
-$(PYLAL_TARGET) : $(GLUE_TARGET)
- @echo $(GREEN)pylal$(WHITE) 1>&2
- if [ "${PYLAL_GIT}" = "1" ]; then \
- CC="gcc" CXX="g++" CFLAGS="$(GCCFLAGS)" cd $(PYLAL_REPO) && python setup.py install --prefix=$(INSTALL_DIR) ; \
- else \
- tar -xzf $(TAR_DIR)/$(PYLAL).tar.gz -C $(SRC_DIR) ; \
- CC="gcc" CXX="g++" CFLAGS="$(GCCFLAGS)" cd $(SRC_DIR)/$(PYLAL) && python setup.py install --prefix=$(INSTALL_DIR) ; \
- fi ;
-
# glue
glue : logs/glue.txt
@@ -709,7 +692,7 @@ logs/patch.txt : $(LOGS_DIR)/tar.txt
echo $^ | sed -e "s@ @\n@g" > $@
#tarballs
-logs/tar.txt : $(FFTW_TAR_TARGET) $(PYFFTW_TAR_TARGET) $(ORC_TAR_TARGET) $(GSL_TAR_TARGET) $(GSTREAMER_TAR_TARGET) $(GINTRO_TAR_TARGET) $(GSTBASE_TAR_TARGET) $(GSTGOOD_TAR_TARGET) $(GSTPYTHON_TAR_TARGET) $(LIBFRAME_TAR_TARGET) $(METAIO_TAR_TARGET) $(SWIG_TAR_TARGET) $(LDASTOOLSAL_TAR_TARGET) $(LDASTOOLSFRAMECPP_TAR_TARGET) $(GDS_TAR_TARGET) $(LAL_TAR_TARGET) $(LALFRAME_TAR_TARGET) $(LALMETAIO_TAR_TARGET) $(LALSIM_TAR_TARGET) $(LALBURST_TAR_TARGET) $(LALDETCHAR_TAR_TARGET) $(LALINSPIRAL_TAR_TARGET) $(LALPULSAR_TAR_TARGET) $(LALINFER_TAR_TARGET) $(LALSTOCH_TAR_TARGET) $(LALAPPS_TAR_TARGET) $(GLUE_TAR_TARGET) $(PYLAL_TAR_TARGET) $(DOXYGEN_TAR_TARGET) $(GSTLAL_TAR_TARGET) $(GSTLALUGLY_TAR_TARGET) $(GSTLALCALIB_TAR_TARGET) $(GSTLALINSPIRAL_TAR_TARGET)
+logs/tar.txt : $(FFTW_TAR_TARGET) $(PYFFTW_TAR_TARGET) $(ORC_TAR_TARGET) $(GSL_TAR_TARGET) $(GSTREAMER_TAR_TARGET) $(GINTRO_TAR_TARGET) $(GSTBASE_TAR_TARGET) $(GSTGOOD_TAR_TARGET) $(GSTPYTHON_TAR_TARGET) $(LIBFRAME_TAR_TARGET) $(METAIO_TAR_TARGET) $(SWIG_TAR_TARGET) $(LDASTOOLSAL_TAR_TARGET) $(LDASTOOLSFRAMECPP_TAR_TARGET) $(GDS_TAR_TARGET) $(LAL_TAR_TARGET) $(LALFRAME_TAR_TARGET) $(LALMETAIO_TAR_TARGET) $(LALSIM_TAR_TARGET) $(LALBURST_TAR_TARGET) $(LALDETCHAR_TAR_TARGET) $(LALINSPIRAL_TAR_TARGET) $(LALPULSAR_TAR_TARGET) $(LALINFER_TAR_TARGET) $(LALSTOCH_TAR_TARGET) $(LALAPPS_TAR_TARGET) $(GLUE_TAR_TARGET) $(DOXYGEN_TAR_TARGET) $(GSTLAL_TAR_TARGET) $(GSTLALUGLY_TAR_TARGET) $(GSTLALCALIB_TAR_TARGET) $(GSTLALINSPIRAL_TAR_TARGET)
echo $^ | sed -e "s@ @\n@g" > $@
$(GSTLALINSPIRAL_TAR_TARGET) : $(GSTLALCALIB_TAR_TARGET)
@@ -727,9 +710,6 @@ $(GSTLAL_TAR_TARGET) : $(DOXYGEN_TAR_TARGET)
$(DOXYGEN_TAR_TARGET) : $(PYLAL_TAR_TARGET)
wget --no-check-certificate ftp://ftp.stack.nl/pub/users/dimitri/$(DOXYGEN).src.tar.gz --directory-prefix=$(TAR_DIR) -nc
-$(PYLAL_TAR_TARGET) : $(GLUE_TAR_TARGET)
- wget --no-check-certificate http://software.ligo.org/lscsoft/source/$(PYLAL).tar.gz --directory-prefix=$(TAR_DIR) -nc
-
$(GLUE_TAR_TARGET) : $(LALAPPS_TAR_TARGET)
wget --no-check-certificate http://software.ligo.org/lscsoft/source/$(GLUE).tar.gz --directory-prefix=$(TAR_DIR) -nc
@@ -797,7 +777,8 @@ $(GSTREAMER_TAR_TARGET) : $(GINTRO_TAR_TARGET)
wget --no-check-certificate http://gstreamer.freedesktop.org/src/gstreamer/$(GSTREAMER).tar.xz --directory-prefix=$(TAR_DIR) -nc
$(GINTRO_TAR_TARGET) : $(GSL_TAR_TARGET)
- wget --no-check-certificate http://ftp.gnome.org/pub/gnome/sources/gobject-introspection/1.50/$(GINTRO).tar.xz --directory-prefix=$(TAR_DIR) -nc
+ #wget --no-check-certificate http://ftp.gnome.org/pub/gnome/sources/gobject-introspection/1.50/$(GINTRO).tar.xz --directory-prefix=$(TAR_DIR) -nc
+ wget --no-check-certificate http://ftp.gnome.org/pub/gnome/sources/gobject-introspection/1.42/$(GINTRO).tar.xz --directory-prefix=$(TAR_DIR) -nc
$(GSL_TAR_TARGET) : $(ORC_TAR_TARGET)
wget --no-check-certificate http://ftp.gnu.org/gnu/gsl/$(GSL).tar.gz --directory-prefix=$(TAR_DIR) -nc
@@ -830,14 +811,6 @@ $(LOGS_DIR) :
git clone -b $(GLUE_GIT_BRANCH) https://git.ligo.org/lscsoft/glue.git $(GLUE_REPO) ; \
fi ; \
fi ;
- if [ "${PYLAL_GIT}" = "1" ]; then \
- if [ -f $@ ] ; then \
- echo "Pylal git repo exists" ; \
- else \
- mkdir -p $(PYLAL_REPO) ; \
- git clone -b $(PYLAL_GIT_BRANCH) https://git.ligo.org/lscsoft/pylal.git $(PYLAL_REPO) ; \
- fi ; \
- fi ;
if [ "${GSTLAL_GIT}" = "1" ]; then \
if [ -f $@ ] ; then \
echo "Gstlal git repo exists" ; \
@@ -867,7 +840,7 @@ clean-doxygen :
rm -rf logs/doxygen.txt $(DOXYGEN_TARGET)
clean-lalsuite :
- rm -rf logs/lalsuite.txt $(LAL_TARGET) $(LALFRAME_TARGET) $(LALMETAIO_TARGET) $(LALSIM_TARGET) $(LALBURST_TARGET) $(LALDETCHAR_TARGET) $(LALINSPIRAL_TARGET) $(LALPULSAR_TARGET) $(LALINFER_TARGET) $(LALSTOCH_TARGET) $(LALAPPS_TARGET) $(GLUE_TARGET) $(PYLAL_TARGET)
+ rm -rf logs/lalsuite.txt $(LAL_TARGET) $(LALFRAME_TARGET) $(LALMETAIO_TARGET) $(LALSIM_TARGET) $(LALBURST_TARGET) $(LALDETCHAR_TARGET) $(LALINSPIRAL_TARGET) $(LALPULSAR_TARGET) $(LALINFER_TARGET) $(LALSTOCH_TARGET) $(LALAPPS_TARGET) $(GLUE_TARGET)
clean-gds :
rm -rf logs/gds.txt $(GDS_TARGET)
--
GitLab