Commit 6903a989 authored by Adam Mercer's avatar Adam Mercer

Merge branch 'lal-intel-fft-point-release' into 'pre-o3-release'

Lal intel fft point release

See merge request lscsoft/lalsuite!616
parents f2cb2867 71914197
This diff is collapsed.
AC_PREREQ([2.63])
AC_INIT([LALSuite],[6.49],[lal-discuss@ligo.org])
AC_INIT([LALSuite],[6.50],[lal-discuss@ligo.org])
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_AUX_DIR([gnuscripts])
AC_CONFIG_MACRO_DIR([gnuscripts])
......
AC_PREREQ([2.63])
AC_INIT([LAL],[6.19.0],[lal-discuss@ligo.org])
AC_INIT([LAL],[6.19.1],[lal-discuss@ligo.org])
AC_CONFIG_HEADERS([src/config.h src/LALConfig.h])
AC_CONFIG_SRCDIR([src/std/LALStdio.h])
AC_CONFIG_AUX_DIR([gnuscripts])
......@@ -89,7 +89,7 @@ LALSUITE_DISTCHECK_CONFIGURE_FLAGS
# 6. if any interfaces have been removed since the last public release,
# then set age to 0.
AC_SUBST([LIBCURRENT],[15])
AC_SUBST([LIBREVISION],[0])
AC_SUBST([LIBREVISION],[1])
AC_SUBST([LIBAGE],[1])
AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
......
lal (6.19.1-1) unstable; urgency=low
* Intel FFT complilation fixes
-- Adam Mercer <adam.mercer@ligo.org> Mon, 07 Jan 2019 14:02:28 +0000
lal (6.19.0-1) unstable; urgency=low
* Pre O3 release
......
......@@ -136,6 +136,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}}
# dates should be formatted using: 'date +"%a %b %d %Y"'
%changelog
* Mon Jan 07 2019 Adam Mercer <adam.mercer@ligo.org> 6.19.1-1
- Intel FFT complilation fixes
* Thu Sep 13 2018 Adam Mercer <adam.mercer@ligo.org> 6.19.0-1
- Pre O3 release
......
......@@ -33,7 +33,7 @@
if ( (fstat) != DFTI_NO_ERROR ) \
{ \
char *errmsg = DftiErrorMessage( fftStat ); \
XLAL_ERROR( COMPLEXFFTH_EINTL, errmsg ); \
XLAL_ERROR( COMPLEXFFTH_EINTL, "%s", errmsg ); \
} \
else (void)(0)
......@@ -41,7 +41,7 @@
if ( (fstat) != DFTI_NO_ERROR ) \
{ \
char *errmsg = DftiErrorMessage( fftStat ); \
XLAL_ERROR_NULL( COMPLEXFFTH_EINTL, errmsg ); \
XLAL_ERROR_NULL( COMPLEXFFTH_EINTL, "%s", errmsg ); \
} \
else (void)(0)
......@@ -49,7 +49,7 @@
if ( (fstat) != DFTI_NO_ERROR ) \
{ \
char *errmsg = DftiErrorMessage( fftStat ); \
XLAL_ERROR_VOID( COMPLEXFFTH_EINTL, errmsg ); \
XLAL_ERROR_VOID( COMPLEXFFTH_EINTL, "%s", errmsg ); \
} \
else (void)(0)
......
......@@ -30,31 +30,30 @@
/** \cond DONT_DOXYGEN */
#define CHECKINTELFFTSTATUS( fstat ) \
if ( (fstat) != DFTI_NO_ERROR ) \
{ \
char *errmsg = DftiErrorMessage( fftStat ); \
XLAL_ERROR( REALFFTH_EINTL, errmsg ); \
} \
#define CHECKINTELFFTSTATUS( fstat ) \
if ( (fstat) != DFTI_NO_ERROR ) \
{ \
char *errmsg = DftiErrorMessage( fftStat ); \
XLAL_ERROR( REALFFTH_EINTL, "%s", errmsg ); \
} \
else (void)(0)
#define CHECKINTELFFTSTATUS_NULL( fstat ) \
if ( (fstat) != DFTI_NO_ERROR ) \
{ \
char *errmsg = DftiErrorMessage( fftStat ); \
XLAL_ERROR_NULL( REALFFTH_EINTL, errmsg ); \
} \
#define CHECKINTELFFTSTATUS_NULL( fstat ) \
if ( (fstat) != DFTI_NO_ERROR ) \
{ \
char *errmsg = DftiErrorMessage( fftStat ); \
XLAL_ERROR_NULL( REALFFTH_EINTL, "%s", errmsg ); \
} \
else (void)(0)
#define CHECKINTELFFTSTATUS_VOID( fstat ) \
if ( (fstat) != DFTI_NO_ERROR ) \
{ \
char *errmsg = DftiErrorMessage( fftStat ); \
XLAL_ERROR_VOID( REALFFTH_EINTL, errmsg ); \
} \
#define CHECKINTELFFTSTATUS_VOID( fstat ) \
if ( (fstat) != DFTI_NO_ERROR ) \
{ \
char *errmsg = DftiErrorMessage( fftStat ); \
XLAL_ERROR_VOID( REALFFTH_EINTL, "%s", errmsg ); \
} \
else (void)(0)
/*
* Plan to perform FFT of REAL4 data.
*/
......
......@@ -24,7 +24,9 @@ FFTSRC = \
IntelRealFFT.c \
FFTWMutex.c \
$(QTHREADSRC)
FFTHDR =
FFTHDR = \
IntelComplexFFT_source.c \
IntelRealFFT_source.c
FFTCXXSRC =
FFTCXXGENSRC =
FFTLIBCXX =
......@@ -77,6 +79,7 @@ CLEANFILES = CudaFFT.cpp
EXTRA_DIST = \
ComplexFFT.c \
ComplexFFT_source.c \
CudaComplexFFT.c \
CudaFFT.cu \
CudaFFT.h \
......@@ -84,7 +87,9 @@ EXTRA_DIST = \
CudaRealFFT.c \
FFTWMutex.c \
IntelComplexFFT.c \
IntelComplexFFT_source.c \
IntelRealFFT.c \
IntelRealFFT_source.c \
RealFFT.c \
RealFFT_source.c \
TimeFreqFFT.c \
......
......@@ -8,8 +8,6 @@
#include <lal/Random.h>
#include <lal/Sort.h>
#include <fftw3.h>
#ifdef __GNUC__
#define UNUSED __attribute__ ((unused))
#else
......
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