Skip to content
Snippets Groups Projects
Commit ceb4ff57 authored by Duncan Meacher's avatar Duncan Meacher
Browse files

Updated icc Makefile, set GSTLAL_WEBVIS_DIR and copy WEBVIS files to build share directory

parent b5c5121a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
gstlal-inspiral/share/O3/optimized/Makefile.ligosoftware_icc_all
+ 27
− 116
View file @ ceb4ff57
......@@ -38,17 +38,11 @@ endif
GSTLAL_REPO:=${PWD}/git/gstlal
LIGOSCALD_REPO:=${PWD}/git/ligo-scald
LIGOSEGMENTS_REPO:=${PWD}/git/ligo-segments
PYTHONLIGOLW_REPO:=${PWD}/git/python-ligo-lw
GLUE_REPO:=${PWD}/git/glue
LALSUITE_REPO:=${PWD}/git/lalsuite
# 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
......@@ -57,32 +51,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.7
GSTLALBURST=gstlal-burst-0.0.5
GSTLALUGLY=gstlal-ugly-1.5.6
GSTLAL=gstlal-1.4.1
GSTLALINSPIRAL=gstlal-inspiral-1.6.4
GSTLALCALIBRATION=gstlal-calibration-1.2.9
GSTLALBURST=gstlal-burst-0.1.1
GSTLALUGLY=gstlal-ugly-1.6.3
GSTLAL=gstlal-1.5.0
LIGOSCALD=ligo-scald-0.3.0
LIGOSEGMENTS=ligo-segments-1.2.0
PYTHONLIGOLW=python-ligo-lw-1.4.0
GLUE=lscsoft-glue-1.60.0
KAFKA_PYTHON=0.11.5
LIBRDKAFKA=0.11.5
LALAPPS=lalapps-6.22.0
LALINFERENCE=lalinference-1.10.1
LALPULSAR=lalpulsar-1.17.0
LALINSPIRAL=lalinspiral-1.8.0
LALBURST=lalburst-1.5.0
LALSIMULATION=lalsimulation-1.8.1
LALMETAIO=lalmetaio-1.4.0
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.1
LAL=lal-6.19.2
GDS=gds-2.18.14
LDASTOOLSFRAMECPP=ldas-tools-framecpp-2.6.5
LDASTOOLSAL=ldas-tools-al-2.6.2
......@@ -104,9 +92,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/$(LIGOSCALD)-py2.7.egg
LIGOSEGMENTS_TARGET=$(PYTHON_DIR)/ligo_segments-1.2.0-py2.7-linux-x86_64.egg
PYTHONLIGOLW_TARGET=$(PYTHON_DIR)/python_ligo_lw-1.4.0-py2.7.egg-info
GLUE_TARGET=$(INSTALL_DIR)/bin/dmtdq_seg_insert
KAFKA_PYTHON_TARGET=$(PYTHON_DIR)/confluent_kafka-$(KAFKA_PYTHON)-py2.7-linux-x86_64.egg
LIBRDKAFKA_TARGET=$(INSTALL_DIR)/lib/librdkafka.so
LALAPPS_TARGET=$(INSTALL_DIR)/bin/lalapps_psinject
......@@ -140,9 +125,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
KAFKA_PYTHON_TAR_TARGET=$(TAR_DIR)/confluent-kafka-python-$(KAFKA_PYTHON).tar.gz
LIBRDKAFKA_TAR_TARGET=$(TAR_DIR)/librdkafka-$(LIBRDKAFKA).tar.gz
LALAPPS_TAR_TARGET=$(TAR_DIR)/$(LALAPPS).tar.xz
......@@ -241,7 +223,9 @@ env.sh :
@echo 'LAL_DATA_PATH=/home/cbc/ROM_data' >> $@
@echo 'KAFKA_JVM_PERFORMANCE_OPTS="-server -XX:MetaspaceSize=96m -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:G1HeapRegionSize=16M -XX:MinMetaspaceFreeRatio=50 -XX:MaxMetaspaceFreeRatio=80"' >> $@
@echo 'KAFKA_HEAP_OPTS="-Xms8G -Xmx8G"' >> $@
@echo 'export LAL_PATH LDFLAGS_INTEL LDFLAGS PATH PKG_CONFIG_PATH PYTHONPATH GST_PLUGIN_PATH GI_TYPELIB_PATH GST_REGISTRY_1_0 LAL_DATA_PATH KAFKA_JVM_PERFORMANCE_OPTS KAFKA_HEAP_OPTS' >> $@
@echo 'GSTLAL_FIR_WHITEN=0' >> $@
@echo 'GSTLAL_WEBVIS_DIR=$${LAL_PATH}/share/gstlal' >> $@
@echo 'export LAL_PATH LDFLAGS_INTEL LDFLAGS PATH PKG_CONFIG_PATH PYTHONPATH GST_PLUGIN_PATH GI_TYPELIB_PATH GST_REGISTRY_1_0 LAL_DATA_PATH KAFKA_JVM_PERFORMANCE_OPTS KAFKA_HEAP_OPTS GSTLAL_FIR_WHITEN GSTLAL_WEBVIS_DIR' >> $@
###########
# Install #
......@@ -269,7 +253,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/.
......@@ -297,7 +281,7 @@ $(GSTINSPIRAL_TARGET) : $(GSTLALCALIB_TARGET)
cd $(GSTLAL_REPO)/gstlal-inspiral && make -j$(CORES) && make install -j$(CORES) ; \
else \
tar -xzkf $(TAR_DIR)/$(GSTLALINSPIRAL).tar.gz -C $(SRC_DIR) ; \
cd $(SRC_DIR)/$(GSTLALINSPIRAL) && ./configure --prefix=$(INSTALL_DIR) --without-doxygen ; \
cd $(SRC_DIR)/$(GSTLALINSPIRAL) && ./configure --prefix=$(INSTALL_DIR) --without-doxygen --disable-massmodel ; \
cd $(SRC_DIR)/$(GSTLALINSPIRAL) && make -j$(CORES) && make install -j$(CORES) ; \
fi ;
......@@ -356,10 +340,12 @@ $(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)/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) : $(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) ; \
......@@ -368,51 +354,6 @@ $(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
$(LOGS_DIR)/ligo-segments.txt : $(LOGS_DIR)/python-ligo-lw.txt $(LIGOSEGMENTS_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) && python setup.py install --prefix=$(INSTALL_DIR) ; \
else \
tar -xzf $(TAR_DIR)/$(LIGOSEGMENTS).tar.gz -C $(SRC_DIR) ; \
cd $(SRC_DIR)/$(LIGOSEGMENTS) && python setup.py install --prefix=$(INSTALL_DIR) ; \
fi ;
# python-ligo-lw
python-ligo-lw : $(LOGS_DIR)/python-ligo-lw.txt
$(LOGS_DIR)/python-ligo-lw.txt : $(LOGS_DIR)/glue.txt $(PYTHONLIGOLW_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) && python setup.py install --prefix=$(INSTALL_DIR) ; \
else \
tar -xzf $(TAR_DIR)/$(PYTHONLIGOLW).tar.gz -C $(SRC_DIR) ; \
cd $(SRC_DIR)/$(PYTHONLIGOLW) && python setup.py install --prefix=$(INSTALL_DIR) ; \
fi ;
# glue
glue : $(LOGS_DIR)/glue.txt
$(LOGS_DIR)/glue.txt : $(LOGS_DIR)/kafka-python.txt $(GLUE_TARGET)
@echo $^ | sed -e "s@ @\n@g" > $@
$(GLUE_TARGET) : $(KAFKA_PYTHON_TARGET)
@echo $(GREEN)glue$(WHITE) 1>&2
if [ "${GLUE_GIT}" = "1" ]; then \
cd $(GLUE_REPO) && python setup.py install --prefix=$(INSTALL_DIR) ; \
else \
tar -xzf $(TAR_DIR)/$(GLUE).tar.gz -C $(SRC_DIR) ; \
cd $(SRC_DIR)/$(GLUE) && python setup.py install --prefix=$(INSTALL_DIR) ; \
fi ;
# confluent-kafka-python
kafka-python : $(LOGS_DIR)/kafka-python.txt
......@@ -797,16 +738,6 @@ $(FFTW_TAR_TARGET) : $(LOGS_DIR)
# git repos
$(LOGS_DIR) :
mkdir -p $(SRC_DIR) $(INSTALL_DIR) $(PATCH_DIR) $(TAR_DIR) $(PYTHON_DIR)
if [ "${LIGOSCALD_GIT}" = "1" ]; then \
if [ -f $@ ] ; then \
echo "ligo-scald git repo exists" ; \
else \
mkdir -p $(LIGOSCALD_REPO) ; \
git clone -b $(LIGOSCALD_GIT_BRANCH) https://git.ligo.org/gstlal-visualisation/ligo-scald.git $(LIGOSCALD_REPO) ; \
fi ; \
else \
wget --no-check-certificate http://software.ligo.org/lscsoft/source/$(LIGOSCALD).tar.gz --directory-prefix=$(TAR_DIR) -nc ; \
fi ;
if [ "${LALSUITE_GIT}" = "1" ]; then \
if [ -f $@ ] ; then \
echo "Lalsuite git repo exists" ; \
......@@ -825,35 +756,15 @@ $(LOGS_DIR) :
wget --no-check-certificate http://software.ligo.org/lscsoft/source/lalsuite/$(LALINFERENCE).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 [ "${LIGOSCALD_GIT}" = "1" ]; then \
if [ -f $@ ] ; then \
echo "Ligo-segments git repo exists" ; \
echo "ligo-scald git repo exists" ; \
else \
mkdir -p $(LIGOSEGMENTS_REPO) ; \
git clone -b $(LIGOSEGMENTS_GIT_BRANCH) https://git.ligo.org/lscsoft/ligo-segments.git $(LIGOSEGMENTS_REPO) ; \
mkdir -p $(LIGOSCALD_REPO) ; \
git clone -b $(LIGOSCALD_GIT_BRANCH) https://git.ligo.org/gstlal-visualisation/ligo-scald.git $(LIGOSCALD_REPO) ; \
fi ; \
else \
wget --no-check-certificate http://software.ligo.org/lscsoft/source/$(LIGOSEGMENTS).tar.gz --directory-prefix=$(TAR_DIR) -nc ; \
wget --no-check-certificate http://software.ligo.org/lscsoft/source/$(LIGOSCALD).tar.gz --directory-prefix=$(TAR_DIR) -nc ; \
fi ;
if [ "${GSTLAL_GIT}" = "1" ]; then \
if [ -f $@ ] ; then \
......
gstlal-ugly/share/vis/Makefile.am
+ 6
− 1
View file @ ceb4ff57
......@@ -18,4 +18,9 @@ webvis_SCRIPTS = \
webviscgi_SCRIPTS = \
gstlal \
mobile
dist_pkgdata_DATA = \
gstlal.css \
gstlal.html \
gstlal.js \
gstlal.png
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