Skip to content

GitLab

Commit bcae23cb authored by Karl Wette's avatar Karl Wette
Browse files
Options

Move LALInference Python module to python/lalinference subdirectory 

- And Python scripts to python/ subdirectory
- Use lalsuite_python.am
Original: 40fe5770b1539aec68f7d6abbad2a67cdf6c42cc
parent 1b3dc9a2
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 126 deletions
lalinference/.gitignore
View file @ bcae23cb
......@@ -12,19 +12,6 @@
/lalinference-*/
Makefile
Makefile.in
bin/bayestar_aggregate_found_injections
bin/bayestar_bin_samples
bin/bayestar_lattice_tmpltbank
bin/bayestar_littlehope
bin/bayestar_localize_coincs
bin/bayestar_localize_lvalert
bin/bayestar_plot_allsky
bin/bayestar_plot_found_injections
bin/bayestar_plot_pileup
bin/bayestar_prune_neighborhood_tmpltbank
bin/bayestar_realize_coincs
bin/bayestar_sim_to_tmpltbank
bin/python_config.sed
config.lt
include/lal/*.h
include/lal/*.i
......@@ -35,8 +22,20 @@ lalinference-user-env.sh
lalinference-user-env.shell
lalinference.spec
libtool
python/__init__.py
python/git_version.py
python/bayestar_aggregate_found_injections
python/bayestar_bin_samples
python/bayestar_lattice_tmpltbank
python/bayestar_littlehope
python/bayestar_localize_coincs
python/bayestar_localize_lvalert
python/bayestar_plot_allsky
python/bayestar_plot_found_injections
python/bayestar_plot_pileup
python/bayestar_prune_neighborhood_tmpltbank
python/bayestar_realize_coincs
python/bayestar_sim_to_tmpltbank
python/lalinference/__init__.py
python/lalinference/git_version.py
src/LALInferenceBuildInfo.c
src/LALInferenceConfig.h
src/LALInferenceVCSInfo.c
......
lalinference/Makefile.am
View file @ bcae23cb
......@@ -24,7 +24,6 @@ SUBDIRS = \
src \
swig \
python \
bin \
test \
$(END_OF_LIST)
......
lalinference/bin/Makefile.am deleted 100644 → 0
View file @ 1b3dc9a2
## Process this file with automake to produce Makefile.in
bin_SCRIPTS = \
bayestar_aggregate_found_injections \
bayestar_bin_samples \
bayestar_lattice_tmpltbank \
bayestar_localize_coincs \
bayestar_localize_lvalert \
bayestar_plot_allsky \
bayestar_plot_found_injections \
bayestar_plot_pileup \
bayestar_prune_neighborhood_tmpltbank \
bayestar_realize_coincs \
bayestar_sim_to_tmpltbank \
bayestar_littlehope
python_config.sed: Makefile
@-rm -f python_config.sed
@echo "s+@PYTHONLIBDIR@+@pkgpythondir@+g" > python_config.sed
@echo "s+@PYTHONPROG@+@PYTHON@+g" >> python_config.sed
bayestar_aggregate_found_injections: bayestar_aggregate_found_injections.in python_config.sed
$(AM_V_GEN)sed -f python_config.sed $< > $@
bayestar_bin_samples: bayestar_bin_samples.in python_config.sed
$(AM_V_GEN)sed -f python_config.sed $< > $@
bayestar_lattice_tmpltbank: bayestar_lattice_tmpltbank.in python_config.sed
$(AM_V_GEN)sed -f python_config.sed $< > $@
bayestar_localize_coincs: bayestar_localize_coincs.in python_config.sed
$(AM_V_GEN)sed -f python_config.sed $< > $@
bayestar_localize_lvalert: bayestar_localize_lvalert.in python_config.sed
$(AM_V_GEN)sed -f python_config.sed $< > $@
bayestar_plot_allsky: bayestar_plot_allsky.in python_config.sed
$(AM_V_GEN)sed -f python_config.sed $< > $@
bayestar_plot_found_injections: bayestar_plot_found_injections.in python_config.sed
$(AM_V_GEN)sed -f python_config.sed $< > $@
bayestar_plot_pileup: bayestar_plot_pileup.in python_config.sed
$(AM_V_GEN)sed -f python_config.sed $< > $@
bayestar_prune_neighborhood_tmpltbank: bayestar_prune_neighborhood_tmpltbank.in python_config.sed
$(AM_V_GEN)sed -f python_config.sed $< > $@
bayestar_realize_coincs: bayestar_realize_coincs.in python_config.sed
$(AM_V_GEN)sed -f python_config.sed $< > $@
bayestar_sim_to_tmpltbank: bayestar_sim_to_tmpltbank.in python_config.sed
$(AM_V_GEN)sed -f python_config.sed $< > $@
bayestar_littlehope: bayestar_littlehope.in python_config.sed
$(AM_V_GEN)sed -f python_config.sed $< > $@
EXTRA_DIST = \
bayestar_aggregate_found_injections.in \
bayestar_bin_samples.in \
bayestar_lattice_tmpltbank.in \
bayestar_localize_coincs.in \
bayestar_localize_lvalert.in \
bayestar_plot_allsky.in \
bayestar_plot_found_injections.in \
bayestar_plot_pileup.in \
bayestar_prune_neighborhood_tmpltbank.in \
bayestar_realize_coincs.in \
bayestar_sim_to_tmpltbank.in \
bayestar_littlehope.in
CLEANFILES = \
$(bin_SCRIPTS) \
python_config.sed
lalinference/configure.ac
View file @ bcae23cb
......@@ -10,15 +10,15 @@ AC_CONFIG_FILES([ \
lalinference-uninstalled.pc \
Makefile \
debian/Makefile \
bin/Makefile \
include/Makefile \
include/lal/Makefile \
src/LALInferenceVCSInfo.c \
src/LALInferenceVCSInfo.h \
src/Makefile \
python/Makefile \
python/__init__.py \
python/bayestar/Makefile \
python/lalinference/Makefile \
python/lalinference/__init__.py \
python/lalinference/bayestar/Makefile \
swig/Makefile \
test/Makefile \
])
......
lalinference/gnuscripts/lalsuite_python.am 0 → 120000
View file @ bcae23cb
../../gnuscripts/lalsuite_python.am
\ No newline at end of file
lalinference/python/Makefile.am
View file @ bcae23cb
BUILT_SOURCES =
MOSTLYCLEANFILES =
include $(top_srcdir)/gnuscripts/lalsuite_vcs_info.am
include $(top_srcdir)/gnuscripts/lalsuite_python.am
SUBDIRS = bayestar
SUBDIRS = lalinference
pkgpython_PYTHON = \
__init__.py \
fits.py \
plot.py \
git_version.py
EXTRA_DIST = \
git_version.py
dist_pkgpython_DATA = \
ne_simplified_coastline.json
vcs_info_sources = git_version.py
pybin_SCRIPTS = \
bayestar_aggregate_found_injections \
bayestar_bin_samples \
bayestar_lattice_tmpltbank \
bayestar_localize_coincs \
bayestar_localize_lvalert \
bayestar_plot_allsky \
bayestar_plot_found_injections \
bayestar_plot_pileup \
bayestar_prune_neighborhood_tmpltbank \
bayestar_realize_coincs \
bayestar_sim_to_tmpltbank \
bayestar_littlehope \
$(END_OF_LIST)
lalinference/bin/bayestar_bin_samples.in → lalinference/python/bayestar_bin_samples.py 100755 → 100644
View file @ bcae23cb
#!@PYTHONPROG@
#!@PYTHON@
#
# Copyright (C) 2011 Leo Singer
#
......
lalinference/bin/bayestar_lattice_tmpltbank.in → lalinference/python/bayestar_lattice_tmpltbank.py 100755 → 100644
View file @ bcae23cb
#!@PYTHONPROG@
#!@PYTHON@
#
# Copyright (C) 2013 Leo Singer
#
......
lalinference/bin/bayestar_littlehope.in → lalinference/python/bayestar_littlehope.py 100755 → 100644
View file @ bcae23cb
#!@PYTHONPROG@
#!@PYTHON@
#
# Copyright (C) 2013 Leo Singer
#
......
lalinference/bin/bayestar_localize_coincs.in → lalinference/python/bayestar_localize_coincs.py 100755 → 100644
View file @ bcae23cb
#!@PYTHONPROG@
#!@PYTHON@
#
# Copyright (C) 2013 Leo Singer
#
......
lalinference/bin/bayestar_localize_lvalert.in → lalinference/python/bayestar_localize_lvalert.py 100755 → 100644
View file @ bcae23cb
#!@PYTHONPROG@
#!@PYTHON@
#
# Copyright (C) 2013 Leo Singer
#
......
lalinference/bin/bayestar_plot_allsky.in → lalinference/python/bayestar_plot_allsky.py 100755 → 100644
View file @ bcae23cb
#!@PYTHONPROG@
#!@PYTHON@
#
# Copyright (C) 2011 Leo Singer
#
......
lalinference/bin/bayestar_plot_pileup.in → lalinference/python/bayestar_plot_pileup.py 100755 → 100644
View file @ bcae23cb
#!@PYTHONPROG@
#!@PYTHON@
#
# Copyright (C) 2011 Leo Singer
#
......
lalinference/bin/bayestar_realize_coincs.in → lalinference/python/bayestar_realize_coincs.py 100755 → 100644
View file @ bcae23cb
#!@PYTHONPROG@
#!@PYTHON@
#
# Copyright (C) 2013 Leo Singer
#
......
lalinference/bin/bayestar_sim_to_tmpltbank.in → lalinference/python/bayestar_sim_to_tmpltbank.py 100755 → 100644
View file @ bcae23cb
#!@PYTHONPROG@
#!@PYTHON@
#
# Copyright (C) 2013 Leo Singer
#
......
lalinference/python/lalinference/Makefile.am 0 → 100644
View file @ bcae23cb
BUILT_SOURCES =
MOSTLYCLEANFILES =
include $(top_srcdir)/gnuscripts/lalsuite_python.am
include $(top_srcdir)/gnuscripts/lalsuite_vcs_info.am
SUBDIRS = \
bayestar \
$(END_OF_LIST)
vcs_info_sources = git_version.py
pymoduledir = $(pkgpythondir)
pymodule_PYTHON = \
__init__.py \
fits.py \
plot.py \
git_version.py \
$(END_OF_LIST)
dist_pymodule_DATA = \
ne_simplified_coastline.json \
$(END_OF_LIST)
lalinference/python/bayestar/Makefile.am → lalinference/python/lalinference/bayestar/Makefile.am
View file @ bcae23cb
bayestardir = $(pkgpythondir)/bayestar
BUILT_SOURCES =
MOSTLYCLEANFILES =
include $(top_srcdir)/gnuscripts/lalsuite_python.am
bayestar_PYTHON = \
pymoduledir = $(pkgpythondir)/bayestar
pymodule_PYTHON = \
__init__.py \
command.py \
decorator.py \
......@@ -8,13 +12,14 @@ bayestar_PYTHON = \
fits.py \
ligolw.py \
ligolw_sky_map.py \
postprocess.py \
plot.py \
timing.py
postprocess.py \
timing.py \
$(END_OF_LIST)
if HAVE_CHEALPIX
if SWIG_BUILD_PYTHON
bayestar_LTLIBRARIES = sky_map.la
pymodule_LTLIBRARIES = sky_map.la
sky_map_la_CPPFLAGS = $(AM_CPPFLAGS) $(SWIG_PYTHON_CPPFLAGS)
sky_map_la_CFLAGS = $(SWIG_PYTHON_CFLAGS) -w
sky_map_la_LDFLAGS = -shared -module -avoid-version
......
lalinference/python/git_version.py.git → lalinference/python/lalinference/git_version.py.git
View file @ bcae23cb
......@@ -60,4 +60,3 @@ def check_match(foreign_id, onmismatch="raise"):
# in the backtrace, show calling code
warnings.warn(msg, UserWarning)
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