Commit 52c18d13 authored by John Douglas Veitch's avatar John Douglas Veitch

Merge branch 'dist_marg_bayestar' of git.ligo.org:john-veitch/lalsuite into dist_marg_bayestar

parents db65485e 046fe82e
......@@ -311,18 +311,6 @@ nightly:top-level:xenial:
- schedules
- web
nightly:top-level:artful:
image: skymoo/ligo-lalsuite-dev:artful
stage: nightly
script:
- ./00boot
- ./configure --enable-doxygen
- make -j4 distcheck
dependencies: []
only:
- schedules
- web
nightly:top-level:bionic:
image: skymoo/ligo-lalsuite-dev:bionic
stage: nightly
......@@ -501,7 +489,7 @@ nightly:wheel:cp36-cp36m-macosx:
variables:
RPM_BUILD_CPUS: 4
script:
- rpm -ivh rpmbuild/RPMS/x86_64/lal*.rpm || true
- rpm -ivh rpmbuild/RPMS/x86_64/lal*.rpm rpmbuild/RPMS/x86_64/python2-lal*.rpm || true
- cd ${CI_JOB_NAME#level?:rpm:}
- ./00boot
- ./configure --enable-swig ${EXTRA_CONFIG_FLAGS}
......@@ -511,6 +499,7 @@ nightly:wheel:cp36-cp36m-macosx:
expire_in: 3h
paths:
- rpmbuild/RPMS/x86_64/${CI_JOB_NAME#level?:rpm:}-*.rpm
- rpmbuild/RPMS/x86_64/python2-${CI_JOB_NAME#level?:rpm:}-*.rpm
only:
- schedules
- tags
......
......@@ -16,7 +16,13 @@ $ git clone git@git.ligo.org:lscsoft/lalsuite.git
## Contributing to LALSuite
The guide to [Contributing](https://git.ligo.org/lscsoft/lalsuite/blob/master/CONTRIBUTING.md) to LALSuite explains how to report issues and contribute fixes or new features using the fork and pull workflow. Please read and follow these directions.
The guide to [Contributing](https://git.ligo.org/lscsoft/lalsuite/blob/master/CONTRIBUTING.md) to LALSuite explains how to report issues and contribute fixes or new features using the fork and pull workflow. Please read and follow these directions.
## Nightly Documentation
The Doxygen Documentation is built under GitLab-CI every night and can be viewed at:
https://docs.ligo.org/lscsoft/lalsuite/
## Notes on Ancient History
......
# -*- mode: autoconf; -*-
# lalsuite_build.m4 - top level build macros
#
# serial 148
# serial 149
# restrict which LALSUITE_... patterns can appearing in output (./configure);
# useful for debugging problems with unexpanded LALSUITE_... Autoconf macros
......@@ -1158,7 +1158,7 @@ AS_IF([test "x${osx_version_check}" = "xtrue"],[
AC_MSG_RESULT([$MACOSX_VERSION])])
AS_CASE(["$MACOSX_VERSION"],
[10.0*|10.1|10.1.*|10.2*|10.3*],AC_MSG_ERROR([This version of Mac OS X is not supported]),
[10.4*|10.5*|10.6*|10.7*|10.8*|10.9*|10.10*|10.11*|10.12*|10.13*],,
[10.4*|10.5*|10.6*|10.7*|10.8*|10.9*|10.10*|10.11*|10.12*|10.13*|10.14*],,
AC_MSG_WARN([Unknown Mac OS X version]))
])])])
......
......@@ -32,5 +32,5 @@ For More Information
Please visit the [LALSuite project page][project].
[install]: https://wiki.ligo.org/DASWG/LALSuiteInstall
[bugs]: https://bugs.ligo.org/redmine/projects/lalsuite
[bugs]: https://git.ligo.org/lscsoft/lalsuite/issues/
[project]: https://wiki.ligo.org/DASWG/LALSuite
%define nightly @NIGHTLY_VERSION@
%define nightly @NIGHTLY_VERSION@%{nil}
%define _prefix /usr
%define _mandir %{_prefix}/share/man
%define _sysconfdir %{_prefix}/etc
%define release 1
%if "%{?nightly:%{nightly}}%{!?nightly:0}" == "%{nil}"
%undefine nightly
%endif
Name: @PACKAGE@
Version: @BASE_VERSION@
Release: %{?nightly:0.%{nightly}}%{!?nightly:%{release}}%{?dist}
......@@ -13,6 +17,7 @@ Group: LAL
Source: %{name}-%{version}%{?nightly:-%{nightly}}.tar.xz
URL: https://wiki.ligo.org/DASWG/LALSuite
Packager: Adam Mercer <adam.mercer@ligo.org>
BuildRequires: python2-rpm-macros
BuildRequires: bc
BuildRequires: fftw-devel
BuildRequires: python2-ligo-segments
......@@ -21,7 +26,9 @@ BuildRequires: gsl-devel
BuildRequires: hdf5-devel
BuildRequires: less
BuildRequires: numpy
BuildRequires: scipy
BuildRequires: octave-devel
BuildRequires: python
BuildRequires: python-devel
BuildRequires: python-six
BuildRequires: swig >= 3.0.7
......@@ -48,18 +55,22 @@ The LSC Algorithm Library for gravitational wave data analysis.
This package contains files needed build applications that use the LAL library
as well as the documentation for the library.
%package python
Summary: Python bindings for LAL
%package -n python2-%{name}
Summary: Python %{python2_version} bindings for LAL
Group: LAL
Provides: %{name}-python
Obsoletes: %{name}-python < 6.18.0-2
Conflicts: %{name}-python
Requires: %{name} = %{version}
Requires: python2-ligo-segments
Requires: glue >= @MIN_GLUE_VERSION@
Requires: numpy
Requires: python
Requires: numpy
Requires: scipy
Requires: python-six
%description python
Requires: python2-ligo-segments
Requires: glue >= @MIN_GLUE_VERSION@
%description -n python2-%{name}
The LSC Algorithm Library for gravitational wave data analysis.
This package provides the Python bindings.
This package provides the Python %{python2_version} bindings.
%package octave
Summary: Octave bindings for LAL
......@@ -108,9 +119,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}}
%{_libdir}/*.so
%{_libdir}/pkgconfig/*
%files python
%files -n python2-%{name}
%defattr(-,root,root)
%{_libdir}/python*
%{python2_sitearch}/*
%files octave
%defattr(-,root,root)
......
......@@ -132,6 +132,10 @@ SEQUENCETYPE *RFUNC (
SFUNC (sequence, -first);
} else
XLAL_ERROR_NULL(XLAL_EFUNC);
} else if (length == 0) {
XLALFree(sequence->data);
sequence->data = NULL;
sequence->length = 0;
} else {
/* do not need to increase memory */
SFUNC (sequence, -first);
......
......@@ -33,5 +33,5 @@ For More Information
Please visit the [LALSuite project page][project].
[install]: https://wiki.ligo.org/DASWG/LALSuiteInstall
[bugs]: https://bugs.ligo.org/redmine/projects/lalsuite
[bugs]: https://git.ligo.org/lscsoft/lalsuite/issues/
[project]: http://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
%define nightly @NIGHTLY_VERSION@
%define nightly @NIGHTLY_VERSION@%{nil}
%define _prefix /usr
%define _mandir %{_prefix}/share/man
%define _sysconfdir %{_prefix}/etc
......@@ -6,6 +6,10 @@
%define _pkgpyexecdir %{_libdir}/python2.?/site-packages/@PACKAGE@
%define release 1
%if "%{?nightly:%{nightly}}%{!?nightly:0}" == "%{nil}"
%undefine nightly
%endif
Name: @PACKAGE@
Version: @BASE_VERSION@
Release: %{?nightly:0.%{nightly}}%{!?nightly:%{release}}%{?dist}
......@@ -23,23 +27,23 @@ BuildRequires: libframe-devel
BuildRequires: libmetaio-devel
BuildRequires: openmpi-devel
BuildRequires: lal-devel >= @MIN_LAL_VERSION@
BuildRequires: lal-python >= @MIN_LAL_VERSION@
BuildRequires: python2-lal >= @MIN_LAL_VERSION@
BuildRequires: lalframe-devel >= @MIN_LALFRAME_VERSION@
BuildRequires: lalframe-python >= @MIN_LALFRAME_VERSION@
BuildRequires: python2-lalframe >= @MIN_LALFRAME_VERSION@
BuildRequires: lalmetaio-devel >= @MIN_LALMETAIO_VERSION@
BuildRequires: lalmetaio-python >= @MIN_LALMETAIO_VERSION@
BuildRequires: python2-lalmetaio >= @MIN_LALMETAIO_VERSION@
BuildRequires: lalsimulation-devel >= @MIN_LALSIMULATION_VERSION@
BuildRequires: lalsimulation-python >= @MIN_LALSIMULATION_VERSION@
BuildRequires: python2-lalsimulation >= @MIN_LALSIMULATION_VERSION@
BuildRequires: lalburst-devel >= @MIN_LALBURST_VERSION@
BuildRequires: lalburst-python >= @MIN_LALBURST_VERSION@
BuildRequires: python2-lalburst >= @MIN_LALBURST_VERSION@
BuildRequires: lalinspiral-devel >= @MIN_LALINSPIRAL_VERSION@
BuildRequires: lalinspiral-python >= @MIN_LALINSPIRAL_VERSION@
BuildRequires: python2-lalinspiral >= @MIN_LALINSPIRAL_VERSION@
BuildRequires: lalstochastic-devel >= @MIN_LALSTOCHASTIC_VERSION@
BuildRequires: lalstochastic-python >= @MIN_LALSTOCHASTIC_VERSION@
BuildRequires: python2-lalstochastic >= @MIN_LALSTOCHASTIC_VERSION@
BuildRequires: lalpulsar-devel >= @MIN_LALPULSAR_VERSION@
BuildRequires: lalpulsar-python >= @MIN_LALPULSAR_VERSION@
BuildRequires: python2-lalpulsar >= @MIN_LALPULSAR_VERSION@
BuildRequires: lalinference-devel >= @MIN_LALINFERENCE_VERSION@
BuildRequires: lalinference-python >= @MIN_LALINFERENCE_VERSION@
BuildRequires: python2-lalinference >= @MIN_LALINFERENCE_VERSION@
Requires: cfitsio
Requires: fftw
Requires: gsl
......@@ -52,23 +56,23 @@ Requires: openmpi
Requires: openssh-clients
Requires: python
Requires: lal >= @MIN_LAL_VERSION@
Requires: lal-python >= @MIN_LAL_VERSION@
Requires: python2-lal >= @MIN_LAL_VERSION@
Requires: lalframe >= @MIN_LALFRAME_VERSION@
Requires: lalframe-python >= @MIN_LALFRAME_VERSION@
Requires: python2-lalframe >= @MIN_LALFRAME_VERSION@
Requires: lalmetaio >= @MIN_LALMETAIO_VERSION@
Requires: lalmetaio-python >= @MIN_LALMETAIO_VERSION@
Requires: python2-lalmetaio >= @MIN_LALMETAIO_VERSION@
Requires: lalsimulation >= @MIN_LALSIMULATION_VERSION@
Requires: lalsimulation-python >= @MIN_LALSIMULATION_VERSION@
Requires: python2-lalsimulation >= @MIN_LALSIMULATION_VERSION@
Requires: lalburst >= @MIN_LALBURST_VERSION@
Requires: lalburst-python >= @MIN_LALBURST_VERSION@
Requires: python2-lalburst >= @MIN_LALBURST_VERSION@
Requires: lalinspiral >= @MIN_LALINSPIRAL_VERSION@
Requires: lalinspiral-python >= @MIN_LALINSPIRAL_VERSION@
Requires: python2-lalinspiral >= @MIN_LALINSPIRAL_VERSION@
Requires: lalstochastic >= @MIN_LALSTOCHASTIC_VERSION@
Requires: lalstochastic-python >= @MIN_LALSTOCHASTIC_VERSION@
Requires: python2-lalstochastic >= @MIN_LALSTOCHASTIC_VERSION@
Requires: lalpulsar >= @MIN_LALPULSAR_VERSION@
Requires: lalpulsar-python >= @MIN_LALPULSAR_VERSION@
Requires: python2-lalpulsar >= @MIN_LALPULSAR_VERSION@
Requires: lalinference >= @MIN_LALINFERENCE_VERSION@
Requires: lalinference-python >= @MIN_LALINFERENCE_VERSION@
Requires: python2-lalinference >= @MIN_LALINFERENCE_VERSION@
Requires: skyarea
Prefix: %{_prefix}
......
......@@ -132,7 +132,7 @@ if options.coincidence_segments is not None:
# for the purposes of the coinc segs feature, the coinc
# time is minimum of event peak times. this is a fast, and
# guaranteed reproducible definition
return len(events) < min_instruments or min(event.peak for event in events) not in coinc_segs
return len(events) < min_instruments or min(event.peak + offset_vector[event.ifo] for event in events) not in coinc_segs
else:
def coinc_segs_ntuple_comparefunc(events, offset_vector, min_instruments = options.min_instruments):
return len(events) < min_instruments
......
......@@ -195,6 +195,10 @@ void initialise_algorithm( LALInferenceRunState *runState )
LALInferenceAddVariable( runState->algorithmParams, "tolerance", &tmp, LALINFERENCE_REAL8_t, LALINFERENCE_PARAM_FIXED );
}
/* Set cpu_time variable */
REAL8 zero = 0.0;
LALInferenceAddVariable( runState->algorithmParams, "cpu_time", &zero, LALINFERENCE_REAL8_t, LALINFERENCE_PARAM_OUTPUT );
/* Set up the random number generator */
gsl_rng_env_setup();
runState->GSLrandom = gsl_rng_alloc( gsl_rng_mt19937 );
......
......@@ -77,9 +77,9 @@ if [ $? != "0" ]; then
fi
# set ephemeris file
EEPHEM="earth00-19-DE405.dat.gz"
SEPHEM="sun00-19-DE405.dat.gz"
TEPHEM="tdb_2000-2019.dat.gz"
EEPHEM="earth00-40-DE405.dat.gz"
SEPHEM="sun00-40-DE405.dat.gz"
TEPHEM="tdb_2000-2040.dat.gz"
# get current location
LOCATION=`pwd`
......@@ -728,4 +728,4 @@ fi
# exit with all being well :)
echo All is well with the world :D
exit 0
\ No newline at end of file
exit 0
......@@ -32,5 +32,5 @@ For More Information
Please visit the [LALSuite project page][project].
[install]: https://wiki.ligo.org/DASWG/LALSuiteInstall
[bugs]: https://bugs.ligo.org/redmine/projects/lalsuite
[bugs]: https://git.ligo.org/lscsoft/lalsuite/issues/
[project]: http://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
%define nightly @NIGHTLY_VERSION@
%define nightly @NIGHTLY_VERSION@%{nil}
%define _prefix /usr
%define _mandir %{_prefix}/share/man
%define _sysconfdir %{_prefix}/etc
%define release 1
%if "%{?nightly:%{nightly}}%{!?nightly:0}" == "%{nil}"
%undefine nightly
%endif
Name: @PACKAGE@
Version: @BASE_VERSION@
Release: %{?nightly:0.%{nightly}}%{!?nightly:%{release}}%{?dist}
......@@ -13,6 +17,7 @@ Group: LAL
Source: %{name}-%{version}%{?nightly:-%{nightly}}.tar.xz
URL: https://wiki.ligo.org/DASWG/LALSuite
Packager: Adam Mercer <adam.mercer@ligo.org>
BuildRequires: python2-rpm-macros
BuildRequires: gsl-devel
BuildRequires: libmetaio-devel
BuildRequires: numpy
......@@ -21,13 +26,13 @@ BuildRequires: python-devel
BuildRequires: swig >= 3.0.7
BuildRequires: lal-devel >= @MIN_LAL_VERSION@
BuildRequires: lal-octave >= @MIN_LAL_VERSION@
BuildRequires: lal-python >= @MIN_LAL_VERSION@
BuildRequires: python2-lal >= @MIN_LAL_VERSION@
BuildRequires: lalmetaio-devel >= @MIN_LALMETAIO_VERSION@
BuildRequires: lalmetaio-octave >= @MIN_LALMETAIO_VERSION@
BuildRequires: lalmetaio-python >= @MIN_LALMETAIO_VERSION@
BuildRequires: python2-lalmetaio >= @MIN_LALMETAIO_VERSION@
BuildRequires: lalsimulation-devel >= @MIN_LALSIMULATION_VERSION@
BuildRequires: lalsimulation-octave >= @MIN_LALSIMULATION_VERSION@
BuildRequires: lalsimulation-python >= @MIN_LALSIMULATION_VERSION@
BuildRequires: python2-lalsimulation >= @MIN_LALSIMULATION_VERSION@
BuildRequires: scipy
BuildRequires: glue
Requires: gsl
......@@ -56,20 +61,23 @@ The LSC Algorithm Burst Library for gravitational wave data analysis. This
package contains files needed build applications that use the LAL Burst
library.
%package python
Summary: Python Bindings for LALBurst
%package -n python2-%{name}
Summary: Python %{python2_version} Bindings for LALBurst
Group: LAL
Provides: %{name}-python
Obsoletes: %{name}-python < 1.4.4-2
Conflicts: %{name}-python
Requires: %{name} = %{version}
Requires: numpy
Requires: python
Requires: lal-python >= @MIN_LAL_VERSION@
Requires: lalmetaio-python >= @MIN_LALMETAIO_VERSION@
Requires: lalsimulation-python >= @MIN_LALSIMULATION_VERSION@
Requires: python2-lal >= @MIN_LAL_VERSION@
Requires: python2-lalmetaio >= @MIN_LALMETAIO_VERSION@
Requires: python2-lalsimulation >= @MIN_LALSIMULATION_VERSION@
Requires: scipy
Requires: glue
%description python
%description -n python2-%{name}
The LSC Algorithm Library for gravitational wave data analysis.
This package provides the Python bindings for LALBurst.
This package provides the Python %{python2_version} bindings for LALBurst.
%package octave
Summary: Octave Bindings for LALBurst
......@@ -120,9 +128,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}}
%{_libdir}/*.so
%{_libdir}/pkgconfig/*
%files python
%files -n python2-%{name}
%defattr(-,root,root)
%{_libdir}/python*
%{python2_sitearch}/*
%files octave
%defattr(-,root,root)
......
......@@ -24,6 +24,10 @@
#
try:
from fpconst import NegInf
except ImportError:
NegInf = float("-inf")
import itertools
import math
import scipy.stats
......@@ -156,7 +160,7 @@ class LnLRDensity(snglcoinc.LnLRDensity):
except AttributeError:
self.mkinterps()
interps = self.interps
return sum(interps[param](*value) for param, value in params.items())
return sum(interps[param](*value) for param, value in params.items()) if params else NegInf
def __iadd__(self, other):
if type(self) != type(other) or set(self.densities) != set(other.densities):
......
......@@ -32,5 +32,5 @@ For More Information
Please visit the [LALSuite project page][project].
[install]: https://wiki.ligo.org/DASWG/LALSuiteInstall
[bugs]: https://bugs.ligo.org/redmine/projects/lalsuite
[bugs]: https://git.ligo.org/lscsoft/lalsuite/issues/
[project]: http://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
%define nightly @NIGHTLY_VERSION@
%define nightly @NIGHTLY_VERSION@%{nil}
%define _prefix /usr
%define _mandir %{_prefix}/share/man
%define _sysconfdir %{_prefix}/etc
%define release 1
%if "%{?nightly:%{nightly}}%{!?nightly:0}" == "%{nil}"
%undefine nightly
%endif
Name: @PACKAGE@
Version: @BASE_VERSION@
Release: %{?nightly:0.%{nightly}}%{!?nightly:%{release}}%{?dist}
......@@ -13,6 +17,7 @@ Group: LAL
Source: %{name}-%{version}%{?nightly:-%{nightly}}.tar.xz
URL: http://wiki.ligo.org/DASWG/LALSuite
Packager: Adam Mercer <adam.mercer@ligo.org>
BuildRequires: python2-rpm-macros
BuildRequires: glib2-devel >= 2.14
BuildRequires: gsl-devel
BuildRequires: libmetaio-devel
......@@ -22,16 +27,16 @@ BuildRequires: python-devel
BuildRequires: swig >= 3.0.7
BuildRequires: lal-devel >= @MIN_LAL_VERSION@
BuildRequires: lal-octave >= @MIN_LAL_VERSION@
BuildRequires: lal-python >= @MIN_LAL_VERSION@
BuildRequires: python2-lal >= @MIN_LAL_VERSION@
BuildRequires: lalmetaio-devel >= @MIN_LALMETAIO_VERSION@
BuildRequires: lalmetaio-octave >= @MIN_LALMETAIO_VERSION@
BuildRequires: lalmetaio-python >= @MIN_LALMETAIO_VERSION@
BuildRequires: python2-lalmetaio >= @MIN_LALMETAIO_VERSION@
BuildRequires: lalsimulation-devel >= @MIN_LALSIMULATION_VERSION@
BuildRequires: lalsimulation-octave >= @MIN_LALSIMULATION_VERSION@
BuildRequires: lalsimulation-python >= @MIN_LALSIMULATION_VERSION@
BuildRequires: python2-lalsimulation >= @MIN_LALSIMULATION_VERSION@
BuildRequires: lalburst-devel >= @MIN_LALBURST_VERSION@
BuildRequires: lalburst-octave >= @MIN_LALBURST_VERSION@
BuildRequires: lalburst-python >= @MIN_LALBURST_VERSION@
BuildRequires: python2-lalburst >= @MIN_LALBURST_VERSION@
Requires: glib2
Requires: gsl
Requires: libframe
......@@ -63,19 +68,22 @@ The LSC Algorithm DetChar Library for gravitational wave data analysis. This
package contains files needed build applications that use the LAL DetChar
library.
%package python
Summary: Python Bindings for LALDetChar
%package -n python2-%{name}
Summary: Python %{python2_version} Bindings for LALDetChar
Group: LAL
Provides: %{name}-python
Obsoletes: %{name}-python < 0.3.5-2
Conflicts: %{name}-python
Requires: %{name} = %{version}
Requires: numpy
Requires: python
Requires: lal-python >= @MIN_LAL_VERSION@
Requires: lalmetaio-python >= @MIN_LALMETAIO_VERSION@
Requires: lalsimulation-python >= @MIN_LALSIMULATION_VERSION@
Requires: lalburst-python >= @MIN_LALBURST_VERSION@
%description python
Requires: python2-lal >= @MIN_LAL_VERSION@
Requires: python2-lalmetaio >= @MIN_LALMETAIO_VERSION@
Requires: python2-lalsimulation >= @MIN_LALSIMULATION_VERSION@
Requires: python2-lalburst >= @MIN_LALBURST_VERSION@
%description -n python2-%{name}
The LSC Algorithm Library for gravitational wave data analysis.
This package provides the Python bindings for LALDetChar.
This package provides the Python %{python2_version} bindings for LALDetChar.
%package octave
Summary: Octave Bindings for LALDetChar
......@@ -127,10 +135,10 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}}
%{_libdir}/*.so
%{_libdir}/pkgconfig/*
%files python
%files -n python2-%{name}
%defattr(-,root,root)
%{_bindir}/laldetchar-*
%{_libdir}/python*
%{python2_sitearch}/*
%files octave
%defattr(-,root,root)
......
......@@ -32,5 +32,5 @@ For More Information
Please visit the [LALSuite project page][project].
[install]: https://wiki.ligo.org/DASWG/LALSuiteInstall
[bugs]: https://bugs.ligo.org/redmine/projects/lalsuite
[bugs]: https://git.ligo.org/lscsoft/lalsuite/issues/
[project]: http://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
%define nightly @NIGHTLY_VERSION@
%define nightly @NIGHTLY_VERSION@%{nil}
%define _prefix /usr
%define _mandir %{_prefix}/share/man
%define _sysconfdir %{_prefix}/etc
%define release 1
%if "%{?nightly:%{nightly}}%{!?nightly:0}" == "%{nil}"
%undefine nightly
%endif
Name: @PACKAGE@
Version: @BASE_VERSION@
Release: %{?nightly:0.%{nightly}}%{!?nightly:%{release}}%{?dist}
......@@ -13,6 +17,7 @@ Group: LAL
Source: %{name}-%{version}%{?nightly:-%{nightly}}.tar.xz
URL: https://wiki.ligo.org/DASWG/LALSuite
Packager: Adam Mercer <adam.mercer@ligo.org>
BuildRequires: python2-rpm-macros
BuildRequires: ldas-tools-framecpp-c-devel >= @MIN_FRAMECPPC_VERSION@
BuildRequires: libframe-devel
BuildRequires: numpy
......@@ -21,7 +26,7 @@ BuildRequires: python-devel
BuildRequires: swig >= 3.0.7
BuildRequires: lal-devel >= @MIN_LAL_VERSION@
BuildRequires: lal-octave >= @MIN_LAL_VERSION@
BuildRequires: lal-python >= @MIN_LAL_VERSION@
BuildRequires: python2-lal >= @MIN_LAL_VERSION@
Requires: ldas-tools-framecpp-c >= @MIN_FRAMECPPC_VERSION@
Requires: libframe
Requires: lal >= @MIN_LAL_VERSION@
......@@ -44,16 +49,19 @@ The LSC Algorithm Frame Library for gravitational wave data analysis. This
package contains files needed build applications that use the LAL Frame
library.
%package python
Summary: Python Bindings for LALFrame
%package -n python2-%{name}
Summary: Python %{python2_version} Bindings for LALFrame
Group: LAL
Provides: %{name}-python
Obsoletes: %{name}-python < 1.4.3-2
Conflicts: %{name}-python
Requires: %{name} = %{version}
Requires: numpy
Requires: python
Requires: lal-python >= @MIN_LAL_VERSION@
%description python
Requires: python2-lal >= @MIN_LAL_VERSION@
%description -n python2-%{name}
The LSC Algorithm Library for gravitational wave data analysis.
This package provides the Python bindings for LALFrame.
This package provides the Python %{python2_version} bindings for LALFrame.
%package octave
Summary: Octave Bindings for LALFrame
......@@ -104,9 +112,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}}
%{_libdir}/*.so
%{_libdir}/pkgconfig/*
%files python
%files -n python2-%{name}
%defattr(-,root,root)
%{_libdir}/python*
%{python2_sitearch}/*
%files octave
%defattr(-,root,root)
......
......@@ -98,6 +98,7 @@ src/lalinference_bench
src/lalinference_burst
src/lalinference_datadump
src/lalinference_nest
src/lalinference_injectedlike
src/lalinference_version
src/stamp-h1
src/stamp-h2
......
......@@ -32,5 +32,5 @@ For More Information
Please visit the [LALSuite project page][project].
[install]: https://wiki.ligo.org/DASWG/LALSuiteInstall
[bugs]: https://bugs.ligo.org/redmine/projects/lalsuite
[bugs]: https://git.ligo.org/lscsoft/lalsuite/issues/
[project]: http://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
%define nightly @NIGHTLY_VERSION@
%define nightly @NIGHTLY_VERSION@%{nil}
%define _prefix /usr
%define _mandir %{_prefix}/share/man
%define _sysconfdir %{_prefix}/etc
%define release 1
%if "%{?nightly:%{nightly}}%{!?nightly:0}" == "%{nil}"
%undefine nightly
%endif
Name