Commit aab79e50 authored by Patrick Godwin's avatar Patrick Godwin

update O3 optimized Makefile package versions, get gcc version in sync

parent fda7c119
Pipeline #69120 passed with stages
in 25 minutes and 46 seconds
......@@ -33,9 +33,9 @@ else
endif
# Set package release versions
GDS=gds-2.18.10
LDASTOOLSFRAMECPP=ldas-tools-framecpp-2.6.2
LDASTOOLSAL=ldas-tools-al-2.6.0
GDS=gds-2.18.17
LDASTOOLSFRAMECPP=ldas-tools-framecpp-2.6.5
LDASTOOLSAL=ldas-tools-al-2.6.2
SWIG=swig-3.0.7
METAIO=metaio-8.5.1
LIBFRAME=libframe-8.30
......@@ -43,7 +43,7 @@ GSTPYTHON=gst-python-1.14.3
GSTPLUGINSGOOD=gst-plugins-good-1.14.3
GSTPLUGINSBASE=gst-plugins-base-1.14.3
GSTREAMER=gstreamer-1.14.3
GSL=gsl-2.3
GSL=gsl-1.16
ORC=orc-0.4.26
FFTW=fftw-3.3.8
......@@ -170,7 +170,7 @@ tarball:
# KAFKA
tarball/kafka_2.11-2.0.0.tgz: tarball
wget -nc -P tarball http://mirror.reverse.net/pub/apache/kafka/2.0.0/kafka_2.11-2.0.0.tgz
wget -nc -P tarball https://archive.apache.org/dist/kafka/2.0.0/kafka_2.11-2.0.0.tgz
src/kafka_2.11-2.0.0: tarball/kafka_2.11-2.0.0.tgz src opt/bin opt/config opt/libs
cd src && tar -xzf ../tarball/kafka_2.11-2.0.0.tgz && cd .. && cp -r src/kafka_2.11-2.0.0/bin/* opt/bin/. && cp src/kafka_2.11-2.0.0/libs/* opt/libs/. && cp src/kafka_2.11-2.0.0/config/* opt/config/.
......
......@@ -38,9 +38,6 @@ DEPS_DIR:=/path/to/deps/dir
# Set to build from git (0 = tarball, 1 = git)
GSTLAL_GIT=1
LIGOSCALD_GIT=0
LIGOSEGMENTS_GIT=0
PYTHONLIGOLW_GIT=0
GLUE_GIT=0
LALSUITE_GIT=0
# Define which branch from git to build. Defaults to 'master', but the user can
......@@ -49,30 +46,26 @@ LALSUITE_GIT=0
#
GSTLAL_GIT_BRANCH="master"
LIGOSCALD_GIT_BRANCH="master"
LIGOSEGMENTS_GIT_BRANCH="master"
PYTHONLIGOLW_GIT_BRANCH="master"
GLUE_GIT_BRANCH="master"
LALSUITE_GIT_BRANCH="master"
# Set package release versions
GSTLALINSPIRAL=gstlal-inspiral-1.5.1
GSTLALCALIBRATION=gstlal-calibration-1.2.1
GSTLALBURST=gstlal-burst-0.0.5
GSTLALUGLY=gstlal-ugly-1.5.5
GSTLAL=gstlal-1.4.1
LIGOSCALD=ligo-scald-0.3.0
LIGOSEGMENTS=ligo-segments-1.1.1
PYTHONLIGOLW=python-ligo-lw-1.4.0
GLUE=lscsoft-glue-1.60.0
LALAPPS=lalapps-6.22.0
LALINFERENCE=lalinference-1.10.0
LALPULSAR=lalpulsar-1.17.0
LALINSPIRAL=lalinspiral-1.8.0
LALBURST=lalburst-1.5.0
LALSIMULATION=lalsimulation-1.8.0
LALMETAIO=lalmetaio-1.4.0
LALFRAME=lalframe-1.4.4
LAL=lal-6.19.0
GSTLALINSPIRAL=gstlal-inspiral-1.6.5
GSTLALCALIBRATION=gstlal-calibration-1.2.10
GSTLALBURST=gstlal-burst-0.1.1
GSTLALUGLY=gstlal-ugly-1.6.4
GSTLAL=gstlal-1.5.0
LIGOSCALD=ligo-scald-0.4.1
KAFKA_PYTHON=0.11.5
LIBRDKAFKA=0.11.5
LALAPPS=lalapps-6.24.0
LALINFERENCE=lalinference-1.11.0
LALPULSAR=lalpulsar-1.18.0
LALINSPIRAL=lalinspiral-1.9.0
LALBURST=lalburst-1.5.2
LALSIMULATION=lalsimulation-1.9.0
LALMETAIO=lalmetaio-1.5.1
LALFRAME=lalframe-1.4.5
LAL=lal-6.20.1
# Specify target/dependency files
GSTINSPIRAL_TARGET=$(INSTALL_DIR)/lib/libgstlalinspiral.so
......@@ -81,9 +74,6 @@ GSTLALBURST_TARGET=$(INSTALL_DIR)/lib/libgstlalburst.so
GSTLALUGLY_TARGET=$(INSTALL_DIR)/lib/gstreamer-1.0/libgstnds.so
GSTLAL_TARGET=$(INSTALL_DIR)/lib/libgstlal.so
LIGOSCALD_TARGET=$(INSTALL_DIR)/lib/python2.7/site-packages/ligo_scald-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
LALAPPS_TARGET=$(INSTALL_DIR)/bin/lalapps_psinject
LALINFER_TARGET=$(INSTALL_DIR)/lib/liblalinference.so
LALPULSAR_TARGET=$(INSTALL_DIR)/lib/liblalpulsar.so
......@@ -101,9 +91,6 @@ GSTLALBURST_TAR_TARGET=$(TAR_DIR)/$(GSTLALBURST).tar.gz
GSTLALUGLY_TAR_TARGET=$(TAR_DIR)/$(GSTLALUGLY).tar.gz
GSTLAL_TAR_TARGET=$(TAR_DIR)/$(GSTLAL).tar.gz
LIGOSCALD_TAR_TARGET=$(TAR_DIR)/$(LIGOSCALD).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
LALAPPS_TAR_TARGET=$(TAR_DIR)/$(LALAPPS).tar.xz
LALINFER_TAR_TARGET=$(TAR_DIR)/$(LALINFERENCE).tar.xz
LALPULSAR_TAR_TARGET=$(TAR_DIR)/$(LALPULSAR).tar.xz
......@@ -117,9 +104,6 @@ LAL_TAR_TARGET=$(TAR_DIR)/$(LAL).tar.xz
# git repos
GSTLAL_GIT_TARGET=$(GSTLAL_REPO)/TODO.md
LIGOSCALD_GIT_TARGET=$(LIGOSCALD_REPO)/README.md
LIGOSEGMENTS_GIT_TARGET=$(LIGOSEGMENTS_REPO)/README.rst
PYTHONLIGOLW_GIT_TARGET=$(PYTHONLIGOLW_REPO)/MANIFEST.in
GLUE_GIT_TARGET=$(GLUE_REPO)/README
LALSUITE_GIT_TARGET=$(LALSUITE_REPO)/lal/README
# Specify how many processors to run on
......@@ -258,10 +242,10 @@ $(GSTLAL_TARGET) : $(LIGOSCALD_TARGET)
# ligo-scald
ligo-scald : $(LOGS_DIR)/ligo-scald.txt
$(LOGS_DIR)/ligo-scald.txt : $(LOGS_DIR)/ligo-segments.txt $(LIGOSCALD_TARGET)
$(LOGS_DIR)/ligo-scald.txt : $(LOGS_DIR)/kafka-python.txt $(LIGOSCALD_TARGET)
@echo $^ | sed -e "s@ @\n@g" > $@
$(LIGOSCALD_TARGET) : $(LIGOSEGMENTS_TARGET)
$(LIGOSCALD_TARGET) : $(KAFKA_PYTHON_TARGET)
@echo $(GREEN)ligo-scald$(WHITE) 1>&2
if [ "${LIGOSCALD_GIT}" = "1" ]; then \
cd $(LIGOSCALD_REPO) && python setup.py install --prefix=$(INSTALL_DIR) ; \
......@@ -270,50 +254,28 @@ $(LIGOSCALD_TARGET) : $(LIGOSEGMENTS_TARGET)
cd $(SRC_DIR)/$(LIGOSCALD) && python setup.py install --prefix=$(INSTALL_DIR) ; \
fi ;
# ligo-segments
ligo-segments : $(LOGS_DIR)/ligo-segments.txt
# confluent-kafka-python
kafka-python : $(LOGS_DIR)/kafka-python.txt
$(LOGS_DIR)/ligo-segments.txt : $(LOGS_DIR)/python-ligo-lw.txt $(LIGOSEGMENTS_TARGET)
$(LOGS_DIR)/kafka-python.txt : $(LOGS_DIR)/librdkafka.txt $(KAFKA_PYTHON_TARGET)
@echo $^ | sed -e "s@ @\n@g" > $@
$(LIGOSEGMENTS_TARGET) : $(PYTHONLIGOLW_TARGET)
@echo $(GREEN)ligo-segments$(WHITE) 1>&2
if [ "${LIGOSEGMENTS_GIT}" = "1" ]; then \
cd $(LIGOSEGMENTS_REPO) && CFLAGS="${GCCFLAGS}" python setup.py install --prefix=$(INSTALL_DIR) ; \
else \
tar -xzf $(TAR_DIR)/$(LIGOSEGMENTS).tar.gz -C $(SRC_DIR) ; \
cd $(SRC_DIR)/$(LIGOSEGMENTS) && CFLAGS="${GCCFLAGS}" python setup.py install --prefix=$(INSTALL_DIR) ; \
fi ;
$(KAFKA_PYTHON_TARGET) : $(LIBRDKAFKA_TARGET)
@echo $(GREEN)kafka-python$(WHITE) 1>&2
tar -xzf $(TAR_DIR)/confluent-kafka-python-$(KAFKA_PYTHON).tar.gz -C $(SRC_DIR) ; \
cd $(SRC_DIR)/confluent-kafka-python-$(KAFKA_PYTHON) && CFLAGS="$(CFLAGS)" C_INCLUDE_PATH=$(INSTALL_DIR)/include LIBRARY_PATH=$(INSTALL_DIR)/lib python setup.py install --prefix=$(INSTALL_DIR) ; \
# python-ligo-lw
python-ligo-lw : $(LOGS_DIR)/python-ligo-lw.txt
# librdkafka
librdkafka : $(LOGS_DIR)/librdkafka.txt
$(LOGS_DIR)/python-ligo-lw.txt : $(LOGS_DIR)/glue.txt $(PYTHONLIGOLW_TARGET)
$(LOGS_DIR)/librdkafka.txt : $(LOGS_DIR)/lalsuite.txt $(LIBRDKAFKA_TARGET)
@echo $^ | sed -e "s@ @\n@g" > $@
$(PYTHONLIGOLW_TARGET) : $(GLUE_TARGET)
@echo $(GREEN)python-ligo-lw$(WHITE) 1>&2
if [ "${PYTHONLIGOLW_GIT}" = "1" ]; then \
cd $(PYTHONLIGOLW_REPO) && CFLAGS="${GCCFLAGS}" python setup.py install --prefix=$(INSTALL_DIR) ; \
else \
tar -xzf $(TAR_DIR)/$(PYTHONLIGOLW).tar.gz -C $(SRC_DIR) ; \
cd $(SRC_DIR)/$(PYTHONLIGOLW) && CFLAGS="${GCCFLAGS}" python setup.py install --prefix=$(INSTALL_DIR) ; \
fi ;
# glue
glue : $(LOGS_DIR)/glue.txt
$(LOGS_DIR)/glue.txt : $(LOGS_DIR)/lalsuite.txt $(GLUE_TARGET)
@echo $^ | sed -e "s@ @\n@g" > $@
$(GLUE_TARGET) : $(LALAPPS_TARGET)
@echo $(GREEN)glue$(WHITE) 1>&2
if [ "${GLUE_GIT}" = "1" ]; then \
cd $(GLUE_REPO) && CFLAGS="${GCCFLAGS}" python setup.py install --prefix=$(INSTALL_DIR) ; \
else \
tar -xzf $(TAR_DIR)/$(GLUE).tar.gz -C $(SRC_DIR) ; \
cd $(SRC_DIR)/$(GLUE) && CFLAGS="${GCCFLAGS}" python setup.py install --prefix=$(INSTALL_DIR) ; \
fi ;
$(LIBRDKAFKA_TARGET) : $(LALAPPS_TARGET)
@echo $(GREEN)librdkafka$(WHITE) 1>&2
tar -xzf $(TAR_DIR)/librdkafka-$(LIBRDKAFKA).tar.gz -C $(SRC_DIR) ; \
cd $(SRC_DIR)/librdkafka-$(LIBRDKAFKA) && ./configure --prefix=$(INSTALL_DIR) ; \
cd $(SRC_DIR)/librdkafka-$(LIBRDKAFKA) && make -j$(CORES) && make install -j$(CORES) ; \
# lalsuite
lalsuite : $(LOGS_DIR)/lalsuite.txt
......@@ -467,14 +429,9 @@ $(LAL_TARGET) : $(LOGS_DIR)/patch.txt
# patches
patch : $(LOGS_DIR)/patch.txt
$(LOGS_DIR)/patch.txt : $(LOGS_DIR) $(PATCH_DIR)/gst1.14.patch
$(LOGS_DIR)/patch.txt : $(LOGS_DIR)
echo $^ | sed -e "s@ @\n@g" > $@
$(PATCH_DIR)/gst1.14.patch : $(LOGS_DIR)
@echo $(GREEN)patches$(WHITE) 1>&2
cp $(GSTLAL_REPO)/gstlal-inspiral/share/O3/optimized/gst1.14.patch $(PATCH_DIR)
cd $(GSTLAL_REPO) && patch -p1 < $(PATCH_DIR)/gst1.14.patch
# git repos
$(LOGS_DIR) :
mkdir -p $(SRC_DIR) $(INSTALL_DIR) $(PATCH_DIR) $(TAR_DIR)
......@@ -508,36 +465,6 @@ $(LOGS_DIR) :
wget --no-check-certificate http://software.ligo.org/lscsoft/source/lalsuite/$(LALSTOCHASTIC).tar.xz --directory-prefix=$(TAR_DIR) -nc ; \
wget --no-check-certificate http://software.ligo.org/lscsoft/source/lalsuite/$(LALAPPS).tar.xz --directory-prefix=$(TAR_DIR) -nc ; \
fi ;
if [ "${GLUE_GIT}" = "1" ]; then \
if [ -f $@ ] ; then \
echo "Glue git repo exists" ; \
else \
mkdir -p $(GLUE_REPO) ; \
git clone -b $(GLUE_GIT_BRANCH) https://git.ligo.org/lscsoft/glue.git $(GLUE_REPO) ; \
fi ; \
else \
wget --no-check-certificate http://software.ligo.org/lscsoft/source/$(GLUE).tar.gz --directory-prefix=$(TAR_DIR) -nc ; \
fi ;
if [ "${PYTHONLIGOLW_GIT}" = "1" ]; then \
if [ -f $@ ] ; then \
echo "Python-ligo-lw git repo exists" ; \
else \
mkdir -p $(PYTHONLIGOLW_REPO) ; \
git clone -b $(PYTHONLIGOLW_GIT_BRANCH) https://git.ligo.org/kipp.cannon/python-ligo-lw.git $(PYTHONLIGOLW_REPO) ; \
fi ; \
else \
wget --no-check-certificate http://software.ligo.org/lscsoft/source/$(PYTHONLIGOLW).tar.gz --directory-prefix=$(TAR_DIR) -nc ; \
fi ;
if [ "${LIGOSEGMENTS_GIT}" = "1" ]; then \
if [ -f $@ ] ; then \
echo "Ligo-segments git repo exists" ; \
else \
mkdir -p $(LIGOSEGMENTS_REPO) ; \
git clone -b $(LIGOSEGMENTS_GIT_BRANCH) https://git.ligo.org/lscsoft/ligo-segments.git $(LIGOSEGMENTS_REPO) ; \
fi ; \
else \
wget --no-check-certificate http://software.ligo.org/lscsoft/source/$(LIGOSEGMENTS).tar.gz --directory-prefix=$(TAR_DIR) -nc ; \
fi ;
if [ "${GSTLAL_GIT}" = "1" ]; then \
if [ -f $@ ] ; then \
echo "Gstlal git repo exists" ; \
......
......@@ -54,24 +54,24 @@ LIGOSCALD_GIT_BRANCH="master"
LALSUITE_GIT_BRANCH="master"
# Set package release versions
GSTLALINSPIRAL=gstlal-inspiral-1.6.4
GSTLALCALIBRATION=gstlal-calibration-1.2.9
GSTLALINSPIRAL=gstlal-inspiral-1.6.5
GSTLALCALIBRATION=gstlal-calibration-1.2.10
GSTLALBURST=gstlal-burst-0.1.1
GSTLALUGLY=gstlal-ugly-1.6.3
GSTLALUGLY=gstlal-ugly-1.6.4
GSTLAL=gstlal-1.5.0
LIGOSCALD=ligo-scald-0.4.0
LIGOSCALD=ligo-scald-0.4.1
KAFKA_PYTHON=0.11.5
LIBRDKAFKA=0.11.5
LALAPPS=lalapps-6.23.0
LALINFERENCE=lalinference-1.10.2
LALPULSAR=lalpulsar-1.17.1
LALINSPIRAL=lalinspiral-1.8.1
LALBURST=lalburst-1.5.1
LALSIMULATION=lalsimulation-1.8.2
LALMETAIO=lalmetaio-1.5.0
LALFRAME=lalframe-1.4.4
LAL=lal-6.19.2
GDS=gds-2.18.14
LALAPPS=lalapps-6.24.0
LALINFERENCE=lalinference-1.11.0
LALPULSAR=lalpulsar-1.18.0
LALINSPIRAL=lalinspiral-1.9.0
LALBURST=lalburst-1.5.2
LALSIMULATION=lalsimulation-1.9.0
LALMETAIO=lalmetaio-1.5.1
LALFRAME=lalframe-1.4.5
LAL=lal-6.20.1
GDS=gds-2.18.17
LDASTOOLSFRAMECPP=ldas-tools-framecpp-2.6.5
LDASTOOLSAL=ldas-tools-al-2.6.2
SWIG=swig-3.0.7
......@@ -340,7 +340,6 @@ $(GSTLAL_TARGET) : $(LIGOSCALD_TARGET)
# ligo-scald
ligo-scald : $(LOGS_DIR)/ligo-scald.txt
#$(LOGS_DIR)/ligo-scald.txt : $(LOGS_DIR)/ligo-segments.txt $(LIGOSCALD_TARGET)
$(LOGS_DIR)/ligo-scald.txt : $(LOGS_DIR)/kafka-python.txt $(LIGOSCALD_TARGET)
@echo $^ | sed -e "s@ @\n@g" > $@
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment