Commit ba78224d authored by Duncan Macleod's avatar Duncan Macleod
Browse files

Merge branch 'framel' into 'master'

Update packaging for new FrameL packages

See merge request lscsoft/lalsuite!1328
parents ca9fba78 7c5c1de2
......@@ -178,8 +178,10 @@ cache:
- cd ${PACKAGE}-*/
- dch -v ${VERSION}-1 -b 'Rebuilt automatically on git.ligo.org CI'
# install build dependencies
- ${APT_GET} -q install devscripts
- mk-build-deps --tool "${APT_GET}" --install --remove
- mk-build-deps
--tool "${APT_GET} -o Debug::pkgProblemResolver=yes --no-install-recommends"
--install
--remove
# build packages
- debuild -us -uc -r
artifacts:
......@@ -254,6 +256,7 @@ cache:
- "conda/bld/linux-64/${CI_JOB_NAME%%:*}-*.tar.bz2"
- "conda/bld/linux-64/python-${CI_JOB_NAME%%:*}-*.conda"
- "conda/bld/linux-64/python-${CI_JOB_NAME%%:*}-*.tar.bz2"
- "conda/bld/${CI_JOB_NAME%%:*}_*/work/config.log"
- "conda/bld/${CI_JOB_NAME%%:*}_*/work/test/test-suite.log"
- "conda/bld/${CI_JOB_NAME%%:*}_*/work/test/python/test-suite.log"
- "conda/bld/${CI_JOB_NAME%%:*}_*/work/*/*/*/test-suite.log"
......
......@@ -57,7 +57,7 @@ requirements:
- lalmetaio >={{ lalmetaio_version }}a0
- lalpulsar >={{ lalpulsar_version }}a0
- lalsimulation >={{ lalsimulation_version }}a0
- libframe
- libframel
- llvm-openmp # [osx]
- openmp # [linux]
- python
......@@ -82,7 +82,7 @@ requirements:
- lalinspiral >={{ lalinspiral_version }}a0
- lalpulsar >={{ lalpulsar_version }}a0
- lalinference >={{ lalinference_version }}a0
- libframe
- libframel
- ligo-segments
- llvm-openmp # [osx]
- openmp # [linux]
......
......@@ -55,6 +55,7 @@ AM_INIT_AUTOMAKE([ \
])
# version requirements
MIN_FRAMEL_VERSION="8.39.2"
MIN_LAL_VERSION="6.21.0"
MIN_LALFRAME_VERSION="1.5.0"
MIN_LALMETAIO_VERSION="1.6.0"
......@@ -63,6 +64,7 @@ MIN_LALBURST_VERSION="1.5.3"
MIN_LALINSPIRAL_VERSION="1.10.0"
MIN_LALPULSAR_VERSION="1.18.2"
MIN_LALINFERENCE_VERSION="1.11.4"
AC_SUBST([MIN_FRAMEL_VERSION])
AC_SUBST([MIN_LAL_VERSION])
AC_SUBST([MIN_LALFRAME_VERSION])
AC_SUBST([MIN_LALMETAIO_VERSION])
......@@ -89,7 +91,7 @@ LALAPPS_ENABLE_CONDOR
LALAPPS_ENABLE_STATIC_BINARIES
LALAPPS_ENABLE_FFTW
LALAPPS_ENABLE_FRAME
LALAPPS_ENABLE_FRAMEL
LALSUITE_ENABLE_CFITSIO
LALAPPS_ENABLE_PSS
LALAPPS_ENABLE_GDS
......@@ -210,28 +212,28 @@ fi
LALSUITE_ENABLE_MODULE([GDS])
# check for libFrame
if test "${frame}" = "true"; then
PKG_CHECK_MODULES([FRAME],[libframe],[true],[false])
lal_pre_frame_LIBS="$LIBS"
LALSUITE_ADD_FLAGS([C],[],[${FRAME_LIBS}])
AC_SEARCH_LIBS([FrLibIni],[Frame],,
[AC_MSG_WARN([could not find the frame library])]
[frame="false"]
if test "${framel}" = "true"; then
PKG_CHECK_MODULES([FRAMEL],[framel],[true],[false])
lal_pre_framel_LIBS="$LIBS"
LALSUITE_ADD_FLAGS([C],[],[${FRAMEL_LIBS}])
AC_SEARCH_LIBS([FrLibIni],[framel],,
[AC_MSG_WARN([could not find the FrameL library])]
[framel="false"]
[lalframe="false"]
[LIBS="$lal_pre_frame_LIBS"])
[LIBS="$lal_pre_framel_LIBS"])
fi
# check for libFrame headers
if test "${frame}" = "true"; then
lal_pre_frame_CPPFLAGS="$CPPFLAGS"
LALSUITE_ADD_FLAGS([C],[${FRAME_CFLAGS}],[])
# check for FrameL headers
if test "${framel}" = "true"; then
lal_pre_framel_CPPFLAGS="$CPPFLAGS"
LALSUITE_ADD_FLAGS([C],[${FRAMEL_CFLAGS}],[])
AC_CHECK_HEADERS([FrameL.h],,
[AC_MSG_WARN([could not find the FrameL.h header])]
[frame="false"]
[framel="false"]
[lalframe="false"]
[CPPFLAGS="$lal_pre_frame_CPPFLAGS"])
[CPPFLAGS="$lal_pre_framel_CPPFLAGS"])
fi
LALSUITE_ENABLE_MODULE([FRAME])
LALSUITE_ENABLE_MODULE([FRAMEL])
# check for cfitsio
LALSUITE_USE_CFITSIO
......@@ -330,7 +332,7 @@ LALApps has now been successfully configured:
* Python support is $PYTHON_ENABLE_VAL
* FFTW library support is $FFTW_ENABLE_VAL
* Frame library support is $FRAME_ENABLE_VAL
* FrameL library support is $FRAMEL_ENABLE_VAL
* LALFrame library support is $LALFRAME_ENABLE_VAL
* LALMetaIO library support is $LALMETAIO_ENABLE_VAL
* LALSimulation library support is $LALSIMULATION_ENABLE_VAL
......
......@@ -11,7 +11,7 @@ Build-Depends: bc,
less,
libcfitsio3-dev | libcfitsio-dev,
libfftw3-dev,
libframe-dev (>= 8.0),
libframel-dev (>= 8.0),
libgsl-dev | libgsl0-dev (>= 1.9),
make,
pkg-config (>= 0.18.0),
......@@ -44,7 +44,7 @@ Depends: ${misc:Depends},
${python:Depends},
${shlibs:Depends},
less,
libframe1 (>= 8.0),
libframel8 (>= 8.0),
python-h5py,
python-six,
zlib1g,
......
......@@ -61,16 +61,16 @@ AC_DEFUN([LALAPPS_ENABLE_FFTW],
], [ fftw=true ] )
])
AC_DEFUN([LALAPPS_ENABLE_FRAME],
AC_DEFUN([LALAPPS_ENABLE_FRAMEL],
[AC_ARG_ENABLE(
[frame],
AC_HELP_STRING([--enable-frame],[compile code that requires Frame library [default=yes]]),
[framel],
AC_HELP_STRING([--enable-framel],[compile code that requires FrameL library [default=yes]]),
[ case "${enableval}" in
yes) frame=true;;
no) frame=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-frame) ;;
yes) framel=true;;
no) framel=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-framel) ;;
esac
], [ frame=true ] )
], [ framel=true ] )
])
AC_DEFUN([LALAPPS_ENABLE_PSS],
......
......@@ -18,11 +18,11 @@ Packager: Adam Mercer <adam.mercer@ligo.org>
BuildRequires: bc
BuildRequires: cfitsio-devel
BuildRequires: fftw-devel
BuildRequires: libframel-devel >= @MIN_FRAMEL_VERSION@
BuildRequires: gcc
BuildRequires: gsl-devel
BuildRequires: help2man
BuildRequires: less
BuildRequires: libframe-devel
BuildRequires: lal-devel >= @MIN_LAL_VERSION@
BuildRequires: lalburst-devel >= @MIN_LALBURST_VERSION@
BuildRequires: lalframe-devel >= @MIN_LALFRAME_VERSION@
......@@ -54,7 +54,7 @@ Requires: lalmetaio >= @MIN_LALMETAIO_VERSION@
Requires: lalpulsar >= @MIN_LALPULSAR_VERSION@
Requires: lalsimulation >= @MIN_LALSIMULATION_VERSION@
Requires: less
Requires: libframe
Requires: libframel >= @MIN_FRAMEL_VERSION@
Requires: python
Requires: python2-h5py
Requires: python2-lal >= @MIN_LAL_VERSION@
......
......@@ -8,7 +8,7 @@ if LALINSPIRAL
SUBDIRS += findchirp
endif
if FRAME
if FRAMEL
if LALFRAME
if LALMETAIO
if LALINSPIRAL
......
......@@ -188,10 +188,6 @@ int main( int argc, char *argv[] )
BOOLEAN highpass = FALSE;
PassBandParamStruc highpassParam;
/* test files are version 4 frames */
if ( FRAMELIB_VERSION < 4 )
return 77;
/* set default values for input */
dirname = getenv( "LAL_FRAME_PATH" );
......
......@@ -131,10 +131,6 @@ int main( int argc, char *argv[] )
BOOLEAN highpass = FALSE;
PassBandParamStruc highpassParam;
/* test files are version 4 frames */
if ( FRAMELIB_VERSION < 4 )
return 77;
/* set default values for input */
dirname = getenv( "LAL_FRAME_PATH" );
......
......@@ -5,7 +5,7 @@ include $(top_srcdir)/gnuscripts/lalsuite_vcs_info.am
include $(top_srcdir)/gnuscripts/lalsuite_python.am
include $(top_srcdir)/gnuscripts/lalsuite_help2man.am
if FRAME
if FRAMEL
if LALFRAME
FRAMESRCS = \
series.c \
......
......@@ -90,7 +90,7 @@ test_scripts += test_heterodyne_pulsar.sh
test_helpers +=
# These tests require FRAME
if !FRAME
if !FRAMEL
skip_tests += test_heterodyne_pulsar.sh
endif
......
......@@ -10,14 +10,14 @@ dist_bin_SCRIPTS = lalapps_CopySFTs
bin_PROGRAMS =
if FRAME
if FRAMEL
bin_PROGRAMS += lalapps_MakeSFTs
endif
lalapps_MakeSFTs_SOURCES = MakeSFTs.c
lalapps_MakeSFTs_CPPFLAGS = $(AM_CPPFLAGS)
if FRAME
if FRAMEL
if PSS
lalapps_MakeSFTs_SOURCES += XLALPSSInterface.c
lalapps_MakeSFTs_CPPFLAGS += -DPSS_ENABLED
......@@ -36,6 +36,6 @@ test_scripts += testMakeSFTs.sh
test_helpers +=
# These tests require FRAME
if !FRAME
if !FRAMEL
skip_tests += testMakeSFTs.sh
endif
......@@ -33,11 +33,11 @@ requirements:
host:
- lal >={{ lal_version }}a0
- ldas-tools-framecpp >={{ framecpp_version }}
- libframe
- libframel
run:
- lal >={{ lal_version }}a0
- ldas-tools-framecpp >={{ framecpp_version }}
- libframe
- libframel
test:
source_files:
......@@ -81,7 +81,7 @@ outputs:
- lal >={{ lal_version }}a0
- {{ pin_subpackage('lalframe', exact=True) }}
- ldas-tools-framecpp >={{ framecpp_version }}
- libframe
- libframel
- {{ pin_compatible('numpy') }}
- python
- python-lal >={{ lal_version }}a0
......
......@@ -42,8 +42,10 @@ AM_INIT_AUTOMAKE([ \
# version requirements
MIN_LAL_VERSION="6.21.0"
MIN_FRAMECPPC_VERSION="2.5.5"
MIN_FRAMEL_VERSION="8.39.2"
AC_SUBST([MIN_LAL_VERSION])
AC_SUBST([MIN_FRAMECPPC_VERSION])
AC_SUBST([MIN_FRAMEL_VERSION])
AC_CANONICAL_HOST
......@@ -147,9 +149,9 @@ AS_IF([test "${framec}" = "true"], [
AS_IF([test "${framel}" = "true"], [
FRAMEL_AVAILABLE="yes"
PKG_CHECK_MODULES([LIBFRAME],[libframe],[true],[false])
LALSUITE_ADD_FLAGS([C],[${LIBFRAME_CFLAGS}],[${LIBFRAME_LIBS}])
AC_CHECK_LIB([Frame],[FrLibIni],,[FRAMEL_AVAILABLE="no"])
PKG_CHECK_MODULES([FRAMEL],[framel],[true],[false])
LALSUITE_ADD_FLAGS([C],[${FRAMEL_CFLAGS}],[${FRAMEL_LIBS}])
AC_CHECK_LIB([framel],[FrLibIni],,[FRAMEL_AVAILABLE="no"])
AC_CHECK_HEADERS([FrameL.h],,[FRAMEL_AVAILABLE="no"])
])
......@@ -164,7 +166,7 @@ AS_IF([test "${FRAMEC_AVAILABLE}" = "yes"],
)
AS_IF([test "${FRAMEL_AVAILABLE}" = "yes"],
[AC_SUBST([PC_REQUIRES_FRAMEL], [", libframe"])],
[AC_SUBST([PC_REQUIRES_FRAMEL], [", framel"])],
[AC_SUBST([PC_REQUIRES_FRAMEL], [""])]
)
......
......@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 9),
pkg-config (>= 0.18.0),
lal-dev (>= @MIN_LAL_VERSION@~),
ldas-tools-framecpp-c-dev (>= @MIN_FRAMECPPC_VERSION@),
libframe-dev (>= 8.0),
libframel-dev (>= @MIN_FRAMEL_VERSION@),
liboctave-dev,
zlib1g-dev,
swig (>= 3.0.9) | swig3.0 (>= 3.0.9),
......@@ -36,7 +36,7 @@ Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
ldas-tools-framecpp-c (>= @MIN_FRAMECPPC_VERSION@),
libframe1 (>= 8.0),
libframel8 (>= @MIN_FRAMEL_VERSION@),
lal (>= @MIN_LAL_VERSION@~)
Description: LSC Algorithm Library Frame
The LSC Algorithm Frame Library for gravitational wave data analysis.
......@@ -49,7 +49,7 @@ Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
ldas-tools-framecpp-c-dev (>= @MIN_FRAMECPPC_VERSION@),
libframe-dev (>= 8.0),
libframel-dev (>= @MIN_FRAMEL_VERSION@),
zlib1g-dev,
lal-dev (>= @MIN_LAL_VERSION@~),
lalframe (= ${binary:Version})
......
......@@ -23,12 +23,12 @@ Prefix: %{_prefix}
# -- build requirements -----
# C
BuildRequires: libframel-devel >= @MIN_FRAMEL_VERSION@
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: help2man
BuildRequires: lal-devel >= @MIN_LAL_VERSION@
BuildRequires: ldas-tools-framecpp-c-devel >= @MIN_FRAMECPPC_VERSION@
BuildRequires: libframe-devel
BuildRequires: make
BuildRequires: pkgconfig >= 0.18.0
......@@ -60,9 +60,9 @@ BuildRequires: lal-octave >= @MIN_LAL_VERSION@
# -- packages ---------------
# lalframe
Requires: ldas-tools-framecpp-c >= @MIN_FRAMECPPC_VERSION@
Requires: libframe
Requires: lal >= @MIN_LAL_VERSION@
Requires: ldas-tools-framecpp-c >= @MIN_FRAMECPPC_VERSION@
Requires: libframel >= @MIN_FRAMEL_VERSION@
%description
The LSC Algorithm Frame Library for gravitational wave data analysis. This
......@@ -74,9 +74,9 @@ that use the LAL Frame library.
Summary: Files and documentation needed for compiling programs that use LAL Frame
Group: LAL
Requires: %{name} = %{version}
Requires: ldas-tools-framecpp-c-devel >= @MIN_FRAMECPPC_VERSION@
Requires: libframe-devel
Requires: libframel-devel >= @MIN_FRAMEL_VERSION@
Requires: lal-devel >= @MIN_LAL_VERSION@
Requires: ldas-tools-framecpp-c-devel >= @MIN_FRAMECPPC_VERSION@
%description devel
The LSC Algorithm Frame Library for gravitational wave data analysis. This
package contains files needed build applications that use the LAL Frame
......
......@@ -31,7 +31,7 @@ enum {
};
/* enable FrameL support if available */
#if defined HAVE_FRAMEL_H && defined HAVE_LIBFRAME
#if defined HAVE_FRAMEL_H && defined HAVE_FRAMEL
# include "LALFrameUFrameL.h"
# define CASE_FRAMEL(errval, function, ...) case LAL_FRAMEU_FRAME_LIBRARY_FRAMEL: return function ## _FrameL_ (__VA_ARGS__)
# ifndef LAL_FRAMEU_FRAME_LIBRARY_DEFAULT
......@@ -88,7 +88,7 @@ static int XLALFrameLibrary(void)
const char *env = getenv("LAL_FRAME_LIBRARY");
if (env) {
if (strcmp(env, "FrameL") == 0) {
#if defined HAVE_FRAMEL_H && defined HAVE_LIBFRAME
#if defined HAVE_FRAMEL_H && defined HAVE_FRAMEL
lalFrameLibrary = LAL_FRAMEU_FRAME_LIBRARY_FRAMEL;
#else
XLAL_ERROR_VAL(LAL_FRAMEU_FRAME_LIBRARY_UNAVAILABLE, XLAL_ESYS,
......
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