Gitlab will migrate to a new storage backend starting 0300 UTC on 2020-04-04. We do not anticipate a maintenance window for this migration. Performance may be impacted over the weekend. Thanks for your patience.

Commit 44289a87 authored by Patrick Godwin's avatar Patrick Godwin

gstlal-burst: change fxtools submodule to snax, rename feature extraction execs/share to snax

parent ac41ecfc
......@@ -2,13 +2,13 @@ dist_bin_SCRIPTS = \
gstlal_cs_triggergen \
gstlal_excesspower \
gstlal_excesspower_trigvis \
gstlal_feature_aggregator \
gstlal_feature_combiner \
gstlal_feature_extractor \
gstlal_feature_extractor_pipe \
gstlal_ll_feature_extractor_pipe \
gstlal_feature_extractor_whitener_check \
gstlal_feature_extractor_template_overlap \
gstlal_feature_hdf5_sink \
gstlal_feature_monitor \
gstlal_feature_synchronizer
gstlal_snax_aggregate \
gstlal_snax_bank_overlap \
gstlal_snax_combine \
gstlal_snax_dag_online \
gstlal_snax_dag_offline \
gstlal_snax_extract \
gstlal_snax_monitor \
gstlal_snax_sink \
gstlal_snax_synchronize \
gstlal_snax_whiten
......@@ -40,7 +40,7 @@ from confluent_kafka import Consumer, KafkaError
from ligo.scald import aggregator
from ligo.scald import io
from gstlal.fxtools import utils
from gstlal.snax import utils
#-------------------------------------------------
# Functions
......
......@@ -42,7 +42,7 @@ from glue import markup
from gstlal import plotutil
from gstlal import aggregator
from gstlal.fxtools import utils
from gstlal.snax import utils
import matplotlib
matplotlib.use('Agg')
......
......@@ -39,7 +39,7 @@ import numpy
from ligo.segments import infinity, segment, segmentlist
from gstlal import aggregator
from gstlal.fxtools import utils
from gstlal.snax import utils
# =============================================================================
#
......
......@@ -37,10 +37,10 @@ from ligo import segments
from gstlal import aggregator
from gstlal import dagparts
from gstlal.fxtools import feature_extractor
from gstlal.fxtools import multichannel_datasource
from gstlal.fxtools import multirate_datasource
from gstlal.fxtools import utils
from gstlal.snax import feature_extractor
from gstlal.snax import multichannel_datasource
from gstlal.snax import multirate_datasource
from gstlal.snax import utils
PSD_DROP_FACTOR = 16
......
......@@ -34,10 +34,10 @@ import os
from gstlal import aggregator
from gstlal import dagparts
from gstlal.fxtools import feature_extractor
from gstlal.fxtools import multichannel_datasource
from gstlal.fxtools import multirate_datasource
from gstlal.fxtools import utils
from gstlal.snax import feature_extractor
from gstlal.snax import multichannel_datasource
from gstlal.snax import multirate_datasource
from gstlal.snax import utils
# =============================
#
......
......@@ -156,13 +156,13 @@ from gstlal import httpinterface
from gstlal import pipeparts
from gstlal import simplehandler
from gstlal.fxtools import auxcache
from gstlal.fxtools import feature_extractor
from gstlal.fxtools import multichannel_datasource
from gstlal.fxtools import multirate_datasource
from gstlal.fxtools import sngltriggertable
from gstlal.fxtools import utils
from gstlal.fxtools import waveforms as fxwaveforms
from gstlal.snax import auxcache
from gstlal.snax import feature_extractor
from gstlal.snax import multichannel_datasource
from gstlal.snax import multirate_datasource
from gstlal.snax import sngltriggertable
from gstlal.snax import utils
from gstlal.snax import waveforms as fxwaveforms
#
# Make sure we have sufficient resources
......
......@@ -37,8 +37,8 @@ from confluent_kafka import Consumer, KafkaError
from ligo.scald import io
from gstlal.fxtools import multichannel_datasource
from gstlal.fxtools import utils
from gstlal.snax import multichannel_datasource
from gstlal.snax import utils
#-------------------------------------------------
# Functions
......
......@@ -40,8 +40,8 @@ import numpy
from gstlal import aggregator
from gstlal.fxtools import multichannel_datasource
from gstlal.fxtools import utils
from gstlal.snax import multichannel_datasource
from gstlal.snax import utils
#-------------------------------------------------
# Functions
......
......@@ -40,7 +40,7 @@ from lal import gpstime
from confluent_kafka import Producer, Consumer, KafkaError
from gstlal.fxtools import utils
from gstlal.snax import utils
#-------------------------------------------------
# Functions
......
......@@ -17,7 +17,7 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
"""
A program that allows diagnosis of the whitening stage of gstlal_feature_extractor
A program that whitens timeseries
"""
......@@ -49,7 +49,7 @@ from gstlal import reference_psd
from gstlal import pipeparts
from gstlal import simplehandler
from gstlal.fxtools import multichannel_datasource
from gstlal.snax import multichannel_datasource
# global settings for whitening properties
PSD_FFT_LENGTH = 32
......
......@@ -25,7 +25,7 @@ AC_CONFIG_FILES([ \
lib/gstlal-burst/Makefile \
python/Makefile \
python/excesspower/Makefile \
python/fxtools/Makefile \
python/snax/Makefile \
share/Makefile
])
......
AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib
SUBDIRS = excesspower fxtools
SUBDIRS = excesspower snax
pkgpythondir = $(pkgpyexecdir)
......
......@@ -5,9 +5,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib
# which prevents the module from getting spread across lib and lib64
# on e.g. CentOS.
pkgpythondir = $(pkgpyexecdir)
fxtoolsdir = $(pkgpythondir)/fxtools
snaxdir = $(pkgpythondir)/snax
fxtools_PYTHON = \
snax_PYTHON = \
__init__.py \
auxcache.py \
utils.py \
......
......@@ -42,7 +42,7 @@ Gst.init(None)
from gstlal import datasource
from gstlal import pipeparts
from gstlal import simplehandler
from gstlal.fxtools import multichannel_datasource
from gstlal.snax import multichannel_datasource
#
# =============================================================================
......
......@@ -54,8 +54,8 @@ from gstlal import pipeio
from gstlal import pipeparts
from gstlal import simplehandler
from gstlal.fxtools import sngltriggertable
from gstlal.fxtools import utils
from gstlal.snax import sngltriggertable
from gstlal.snax import utils
# set up confluent_kafka as an optional library
try:
......
......@@ -17,11 +17,11 @@ SHELL := /bin/bash # Use bash syntax
#
# To get the full list of commands, run:
#
# $ make help -f Makefile.gstlal_feature_extractor_offline
# $ make help -f Makefile.offline
#
# To generate the DAG needed to start an analysis, run:
#
# $ make dag -f Makefile.gstlal_feature_extractor_offline
# $ make dag -f Makefile.offline
#
#################################################################################
......@@ -178,7 +178,7 @@ CONCURRENCY = 1
## Generate offline analysis DAG
dag : frame.cache $(CHANNEL_LIST) segments.xml.gz
gstlal_feature_extractor_pipe \
gstlal_snax_dag_offline \
--data-source frames \
--gps-start-time $(START) \
--gps-end-time $(STOP) \
......
......@@ -25,11 +25,11 @@ SHELL := /bin/bash # Use bash syntax
#
# To get the full list of commands, run:
#
# $ make help -f Makefile.gstlal_feature_extractor_online
# $ make help -f Makefile.online
#
# For example, to generate the DAG needed to start an analysis, run:
#
# $ make dag -f Makefile.gstlal_feature_extractor_online
# $ make dag -f Makefile.online
#################################################################################
# CONFIGURATION #
......@@ -184,7 +184,7 @@ MAX_STREAMS = 100
## Generate online analysis DAG
dag : kafka_broker_$(TAG).dag $(CHANNEL_LIST)
gstlal_ll_feature_extractor_pipe \
gstlal_snax_dag_online \
--data-source $(DATA_SOURCE) \
--shared-memory-partition $(IFO)=$(SHM_PARTITION) \
--shared-memory-assumed-duration 1 \
......@@ -263,7 +263,7 @@ clean :
## Clean directory of all files, including data products.
clean-all :
-rm -rvf *.sub *.dag* *.cache *.sh logs *.ini *.txt monitor aggregator features snapshots synchronizer gstlal_feature_* kafka* zookeeper*
-rm -rvf *.sub *.dag* *.cache *.sh logs *.ini *.txt monitor aggregator features snapshots synchronizer gstlal_snax_* kafka* zookeeper*
#################################################################################
# SELF DOCUMENTING COMMANDS #
......
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