From 5285be45f161baa58e748e282366cebd736f605b Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 14:33:38 -0700 Subject: [PATCH 01/64] lal: mark as version 7.2.1 --- lal/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lal/configure.ac b/lal/configure.ac index 969a40751b..0430bd3a22 100644 --- a/lal/configure.ac +++ b/lal/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([LAL],[7.2.0.1],[lal-discuss@ligo.org]) +AC_INIT([LAL],[7.2.1],[lal-discuss@ligo.org]) AC_CONFIG_HEADERS([lib/config.h lib/LALConfig.h]) AC_CONFIG_SRCDIR([lib/std/LALStdio.h]) AC_CONFIG_AUX_DIR([gnuscripts]) -- GitLab From 762242b387aa2055bbda208f6ef51965df8a3404 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 14:34:24 -0700 Subject: [PATCH 02/64] lal: bump library api version for 7.2.1 --- lal/configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lal/configure.ac b/lal/configure.ac index 0430bd3a22..1c0456fe77 100644 --- a/lal/configure.ac +++ b/lal/configure.ac @@ -20,7 +20,7 @@ AC_CONFIG_MACRO_DIR([gnuscripts]) # 6. if any interfaces have been removed since the last public release, # then set age to 0. AC_SUBST([LIBCURRENT],[22]) -AC_SUBST([LIBREVISION],[0]) +AC_SUBST([LIBREVISION],[1]) AC_SUBST([LIBAGE],[2]) AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}]) AS_CASE([${host_os}], @@ -43,7 +43,7 @@ AS_CASE([${host_os}], # 6. if any interfaces have been removed since the last public release, # then set age to 0. AC_SUBST([LIBCURRENT_SUPPORT],[14]) -AC_SUBST([LIBREVISION_SUPPORT],[3]) +AC_SUBST([LIBREVISION_SUPPORT],[4]) AC_SUBST([LIBAGE_SUPPORT],[0]) AC_SUBST([LIBVERSION_SUPPORT],[${LIBCURRENT_SUPPORT}:${LIBREVISION_SUPPORT}:${LIBAGE_SUPPORT}]) AS_CASE([${host_os}], -- GitLab From 21680f1eb801e9dd397e203a61f9a2ed3512ac42 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 14:38:58 -0700 Subject: [PATCH 03/64] lal: update packaging for 7.2.1 --- lal/debian/changelog | 6 ++++++ lal/lal.spec.in | 3 +++ 2 files changed, 9 insertions(+) diff --git a/lal/debian/changelog b/lal/debian/changelog index 95e507db28..99527de798 100644 --- a/lal/debian/changelog +++ b/lal/debian/changelog @@ -1,3 +1,9 @@ +lal (7.2.1-1) unstable; urgency=low + + * Update for 7.2.1 + + -- Adam Mercer Thu, 18 Aug 2022 14:38:46 -0700 + lal (7.2.0-1) unstable; urgency=low * Update for 7.2.0 diff --git a/lal/lal.spec.in b/lal/lal.spec.in index 67dd59abeb..3b7af50880 100644 --- a/lal/lal.spec.in +++ b/lal/lal.spec.in @@ -187,6 +187,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}} # dates should be formatted using: 'date +"%a %b %d %Y"' %changelog +* Thu Aug 18 2022 Adam Mercer 7.2.1-1 +- Update for 7.2.1 + * Tue Aug 02 2022 Adam Mercer 7.2.0-1 - Update for 7.2.0 -- GitLab From 783fa149118d5b5d6696a4dc2902971a5ba42106 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 14:40:07 -0700 Subject: [PATCH 04/64] lalframe: mark as version 2.0.2 --- lalframe/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalframe/configure.ac b/lalframe/configure.ac index e045575285..2e976c5195 100644 --- a/lalframe/configure.ac +++ b/lalframe/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([LALFrame],[2.0.1.1],[lal-discuss@ligo.org]) +AC_INIT([LALFrame],[2.0.2],[lal-discuss@ligo.org]) AC_CONFIG_HEADERS([lib/config.h lib/LALFrameConfig.h]) AC_CONFIG_SRCDIR([lib/LALFrameIO.c]) AC_CONFIG_AUX_DIR([gnuscripts]) -- GitLab From 7ae8cad85a246053222ec93f2ee52c4903196911 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 22 Aug 2022 09:03:17 -0700 Subject: [PATCH 05/64] lalframe: bump dependency versions --- lalframe/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalframe/configure.ac b/lalframe/configure.ac index 2e976c5195..36edd82a42 100644 --- a/lalframe/configure.ac +++ b/lalframe/configure.ac @@ -69,7 +69,7 @@ AM_INIT_AUTOMAKE([ \ ]) # version requirements -MIN_LAL_VERSION="7.2.0" +MIN_LAL_VERSION="7.2.1" MIN_FRAMECPPC_VERSION="2.5.5" MIN_FRAMEL_VERSION="8.39.2" AC_SUBST([MIN_LAL_VERSION]) -- GitLab From d12691bc7ecff320fa434e32959c3ca83a913e68 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 14:42:28 -0700 Subject: [PATCH 06/64] lalframe: update packaging for 2.0.2 --- lalframe/debian/changelog | 6 ++++++ lalframe/lalframe.spec.in | 3 +++ 2 files changed, 9 insertions(+) diff --git a/lalframe/debian/changelog b/lalframe/debian/changelog index 3e94a302f5..e78c6239b0 100644 --- a/lalframe/debian/changelog +++ b/lalframe/debian/changelog @@ -1,3 +1,9 @@ +lalframe (2.0.2-1) unstable; urgency=low + + * Update for 2.0.2 + + -- Adam Mercer Thu, 18 Aug 2022 14:41:43 -0700 + lalframe (2.0.1-1) unstable; urgency=low * Update for 2.0.1 diff --git a/lalframe/lalframe.spec.in b/lalframe/lalframe.spec.in index 591a239330..23889dedd2 100644 --- a/lalframe/lalframe.spec.in +++ b/lalframe/lalframe.spec.in @@ -171,6 +171,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}} # dates should be formatted using: 'date +"%a %b %d %Y"' %changelog +* Thu Aug 18 2022 Adam Mercer 2.0.2-1 +- Update for 2.0.2 + * Tue Aug 02 2022 Adam Mercer 2.0.1-1 - Update for 2.0.1 -- GitLab From b2948c681f3a0d013aad1ebc912eac7a4269a692 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 14:56:55 -0700 Subject: [PATCH 07/64] lalmetaio: mark as version 3.0.1 --- lalmetaio/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalmetaio/configure.ac b/lalmetaio/configure.ac index 6c4d2bedfd..6f3eb363a7 100644 --- a/lalmetaio/configure.ac +++ b/lalmetaio/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([LALMetaIO],[3.0.0.1],[lal-discuss@ligo.org]) +AC_INIT([LALMetaIO],[3.0.1],[lal-discuss@ligo.org]) AC_CONFIG_HEADERS([lib/config.h lib/LALMetaIOConfig.h]) AC_CONFIG_SRCDIR([lib/LIGOLwXML.c]) AC_CONFIG_AUX_DIR([gnuscripts]) -- GitLab From 68764a5b5d52c7928cd2c99aac3093c03bf037a8 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 22 Aug 2022 09:03:18 -0700 Subject: [PATCH 08/64] lalmetaio: bump dependency versions --- lalmetaio/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalmetaio/configure.ac b/lalmetaio/configure.ac index 6f3eb363a7..b0e2f15e0d 100644 --- a/lalmetaio/configure.ac +++ b/lalmetaio/configure.ac @@ -68,7 +68,7 @@ AM_INIT_AUTOMAKE([ \ ]) # version requirements -MIN_LAL_VERSION="7.2.0" +MIN_LAL_VERSION="7.2.1" AC_SUBST([MIN_LAL_VERSION]) AC_CANONICAL_HOST -- GitLab From b5d424a4b9741c7ea54610d924e56bf8ca8ae49b Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 15:21:42 -0700 Subject: [PATCH 09/64] lalmetaio: update packaging for 3.0.1 --- lalmetaio/debian/changelog | 6 ++++++ lalmetaio/lalmetaio.spec.in | 3 +++ 2 files changed, 9 insertions(+) diff --git a/lalmetaio/debian/changelog b/lalmetaio/debian/changelog index b9bff13ee2..fef0df9d36 100644 --- a/lalmetaio/debian/changelog +++ b/lalmetaio/debian/changelog @@ -1,3 +1,9 @@ +lalmetaio (3.0.1-1) unstable; urgency=low + + * Update for 3.0.1 + + -- Adam Mercer Thu, 18 Aug 2022 15:20:22 -0700 + lalmetaio (3.0.0-1) unstable; urgency=low * Update for 3.0.0 diff --git a/lalmetaio/lalmetaio.spec.in b/lalmetaio/lalmetaio.spec.in index 5956684719..7552fb55a0 100644 --- a/lalmetaio/lalmetaio.spec.in +++ b/lalmetaio/lalmetaio.spec.in @@ -168,6 +168,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}} # dates should be formatted using: 'date +"%a %b %d %Y"' %changelog +* Thu Aug 18 2022 Adam Mercer 3.0.1-1 +- Update for 3.0.1 + * Tue Aug 02 2022 Adam Mercer 3.0.0-1 - Update for 3.0.0 -- GitLab From 853a5d770f7150f54e7e1ccb749da178f4a05b61 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 15:28:37 -0700 Subject: [PATCH 10/64] lalsimulation: mark as version 4.0.1 --- lalsimulation/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalsimulation/configure.ac b/lalsimulation/configure.ac index 4901f91485..5a98677ff1 100644 --- a/lalsimulation/configure.ac +++ b/lalsimulation/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([LALSimulation],[4.0.0.1],[lal-discuss@ligo.org]) +AC_INIT([LALSimulation],[4.0.1],[lal-discuss@ligo.org]) AC_CONFIG_HEADERS([lib/config.h lib/LALSimulationConfig.h]) AC_CONFIG_SRCDIR([lib/LALSimulation.c]) AC_CONFIG_AUX_DIR([gnuscripts]) -- GitLab From 8d9ddc0b532e0e7be0798425cbeee2af588a5933 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 15:29:52 -0700 Subject: [PATCH 11/64] lalsimulation: bump library api version for 4.0.1 --- lalsimulation/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalsimulation/configure.ac b/lalsimulation/configure.ac index 5a98677ff1..f03aeb737b 100644 --- a/lalsimulation/configure.ac +++ b/lalsimulation/configure.ac @@ -20,7 +20,7 @@ AC_CONFIG_MACRO_DIR([gnuscripts]) # 6. if any interfaces have been removed since the last public release, # then set age to 0. AC_SUBST([LIBCURRENT],[31]) -AC_SUBST([LIBREVISION],[0]) +AC_SUBST([LIBREVISION],[1]) AC_SUBST([LIBAGE],[0]) AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}]) AS_CASE([${host_os}], -- GitLab From fe8f8b978249f95ac16921c3b8bd4dae0c322675 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 22 Aug 2022 09:03:18 -0700 Subject: [PATCH 12/64] lalsimulation: bump dependency versions --- lalsimulation/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalsimulation/configure.ac b/lalsimulation/configure.ac index f03aeb737b..4907b2de05 100644 --- a/lalsimulation/configure.ac +++ b/lalsimulation/configure.ac @@ -72,7 +72,7 @@ AM_INIT_AUTOMAKE([ \ ]) # version requirements -MIN_LAL_VERSION="7.2.0" +MIN_LAL_VERSION="7.2.1" AC_SUBST([MIN_LAL_VERSION]) AC_CANONICAL_HOST -- GitLab From c888c0b5333a10345776a53b7afcdef74b3596a1 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 15:34:03 -0700 Subject: [PATCH 13/64] lalsimulation: update packaging for 4.0.1 --- lalsimulation/debian/changelog | 6 ++++++ lalsimulation/lalsimulation.spec.in | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lalsimulation/debian/changelog b/lalsimulation/debian/changelog index 28240e866a..d2133b1450 100644 --- a/lalsimulation/debian/changelog +++ b/lalsimulation/debian/changelog @@ -1,3 +1,9 @@ +lalsimulation (4.0.1-1) unstable; urgency=low + + * Update for 4.0.1 + + -- Adam Mercer Thu, 18 Aug 2022 15:33:49 -0700 + lalsimulation (4.0.0-1) unstable; urgency=low * Update for 4.0.0 diff --git a/lalsimulation/lalsimulation.spec.in b/lalsimulation/lalsimulation.spec.in index 614ac80019..d1e5eaed17 100644 --- a/lalsimulation/lalsimulation.spec.in +++ b/lalsimulation/lalsimulation.spec.in @@ -182,8 +182,11 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}} # dates should be formatted using: 'date +"%a %b %d %Y"' %changelog +* Thu Aug 18 2022 Adam Mercer 4.0.1-1 +- Update got 4.0.1 + * Tue Aug 02 2022 Adam Mercer 4.0.0-1 -- Update fopr 4.0.0 +- Update for 4.0.0 * Thu Mar 03 2022 Adam Mercer 3.1.2-1 - Update for 3.1.2 -- GitLab From fe769d920480b3e9d88ce32dfc9737bc4832dd74 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 15:47:53 -0700 Subject: [PATCH 14/64] lalburst: mark as version 1.6.1 --- lalburst/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalburst/configure.ac b/lalburst/configure.ac index ca7900da10..533558d1a5 100644 --- a/lalburst/configure.ac +++ b/lalburst/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([LALBurst],[1.6.0.1],[lal-discuss@ligo.org]) +AC_INIT([LALBurst],[1.6.1],[lal-discuss@ligo.org]) AC_CONFIG_HEADERS([lib/config.h lib/LALBurstConfig.h]) AC_CONFIG_SRCDIR([lib/EPSearch.c]) AC_CONFIG_AUX_DIR([gnuscripts]) -- GitLab From 87e8735de2239489b322ccc5565dfbd78c705e06 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 22 Aug 2022 09:03:19 -0700 Subject: [PATCH 15/64] lalburst: bump dependency versions --- lalburst/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalburst/configure.ac b/lalburst/configure.ac index 533558d1a5..59f74cf253 100644 --- a/lalburst/configure.ac +++ b/lalburst/configure.ac @@ -68,7 +68,7 @@ AM_INIT_AUTOMAKE([ \ ]) # version requirements -MIN_LAL_VERSION="7.2.0" +MIN_LAL_VERSION="7.2.1" MIN_LALMETAIO_VERSION="3.0.0" MIN_LALSIMULATION_VERSION="4.0.0" MIN_PYTHON_LIGO_LW_VERSION="1.7.0" -- GitLab From 341bf2f6ae47d44a490835699a13c7ccb87612d0 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 16:02:12 -0700 Subject: [PATCH 16/64] lalburst: update packaging for 1.6.1 --- lalburst/debian/changelog | 6 ++++++ lalburst/lalburst.spec.in | 3 +++ 2 files changed, 9 insertions(+) diff --git a/lalburst/debian/changelog b/lalburst/debian/changelog index 102c3e9ac5..1ec9a07072 100644 --- a/lalburst/debian/changelog +++ b/lalburst/debian/changelog @@ -1,3 +1,9 @@ +lalburst (1.6.1-1) unstable; urgency=low + + * Update for 1.6.1 + + -- Adam Mercer Thu, 18 Aug 2022 16:02:02 -0700 + lalburst (1.6.0-1) unstable; urgency=low * Update for 1.6.0 diff --git a/lalburst/lalburst.spec.in b/lalburst/lalburst.spec.in index ba60aa152a..b4785237bf 100644 --- a/lalburst/lalburst.spec.in +++ b/lalburst/lalburst.spec.in @@ -203,6 +203,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}} # dates should be formatted using: 'date +"%a %b %d %Y"' %changelog +* Thu Aug 18 2022 Adam Mercer 1.6.1-1 +- Update for 1.6.1 + * Tue Aug 02 2022 Adam Mercer 1.6.0-1 - Update for 1.6.0 -- GitLab From 898e66a1998a7b3a28f7530bf84c08b80356cde4 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 16:03:42 -0700 Subject: [PATCH 17/64] lalinspiral: mark as version 3.0.1 --- lalinspiral/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalinspiral/configure.ac b/lalinspiral/configure.ac index b1ad05d4e2..5eefdf25e5 100644 --- a/lalinspiral/configure.ac +++ b/lalinspiral/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([LALInspiral],[3.0.0.1],[lal-discuss@ligo.org]) +AC_INIT([LALInspiral],[3.0.1],[lal-discuss@ligo.org]) AC_CONFIG_HEADERS([lib/config.h lib/LALInspiralConfig.h]) AC_CONFIG_SRCDIR([lib/LALInspiral.h]) AC_CONFIG_AUX_DIR([gnuscripts]) -- GitLab From 553eab1c2f0f0867697990cc6e61b8f306bb2963 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 16:06:36 -0700 Subject: [PATCH 18/64] lalinspiral: bump library api version for 3.0.1 --- lalinspiral/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalinspiral/configure.ac b/lalinspiral/configure.ac index 5eefdf25e5..ef222dacd2 100644 --- a/lalinspiral/configure.ac +++ b/lalinspiral/configure.ac @@ -20,7 +20,7 @@ AC_CONFIG_MACRO_DIR([gnuscripts]) # 6. if any interfaces have been removed since the last public release, # then set age to 0. AC_SUBST([LIBCURRENT],[17]) -AC_SUBST([LIBREVISION],[0]) +AC_SUBST([LIBREVISION],[1]) AC_SUBST([LIBAGE],[0]) AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}]) AS_CASE([${host_os}], -- GitLab From 4824607ee1fefc576d31028a2a2be0ba2d4302bf Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 22 Aug 2022 09:03:19 -0700 Subject: [PATCH 19/64] lalinspiral: bump dependency versions --- lalinspiral/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalinspiral/configure.ac b/lalinspiral/configure.ac index ef222dacd2..ac3b4e6283 100644 --- a/lalinspiral/configure.ac +++ b/lalinspiral/configure.ac @@ -69,7 +69,7 @@ AM_INIT_AUTOMAKE([ \ ]) # version requirements -MIN_LAL_VERSION="7.2.0" +MIN_LAL_VERSION="7.2.1" MIN_LALFRAME_VERSION="2.0.0" MIN_LALMETAIO_VERSION="3.0.0" MIN_LALSIMULATION_VERSION="4.0.0" -- GitLab From 9f3ef43f59985b4f4e8b386a238d0feb09cef7b1 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 16:12:51 -0700 Subject: [PATCH 20/64] lalinspiral: update packaging for 3.0.1 --- lalinspiral/debian/changelog | 6 ++++++ lalinspiral/lalinspiral.spec.in | 3 +++ 2 files changed, 9 insertions(+) diff --git a/lalinspiral/debian/changelog b/lalinspiral/debian/changelog index bd8e9ffaaa..d3aa69bc17 100644 --- a/lalinspiral/debian/changelog +++ b/lalinspiral/debian/changelog @@ -1,3 +1,9 @@ +lalinspiral (3.0.1-1) unstable; urgency=low + + * Update for 3.0.1 + + -- Adam Mercer Thu, 18 Aug 2022 16:12:38 -0700 + lalinspiral (3.0.0-1) unstable; urgency=low * Update for 3.0.0 diff --git a/lalinspiral/lalinspiral.spec.in b/lalinspiral/lalinspiral.spec.in index 61f80c9c7a..fd097260fe 100644 --- a/lalinspiral/lalinspiral.spec.in +++ b/lalinspiral/lalinspiral.spec.in @@ -204,6 +204,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}} # dates should be formatted using: 'date +"%a %b %d %Y"' %changelog +* Thu Aug 18 2022 Adam Mercer 3.0.1-1 +- Update for 3.0.1 + * Tue Aug 02 2022 Adam Mercer 3.0.0-1 - Update for 3.0.0 -- GitLab From 8376cc7c4a55203c210462bb1ccf806563c2034d Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 16:14:16 -0700 Subject: [PATCH 21/64] lalinference: mark as version 4.1.0 --- lalinference/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalinference/configure.ac b/lalinference/configure.ac index fa2168507f..cdc3034ea0 100644 --- a/lalinference/configure.ac +++ b/lalinference/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([LALInference],[4.0.0.1],[lal-discuss@ligo.org]) +AC_INIT([LALInference],[4.1.0],[lal-discuss@ligo.org]) AC_CONFIG_HEADERS([lib/config.h lib/LALInferenceConfig.h]) AC_CONFIG_SRCDIR([lib/LALInference.h]) AC_CONFIG_AUX_DIR([gnuscripts]) -- GitLab From ab7a204de517ed92cbb1d95997806f876bd25ff5 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 16:14:40 -0700 Subject: [PATCH 22/64] lalinference: bump library api version for 4.1.0 --- lalinference/configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lalinference/configure.ac b/lalinference/configure.ac index cdc3034ea0..8291ffac06 100644 --- a/lalinference/configure.ac +++ b/lalinference/configure.ac @@ -19,9 +19,9 @@ AC_CONFIG_MACRO_DIR([gnuscripts]) # then increment age. # 6. if any interfaces have been removed since the last public release, # then set age to 0. -AC_SUBST([LIBCURRENT],[23]) +AC_SUBST([LIBCURRENT],[24]) AC_SUBST([LIBREVISION],[0]) -AC_SUBST([LIBAGE],[0]) +AC_SUBST([LIBAGE],[1]) AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}]) AS_CASE([${host_os}], [freebsd-aout|qnx|sco|sunos], [AC_SUBST([LIBMAJOR],[${LIBCURRENT}])], -- GitLab From fb327a3b03dbea045dc7438d27af40d49bded4b3 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 22 Aug 2022 09:03:19 -0700 Subject: [PATCH 23/64] lalinference: bump dependency versions --- lalinference/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalinference/configure.ac b/lalinference/configure.ac index 8291ffac06..08afcb9ab7 100644 --- a/lalinference/configure.ac +++ b/lalinference/configure.ac @@ -76,7 +76,7 @@ AM_INIT_AUTOMAKE([ \ # version requirements MIN_GLUE_VERSION="1.54.1" -MIN_LAL_VERSION="7.2.0" +MIN_LAL_VERSION="7.2.1" MIN_LALMETAIO_VERSION="3.0.0" MIN_LALFRAME_VERSION="2.0.0" MIN_LALSIMULATION_VERSION="4.0.0" -- GitLab From 550cbd1e745bec924ef021c09d20c4648f254c9b Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 16:17:30 -0700 Subject: [PATCH 24/64] lalinference: update packaging for 4.1.0 --- lalinference/debian/changelog | 6 ++++++ lalinference/lalinference.spec.in | 3 +++ 2 files changed, 9 insertions(+) diff --git a/lalinference/debian/changelog b/lalinference/debian/changelog index 1ada67b678..a3bac7f6d7 100644 --- a/lalinference/debian/changelog +++ b/lalinference/debian/changelog @@ -1,3 +1,9 @@ +lalinference (4.1.0-1) unstable; urgency=low + + * Update for 4.1.0 + + -- Adam Mercer Thu, 18 Aug 2022 16:17:18 -0700 + lalinference (4.0.0-1) unstable; urgency=low * Update for 4.0.0 diff --git a/lalinference/lalinference.spec.in b/lalinference/lalinference.spec.in index 08933e807b..7b6b87eeec 100644 --- a/lalinference/lalinference.spec.in +++ b/lalinference/lalinference.spec.in @@ -241,6 +241,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}} # dates should be formatted using: 'date +"%a %b %d %Y"' %changelog +* Thu Aug 18 2022 Adam Mercer 4.1.0-1 +- Update for 4.1.0 + * Tue Aug 02 2022 Adam Mercer 4.0.0-1 - Update for 4.0.0 -- GitLab From 53e48c131b22b305f6b6e1f31b206b9c775269b8 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 16:18:26 -0700 Subject: [PATCH 25/64] lalpulsar: mark as version 5.0.1 --- lalpulsar/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalpulsar/configure.ac b/lalpulsar/configure.ac index 4b87e6f2f1..8402b06bb5 100644 --- a/lalpulsar/configure.ac +++ b/lalpulsar/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([LALPulsar],[5.0.0.1],[lal-discuss@ligo.org]) +AC_INIT([LALPulsar],[5.0.1],[lal-discuss@ligo.org]) AC_CONFIG_HEADERS([lib/config.h lib/LALPulsarConfig.h]) AC_CONFIG_SRCDIR([lib/ComputeFstat.c]) AC_CONFIG_AUX_DIR([gnuscripts]) -- GitLab From cc23a454cef0ff26207a778534baf8c354658d1e Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 16:18:46 -0700 Subject: [PATCH 26/64] lalpulsar: bump library api version for 5.0.1 --- lalpulsar/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalpulsar/configure.ac b/lalpulsar/configure.ac index 8402b06bb5..eeaa3ad1f4 100644 --- a/lalpulsar/configure.ac +++ b/lalpulsar/configure.ac @@ -20,7 +20,7 @@ AC_CONFIG_MACRO_DIR([gnuscripts]) # 6. if any interfaces have been removed since the last public release, # then set age to 0. AC_SUBST([LIBCURRENT],[26]) -AC_SUBST([LIBREVISION],[0]) +AC_SUBST([LIBREVISION],[1]) AC_SUBST([LIBAGE],[0]) AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}]) AS_CASE([${host_os}], -- GitLab From 37d69afa7d5b5d636c1c8f43ce72e7a72a13e085 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 16:24:05 -0700 Subject: [PATCH 27/64] lalpulsar: bump dependency versions --- lalpulsar/configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lalpulsar/configure.ac b/lalpulsar/configure.ac index eeaa3ad1f4..b94cc6c702 100644 --- a/lalpulsar/configure.ac +++ b/lalpulsar/configure.ac @@ -86,10 +86,10 @@ AM_INIT_AUTOMAKE([ \ ]) # version requirements -MIN_LAL_VERSION="7.2.0" +MIN_LAL_VERSION="7.2.1" MIN_LALFRAME_VERSION="2.0.0" MIN_LALSIMULATION_VERSION="3.1.0" -MIN_LALINFERENCE_VERSION="4.0.0" +MIN_LALINFERENCE_VERSION="4.1.0" AC_SUBST([MIN_LAL_VERSION]) AC_SUBST([MIN_LALFRAME_VERSION]) AC_SUBST([MIN_LALSIMULATION_VERSION]) -- GitLab From cb5ec53e022fc06a21108e6de8c81e4508f6e251 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 16:29:07 -0700 Subject: [PATCH 28/64] lalpulsar: update packaging for 5.0.1 --- lalpulsar/debian/changelog | 6 ++++++ lalpulsar/lalpulsar.spec.in | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lalpulsar/debian/changelog b/lalpulsar/debian/changelog index 4715ebdc1b..4aaf022270 100644 --- a/lalpulsar/debian/changelog +++ b/lalpulsar/debian/changelog @@ -1,3 +1,9 @@ +lalpulsar (5.0.1-1) unstable; urgency=low + + * Update for 5.0.1 + + -- Adam Mercer Thu, 18 Aug 2022 16:28:52 -0700 + lalpulsar (5.0.0-1) unstable; urgency=low * Update for 5.0.0 diff --git a/lalpulsar/lalpulsar.spec.in b/lalpulsar/lalpulsar.spec.in index a85238d70c..428ad98b40 100644 --- a/lalpulsar/lalpulsar.spec.in +++ b/lalpulsar/lalpulsar.spec.in @@ -214,8 +214,11 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}} # dates should be formatted using: 'date +"%a %b %d %Y"' %changelog -* Tue Aug 02 2022 Adam Mercer 4.0.1-1 -- Update for 4.0.1 +* Thu Aug 18 2022 Adam Mercer 5.0.1-1 +- Update for 5.0.1 + +* Tue Aug 02 2022 Adam Mercer 5.0.0-1 +- Update for 5.0.0 * Thu Mar 03 2022 Adam Mercer 4.0.0-1 - Update for 4.0.0 -- GitLab From 35d2c39289bc2c80f02f0f584951ff3a97a32f0c Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 16:34:17 -0700 Subject: [PATCH 29/64] lalapps: mark as version 9.0.1 --- lalapps/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalapps/configure.ac b/lalapps/configure.ac index 62e67ab89f..2b9bcb2b14 100644 --- a/lalapps/configure.ac +++ b/lalapps/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([LALApps],[9.0.0.1],[lal-discuss@ligo.org]) +AC_INIT([LALApps],[9.0.1],[lal-discuss@ligo.org]) AC_CONFIG_HEADERS([src/config.h]) AC_CONFIG_SRCDIR([src/lalapps/version2.c.in]) AC_CONFIG_AUX_DIR([gnuscripts]) -- GitLab From 5572c2327d3483809caf86becb60091f0f1cf713 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 16:34:40 -0700 Subject: [PATCH 30/64] lalapps: bump dependency versions --- lalapps/configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lalapps/configure.ac b/lalapps/configure.ac index 2b9bcb2b14..d7c6e97dd8 100644 --- a/lalapps/configure.ac +++ b/lalapps/configure.ac @@ -43,13 +43,13 @@ AM_INIT_AUTOMAKE([ \ # version requirements MIN_FRAMEL_VERSION="8.39.2" -MIN_LAL_VERSION="7.2.0" +MIN_LAL_VERSION="7.2.1" MIN_LALFRAME_VERSION="2.0.0" MIN_LALMETAIO_VERSION="3.0.0" MIN_LALSIMULATION_VERSION="4.0.0" MIN_LALBURST_VERSION="1.6.0" MIN_LALINSPIRAL_VERSION="3.0.0" -MIN_LALINFERENCE_VERSION="4.0.0" +MIN_LALINFERENCE_VERSION="4.1.0" MIN_LALPULSAR_VERSION="5.0.0" MIN_PYTHON_LIGO_LW_VERSION="1.7.0" AC_SUBST([MIN_FRAMEL_VERSION]) -- GitLab From 64b3b956bc1b7626dfefa7502407fd3fb7b284ec Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Thu, 18 Aug 2022 16:39:40 -0700 Subject: [PATCH 31/64] lalapps: update packaging for 9.0.1 --- lalapps/debian/changelog | 6 ++++++ lalapps/lalapps.spec.in | 3 +++ 2 files changed, 9 insertions(+) diff --git a/lalapps/debian/changelog b/lalapps/debian/changelog index fadeb1fb94..0eacd57137 100644 --- a/lalapps/debian/changelog +++ b/lalapps/debian/changelog @@ -1,3 +1,9 @@ +lalapps (9.0.1-1) unstable; urgency=low + + * Update for 9.0.1 + + -- Adam Mercer Thu, 18 Aug 2022 16:39:31 -0700 + lalapps (9.0.0-1) unstable; urgency=low * Update for 9.0.0 diff --git a/lalapps/lalapps.spec.in b/lalapps/lalapps.spec.in index d6536b071c..13075980e7 100644 --- a/lalapps/lalapps.spec.in +++ b/lalapps/lalapps.spec.in @@ -148,6 +148,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}} # dates should be formatted using: 'date +"%a %b %d %Y"' %changelog +* Thu Aug 18 2022 Adam Mercer 9.0.1-1 +- Update for 9.0.1 + * Tue Aug 02 2022 Adam Mercer 9.0.0-1 - Update fro 9.0.0 -- GitLab From 808b175b9c820a02bb955b38d2c3e0d578408ee4 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Tue, 23 Aug 2022 09:09:22 -0700 Subject: [PATCH 32/64] top-level: mark as vesion 7.7 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5044ae478e..f8c89a4221 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([LALSuite],[7.6.1],[lal-discuss@ligo.org]) +AC_INIT([LALSuite],[7.7],[lal-discuss@ligo.org]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_AUX_DIR([gnuscripts]) AC_CONFIG_MACRO_DIR([gnuscripts]) -- GitLab From 4b2dde0a1b636bb4000a069e9d1868c7c627bfd7 Mon Sep 17 00:00:00 2001 From: John Douglas Veitch Date: Sun, 4 Sep 2022 19:35:11 +0000 Subject: [PATCH 33/64] Merge branch 'remove-ndebug' into 'master' Remove last usages of NDEBUG and assert() Closes #596 See merge request lscsoft/lalsuite!1976 (cherry picked from commit 1d4648a91b9a420f754313503b077b1bd39180c6) --- .gitlab-ci.yml | 6 +-- gnuscripts/lalsuite_build.m4 | 21 +++++++- gnuscripts/lalsuite_swig.m4 | 8 ++-- lal/conda/build.sh | 3 -- lal/conda/install-python.sh | 3 -- lal/configure.ac | 1 + .../factories/CreateArraySequence_source.c | 2 - lal/lib/std/LALStatusMacros.dox | 48 +++++++++++-------- lal/lib/std/LALStatusMacros.h | 4 +- lal/lib/std/LALStddef.h | 11 ++++- lal/lib/std/XLALError.h | 39 ++++++++++++++- lal/lib/utilities/FindRoot.c | 16 ++----- .../vectorops/VectorMath_sse_mathfun_test.c | 1 - lalapps/conda/build.sh | 3 -- lalapps/configure.ac | 1 + lalapps/src/inspiral/blindinj.c | 1 - lalapps/src/inspiral/crinj.c | 1 - lalapps/src/inspiral/inspxmlinj.c | 1 - lalapps/src/inspiral/spininj.c | 1 - lalburst/conda/build.sh | 3 -- lalburst/conda/install-python.sh | 3 -- lalburst/configure.ac | 3 ++ lalframe/conda/build.sh | 3 -- lalframe/conda/install-python.sh | 3 -- lalframe/configure.ac | 3 ++ lalinference/conda/build.sh | 3 -- lalinference/conda/install-bin.sh | 3 -- lalinference/conda/install-python.sh | 3 -- lalinference/configure.ac | 3 ++ lalinference/lib/LALInferenceHDF5.c | 15 +++--- lalinference/lib/LALInferenceInitCBC.c | 3 +- lalinference/lib/LALInferenceLikelihood.c | 7 ++- lalinference/lib/LALInferenceReadData.c | 1 - lalinference/lib/distance_integrator.c | 14 +++--- lalinference/test/LALInferencePriorTest.c | 1 - lalinference/test/test_cubic_interp.c | 44 ++++++++--------- lalinspiral/conda/build.sh | 3 -- lalinspiral/conda/install-python.sh | 3 -- lalinspiral/configure.ac | 3 ++ lalmetaio/conda/build.sh | 3 -- lalmetaio/conda/install-python.sh | 3 -- lalmetaio/configure.ac | 3 ++ lalpulsar/conda/build.sh | 3 -- lalpulsar/conda/install-python.sh | 3 -- lalpulsar/configure.ac | 3 ++ lalsimulation/conda/build.sh | 3 -- lalsimulation/conda/install-python.sh | 3 -- lalsimulation/configure.ac | 3 ++ lalsimulation/lib/LALSimFindAttachTime.c | 9 ++-- lalsimulation/lib/LALSimIMRPrecessingNRSur.c | 7 ++- .../lib/LALSimIMRSEOBNRv4TSurrogate.c | 3 +- lalsimulation/lib/LALSimNRHybSurUtilities.c | 11 ++--- lalsimulation/lib/LALSimNRSur3dq8Remnant.c | 1 - lalsimulation/lib/LALSimNRSur7dq4Remnant.c | 1 - lalsimulation/lib/LALSimNRSurRemnantUtils.c | 3 +- lalsimulation/test/BHNSRemnantFitsTest.c | 9 ++-- lalsimulation/test/NSBHPropertiesTest.c | 11 ++--- lalsimulation/test/PhenomNSBHTest.c | 25 +++++----- lalsimulation/test/PhenomPTest.c | 15 +++--- .../test/SEOBNRv4_ROM_NRTidalv2_NSBH_Test.c | 3 +- lalsimulation/test/SphHarmTSTest.c | 4 +- 61 files changed, 212 insertions(+), 212 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4c6267308..3da47c45e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -169,7 +169,8 @@ default: - ./00boot # we use xargs here in case CONFIGURE_FLAGS contains # variables with spaces, etc etc - - xargs ./configure ${ENABLE_NIGHTLY} <<< ${CONFIGURE_FLAGS} + - DEFAULT_CONFIGURE_FLAGS="--enable-strict-defs ${ENABLE_NIGHTLY}" + - xargs ./configure ${DEFAULT_CONFIGURE_FLAGS} <<< ${CONFIGURE_FLAGS} - make -j${CPU_COUNT} VERBOSE=1 ${MAKE_TARGET:-distcheck} artifacts: # upload some files to debug failures @@ -1698,9 +1699,6 @@ platform:debian:bullseye: "liblal*" "lal*" "python-lal*" - # don't use NDEBUG - - export CPPFLAGS="${CPPFLAGS} -UNDEBUG" - - export CONFIGURE_FLAGS="${CONFIGURE_FLAGS} CPPFLAGS='${CPPFLAGS}'" platform:conda:linux: image: igwn/base:conda diff --git a/gnuscripts/lalsuite_build.m4 b/gnuscripts/lalsuite_build.m4 index ae17aaa27d..be00f2b681 100644 --- a/gnuscripts/lalsuite_build.m4 +++ b/gnuscripts/lalsuite_build.m4 @@ -1,7 +1,7 @@ # -*- mode: autoconf; -*- # lalsuite_build.m4 - top level build macros # -# serial 168 +# serial 169 # restrict which LALSUITE_... patterns can appearing in output (./configure); # useful for debugging problems with unexpanded LALSUITE_... Autoconf macros @@ -360,6 +360,25 @@ AC_DEFUN([LALSUITE_ADD_TESTS_ENV_CONFIG_VAR],[ ]) ]) +AC_DEFUN([LALSUITE_ENABLE_STRICT_DEFS],[ + # $0: forbid certain definitions in LAL code + AC_ARG_ENABLE( + [strict-defs], + AS_HELP_STRING( + [--enable-strict-defs], + [forbid certain definitions in LAL code [default=no]] + ),[ + AS_CASE(["${enableval}"], + [yes],[LALSUITE_ADD_FLAGS([C],[-DLAL_STRICT_DEFS_ENABLED])], + [no],[:], + [AC_MSG_ERROR([bad value for ${enableval} for --enable-strict-defs])] + ) + ],[ + ] + ) + # end $0 +]) + AC_DEFUN([LALSUITE_REQUIRE_CXX],[ # $0: require a C++ compiler lalsuite_require_cxx=true diff --git a/gnuscripts/lalsuite_swig.m4 b/gnuscripts/lalsuite_swig.m4 index 08d6533884..83d91deeb9 100644 --- a/gnuscripts/lalsuite_swig.m4 +++ b/gnuscripts/lalsuite_swig.m4 @@ -2,7 +2,7 @@ # lalsuite_swig.m4 - SWIG configuration # Author: Karl Wette, 2011--2017 # -# serial 113 +# serial 115 AC_DEFUN([_LALSUITE_MIN_SWIG_VERSION],[ # $0: minimum version of SWIG and other dependencies @@ -464,7 +464,7 @@ EOF AC_MSG_NOTICE([Octave modules will be compiled with ${abiflag:-no _GLIBCXX_USE_CXX11_ABI flag}]) # determine Octave preprocessor flags - AC_SUBST([SWIG_OCTAVE_CPPFLAGS],["${abiflag}"]) + AC_SUBST([SWIG_OCTAVE_CPPFLAGS],["-ULAL_STRICT_DEFS_ENABLED ${abiflag}"]) AC_SUBST([SWIG_OCTAVE_CPPFLAGS_IOCTAVE],[]) for arg in CPPFLAGS INCFLAGS; do for flag in `${mkoctfile} -p ${arg} 2>/dev/null`; do @@ -584,7 +584,7 @@ EOD`] ]) # determine Python preprocessor flags - AC_SUBST([SWIG_PYTHON_CPPFLAGS],[]) + AC_SUBST([SWIG_PYTHON_CPPFLAGS],["-ULAL_STRICT_DEFS_ENABLED"]) python_out=[`cat </dev/null import sys import distutils.sysconfig as cfg @@ -606,7 +606,7 @@ EOD`] import sys import distutils.sysconfig as cfg cflags = cfg.get_config_var('CFLAGS').split() -cflags = [f for f in cflags if f != '-DNDEBUG'] +cflags = [f for f in cflags] sys.stdout.write(" ".join(cflags)) EOD`] AS_IF([test $? -ne 0],[ diff --git a/lal/conda/build.sh b/lal/conda/build.sh index 738017c6f3..6db88f8a9b 100644 --- a/lal/conda/build.sh +++ b/lal/conda/build.sh @@ -8,9 +8,6 @@ cd _build # customisation for LALSuite development CI if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then - # allow debugging information - export CPPFLAGS="${CPPFLAGS} -UNDEBUG" - # declare nightly builds if [ "${CI_PIPELINE_SOURCE}" = "schedule" ] || [ "${CI_PIPELINE_SOURCE}" = "web" ]; then CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-nightly" diff --git a/lal/conda/install-python.sh b/lal/conda/install-python.sh index dd205e884c..6f44c1e6b1 100644 --- a/lal/conda/install-python.sh +++ b/lal/conda/install-python.sh @@ -13,9 +13,6 @@ cd ${_builddir} # customisation for LALSuite development CI if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then - # allow debugging information - export CPPFLAGS="${CPPFLAGS} -UNDEBUG" - # declare nightly builds if [ "${CI_PIPELINE_SOURCE}" = "schedule" ] || [ "${CI_PIPELINE_SOURCE}" = "web" ]; then CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-nightly" diff --git a/lal/configure.ac b/lal/configure.ac index 1c0456fe77..5ff013a1c1 100644 --- a/lal/configure.ac +++ b/lal/configure.ac @@ -133,6 +133,7 @@ LAL_ENABLE_INTELFFT LAL_ENABLE_FFTW3_MEMALIGN LALSUITE_ENABLE_GCC_FLAGS +LALSUITE_ENABLE_STRICT_DEFS LAL_WITH_DEFAULT_DEBUG_LEVEL LAL_WITH_DATA_PATH diff --git a/lal/lib/factories/CreateArraySequence_source.c b/lal/lib/factories/CreateArraySequence_source.c index 3ef0a15fee..2f487e11f3 100644 --- a/lal/lib/factories/CreateArraySequence_source.c +++ b/lal/lib/factories/CreateArraySequence_source.c @@ -41,13 +41,11 @@ void FUNC ( LALStatus *status, STYPE **aseq, CreateArraySequenceIn *in ) * Use of unsigned for length means we can't check if negative * length was passed */ -#ifndef NDEBUG for ( i = 0; i < in->dimLength->length; i++ ) { ASSERT (in->dimLength->data[i] > 0, status, SEQFACTORIESH_EALENGTH, SEQFACTORIESH_MSGEALENGTH); } -#endif /* * Check return structure: If return pointer does not point to a diff --git a/lal/lib/std/LALStatusMacros.dox b/lal/lib/std/LALStatusMacros.dox index 8fe5263970..9b10f3959b 100644 --- a/lal/lib/std/LALStatusMacros.dox +++ b/lal/lib/std/LALStatusMacros.dox @@ -493,19 +493,25 @@ code at compile time. Although these flags are typically \#defined or \#undefined globally and can affect many modules, their primary effect is on the debugging and status-reporting tools defined in this header. The two flags are named -\c NDEBUG and \c LAL_STATUS_MACROS_DISABLED. +\c LAL_ASSERT_MACRO_DISABLED and \c LAL_STATUS_MACROS_DISABLED. -\subsection ss_ndebug_flag The NDEBUG flag +\subsection ss_ndebug_flag The LAL_ASSERT_MACRO_DISABLED flag -Compiling with the \c NDEBUG flag set removes all ASSERT() macros from -the object code, in keeping with the philosophy that ASSERT() -statements should only be used to catch coding bugs, not runtime errors. +Compiling with the \c LAL_ASSERT_MACRO_DISABLED flag set removes all +ASSERT() macros from the object code, in keeping with the philosophy +that ASSERT() statements should only be used to catch coding bugs, not +runtime errors. -This is the only purpose for which the \c NDEBUG flag should be used. Code that -checks function input arguments for correctness, reports error messages, -etc. should not be disabled even in production code. The performance impact of -such checks is likely minimal, particularly compared to the human cost of -diagnosing obscure failures in production code because checks/error messages +Compiling with \c LAL_ASSERT_MACRO_DISABLED set is not +recommended. Notwithstanding the philosophy behind ASSERT(), it is +quite likely in places that this macro has been (mis)used for critical checks +without which code will not operate as expected. Correct function with \c +LAL_ASSERT_MACRO_DISABLED set is therefore not guaranteed. + +Code that checks function input arguments for correctness, reports error +messages, etc. should not be disabled even in production code. The performance +impact of such checks is likely minimal, particularly compared to the human cost +of diagnosing obscure failures in production code because checks/error messages were disabled. (Error messages and other diagnostics should use the error-printing functions in \ref LALError_h to selective print messages according to \c lalDebugLevel.) @@ -534,7 +540,7 @@ libraries. When compiling your own modules, the flags can be set using one or more \#define statements within the module or its header file: \code -#define NDEBUG +#define LAL_ASSERT_MACRO_DISABLED #define LAL_STATUS_MACROS_DISABLED \endcode To restrict the scope of these flags, they should later be unset using @@ -544,22 +550,22 @@ Alternatively, these can be set in the \c Makefile or when compiling. The syntax for most UNIX C compilers is something like the following: \code -> gcc ... -DNDEBUG -DLAL_STATUS_MACROS_DISABLED ... +> gcc ... -DLAL_ASSERT_MACRO_DISABLED -DLAL_STATUS_MACROS_DISABLED ... \endcode -If you want to compile a large number of modules, or the entire -library, under the effects of one or more of these flags, you will not -want to go through and modify every header or \c Makefile. -Instead, you may add either -DNDEBUG or -DLAL_STATUS_MACROS_DISABLED -(or both) to the environment variable \c CPPFLAGS. They will then -automatically be set for all compilations done in that environment. -The command for doing this in \c sh or \c bash shells is: +If you want to compile a large number of modules, or the entire library, under +the effects of one or more of these flags, you will not want to go through and +modify every header or \c Makefile. Instead, you may add either +-DLAL_ASSERT_MACRO_DISABLED or -DLAL_STATUS_MACROS_DISABLED +(or both) to the environment variable \c CPPFLAGS. They will then automatically +be set for all compilations done in that environment. The command for doing +this in \c sh or \c bash shells is: \code -> CPPFLAGS="\f$CPPFLAGS -DNDEBUG -DLAL_STATUS_MACROS_DISABLED" +> CPPFLAGS="\f$CPPFLAGS -DLAL_ASSERT_MACRO_DISABLED -DLAL_STATUS_MACROS_DISABLED" \endcode while in \c csh or \c tcsh shells it is: \code -> setenv CPPFLAGS "\f$CPPFLAGS -DNDEBUG -DLAL_STATUS_MACROS_DISABLED" +> setenv CPPFLAGS "\f$CPPFLAGS -DLAL_ASSERT_MACRO_DISABLED -DLAL_STATUS_MACROS_DISABLED" \endcode Note that if you plan to do further LAL code development on the same system, you may want to keep two versions of the library around: one diff --git a/lal/lib/std/LALStatusMacros.h b/lal/lib/std/LALStatusMacros.h index cae109a9bf..117f31b5a4 100644 --- a/lal/lib/std/LALStatusMacros.h +++ b/lal/lib/std/LALStatusMacros.h @@ -113,7 +113,7 @@ extern "C" { return; \ } while ( 0 ) -#ifdef NDEBUG +#ifdef LAL_ASSERT_MACRO_DISABLED #define ASSERT( assertion, statusptr, code, mesg ) #else #define ASSERT( assertion, statusptr, code, mesg ) \ @@ -192,7 +192,7 @@ extern "C" { #define ABORT( statusptr, code, mesg ) \ do { if ( LALPrepareAbort( statusptr, code, mesg, __FILE__, __LINE__ ), 1 ) return; } while ( 0 ) -#ifdef NDEBUG +#ifdef LAL_ASSERT_MACRO_DISABLED #define ASSERT( assertion, statusptr, code, mesg ) #else #define ASSERT( assertion, statusptr, code, mesg ) \ diff --git a/lal/lib/std/LALStddef.h b/lal/lib/std/LALStddef.h index fe7483ce1f..5fd27ae578 100644 --- a/lal/lib/std/LALStddef.h +++ b/lal/lib/std/LALStddef.h @@ -1,5 +1,5 @@ /* -* Copyright (C) 2014 Karl Wette +* Copyright (C) 2014, 2020 Karl Wette * Copyright (C) 2013 Jolien Creighton * * This program is free software; you can redistribute it and/or modify @@ -21,6 +21,15 @@ #ifndef _LALSTDDEF_H #define _LALSTDDEF_H +/* forbid certain definitions in LAL code */ +#if defined(LAL_STRICT_DEFS_ENABLED) +# if defined(__GNUC__) +/* assert() is often misused for error-checking code + which should never be disabled in production usage */ +# pragma GCC poison assert +# endif +#endif + /* macros for certain keywords */ #if __STDC_VERSION__ >= 199901L # define _LAL_RESTRICT_ restrict diff --git a/lal/lib/std/XLALError.h b/lal/lib/std/XLALError.h index 522eceae38..5b0c0f03cf 100644 --- a/lal/lib/std/XLALError.h +++ b/lal/lib/std/XLALError.h @@ -74,8 +74,7 @@ extern "C" { * * Assert-like error checking can be performed with #XLAL_CHECK-style * macros. Unlike assert() statements, #XLAL_CHECK macros - * do not get removed when the code is not compiled with - * NDEBUG defined. + * do not get removed when the code is compiled with -DNDEBUG. * * Additional error, warning, and informational messages can be generated using * the routines XLALPrintError(), XLALPrintWarning() and @@ -900,6 +899,42 @@ void XLALError(const char *func, */ #define XLAL_CHECK_FAIL(assertion, ...) _XLAL_CHECK_IMPL_(goto XLAL_FAIL, assertion, __VA_ARGS__) +/** + * \brief Macro to test an assertion and invoke a failure if it is not true + * by calling lalAbortHook(). + * + * Prototype: XLAL_CHECK_ABORT(assertion) + * + * \b Parameters:
    + *
  • \b assertion The assertion to test. + *
+ */ +#define XLAL_CHECK_ABORT(assertion) \ + do { \ + if (!(assertion)) { \ + XLAL_PRINT_ERROR("Check failed: %s", #assertion); \ + lalAbortHook("XLAL_CHECK_ABORT() failed"); \ + } \ + } while (0) + +/** + * \brief Macro to test an assertion and invoke a failure if it is not true + * by calling exit(1). + * + * Prototype: XLAL_CHECK_EXIT(assertion) + * + * \b Parameters:
    + *
  • \b assertion The assertion to test. + *
+ */ +#define XLAL_CHECK_EXIT(assertion) \ + do { \ + if (!(assertion)) { \ + XLAL_PRINT_ERROR("Check failed: %s", #assertion); \ + exit(1); \ + } \ + } while (0) + #endif /* SWIG */ diff --git a/lal/lib/utilities/FindRoot.c b/lal/lib/utilities/FindRoot.c index 4eaea85b04..f70ca06029 100644 --- a/lal/lib/utilities/FindRoot.c +++ b/lal/lib/utilities/FindRoot.c @@ -66,10 +66,8 @@ LALSBracketRoot ( } /* increment iteration count */ -#ifndef NDEBUG - INT4 imax = 64; + const INT4 imax = 64; ASSERT (i < imax, status, FINDROOTH_EMXIT, FINDROOTH_MSGEMXIT); -#endif ++i; if (fabs(y_1) < fabs(y_2)) @@ -186,10 +184,8 @@ LALDBracketRoot ( } /* increment iteration count */ -#ifndef NDEBUG - INT4 imax = 64; + const INT4 imax = 64; ASSERT (i < imax, status, FINDROOTH_EMXIT, FINDROOTH_MSGEMXIT); -#endif ++i; if (fabs(y_1) < fabs(y_2)) @@ -269,10 +265,8 @@ LALSBisectionFindRoot ( REAL4 ymid; /* increment iteration count */ -#ifndef NDEBUG - INT4 imax = 40; + const INT4 imax = 40; ASSERT (i < imax, status, FINDROOTH_EMXIT, FINDROOTH_MSGEMXIT); -#endif ++i; /* locate midpoint of domain */ @@ -437,10 +431,8 @@ LALDBisectionFindRoot ( REAL8 ymid; /* increment iteration count */ -#ifndef NDEBUG - INT4 imax = 80; + const INT4 imax = 80; ASSERT (i < imax, status, FINDROOTH_EMXIT, FINDROOTH_MSGEMXIT); -#endif ++i; /* locate midpoint of domain */ diff --git a/lal/lib/vectorops/VectorMath_sse_mathfun_test.c b/lal/lib/vectorops/VectorMath_sse_mathfun_test.c index 64a37b2113..9a94db1eea 100644 --- a/lal/lib/vectorops/VectorMath_sse_mathfun_test.c +++ b/lal/lib/vectorops/VectorMath_sse_mathfun_test.c @@ -137,7 +137,6 @@ void print4i(__m128i v) { #include #include #include -#include #ifdef HAVE_SYS_TIMES #include diff --git a/lalapps/conda/build.sh b/lalapps/conda/build.sh index 9905eab6e1..0c5023f40f 100644 --- a/lalapps/conda/build.sh +++ b/lalapps/conda/build.sh @@ -8,9 +8,6 @@ cd _build # customisation for LALSuite development CI if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then - # allow debugging information - export CPPFLAGS="${CPPFLAGS} -UNDEBUG" - # declare nightly builds if [ "${CI_PIPELINE_SOURCE}" = "schedule" ] || [ "${CI_PIPELINE_SOURCE}" = "web" ]; then CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-nightly" diff --git a/lalapps/configure.ac b/lalapps/configure.ac index d7c6e97dd8..7b892ac5e4 100644 --- a/lalapps/configure.ac +++ b/lalapps/configure.ac @@ -73,6 +73,7 @@ LALSUITE_CHECK_GIT_REPO LALSUITE_DISTCHECK_CONFIGURE_FLAGS LALSUITE_ENABLE_GCC_FLAGS +LALSUITE_ENABLE_STRICT_DEFS LALSUITE_ENABLE_NIGHTLY LALAPPS_ENABLE_CONDOR LALAPPS_ENABLE_STATIC_BINARIES diff --git a/lalapps/src/inspiral/blindinj.c b/lalapps/src/inspiral/blindinj.c index 5c576fd567..f049b42e3a 100644 --- a/lalapps/src/inspiral/blindinj.c +++ b/lalapps/src/inspiral/blindinj.c @@ -33,7 +33,6 @@ #include #include -#include #include #include #include diff --git a/lalapps/src/inspiral/crinj.c b/lalapps/src/inspiral/crinj.c index 670a7ebce4..c8a1464ba9 100644 --- a/lalapps/src/inspiral/crinj.c +++ b/lalapps/src/inspiral/crinj.c @@ -30,7 +30,6 @@ #include #include -#include #include #include #include diff --git a/lalapps/src/inspiral/inspxmlinj.c b/lalapps/src/inspiral/inspxmlinj.c index 47a87880ee..cb385baa56 100644 --- a/lalapps/src/inspiral/inspxmlinj.c +++ b/lalapps/src/inspiral/inspxmlinj.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include diff --git a/lalapps/src/inspiral/spininj.c b/lalapps/src/inspiral/spininj.c index d64d5a2ab8..0553ba1d5a 100644 --- a/lalapps/src/inspiral/spininj.c +++ b/lalapps/src/inspiral/spininj.c @@ -29,7 +29,6 @@ #include #include -#include #include #include #include diff --git a/lalburst/conda/build.sh b/lalburst/conda/build.sh index 2a6c45d253..f2aac0f5d3 100644 --- a/lalburst/conda/build.sh +++ b/lalburst/conda/build.sh @@ -8,9 +8,6 @@ cd _build # customisation for LALSuite development CI if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then - # allow debugging information - export CPPFLAGS="${CPPFLAGS} -UNDEBUG" - # declare nightly builds if [ "${CI_PIPELINE_SOURCE}" = "schedule" ] || [ "${CI_PIPELINE_SOURCE}" = "web" ]; then CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-nightly" diff --git a/lalburst/conda/install-python.sh b/lalburst/conda/install-python.sh index 07960c418e..9bf2c0c24c 100644 --- a/lalburst/conda/install-python.sh +++ b/lalburst/conda/install-python.sh @@ -13,9 +13,6 @@ cd ${_builddir} # customisation for LALSuite development CI if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then - # allow debugging information - export CPPFLAGS="${CPPFLAGS} -UNDEBUG" - # declare nightly builds if [ "${CI_PIPELINE_SOURCE}" = "schedule" ] || [ "${CI_PIPELINE_SOURCE}" = "web" ]; then CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-nightly" diff --git a/lalburst/configure.ac b/lalburst/configure.ac index 59f74cf253..dffd4ff08a 100644 --- a/lalburst/configure.ac +++ b/lalburst/configure.ac @@ -90,6 +90,9 @@ LALSUITE_ENABLE_NIGHTLY # enable strict gcc flags LALSUITE_ENABLE_GCC_FLAGS +# enable strict definitions +LALSUITE_ENABLE_STRICT_DEFS + # enable SWIG wrapping modules LALSUITE_ENABLE_SWIG diff --git a/lalframe/conda/build.sh b/lalframe/conda/build.sh index a19ea235c8..76965f28b1 100644 --- a/lalframe/conda/build.sh +++ b/lalframe/conda/build.sh @@ -8,9 +8,6 @@ cd _build # customisation for LALSuite development CI if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then - # allow debugging information - export CPPFLAGS="${CPPFLAGS} -UNDEBUG" - # declare nightly builds if [ "${CI_PIPELINE_SOURCE}" = "schedule" ] || [ "${CI_PIPELINE_SOURCE}" = "web" ]; then CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-nightly" diff --git a/lalframe/conda/install-python.sh b/lalframe/conda/install-python.sh index daf791b9dc..3361d3de73 100644 --- a/lalframe/conda/install-python.sh +++ b/lalframe/conda/install-python.sh @@ -13,9 +13,6 @@ cd ${_builddir} # customisation for LALSuite development CI if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then - # allow debugging information - export CPPFLAGS="${CPPFLAGS} -UNDEBUG" - # declare nightly builds if [ "${CI_PIPELINE_SOURCE}" = "schedule" ] || [ "${CI_PIPELINE_SOURCE}" = "web" ]; then CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-nightly" diff --git a/lalframe/configure.ac b/lalframe/configure.ac index 36edd82a42..f80efaeee6 100644 --- a/lalframe/configure.ac +++ b/lalframe/configure.ac @@ -95,6 +95,9 @@ LALFRAME_ENABLE_FRAMEL # enable strict gcc flags LALSUITE_ENABLE_GCC_FLAGS +# enable strict definitions +LALSUITE_ENABLE_STRICT_DEFS + # enable SWIG wrapping modules LALSUITE_ENABLE_SWIG diff --git a/lalinference/conda/build.sh b/lalinference/conda/build.sh index a3133a63b3..dc0d62a94c 100644 --- a/lalinference/conda/build.sh +++ b/lalinference/conda/build.sh @@ -8,9 +8,6 @@ cd _build # customisation for LALSuite development CI if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then - # allow debugging information - export CPPFLAGS="${CPPFLAGS} -UNDEBUG" - # declare nightly builds if [ "${CI_PIPELINE_SOURCE}" = "schedule" ] || [ "${CI_PIPELINE_SOURCE}" = "web" ]; then CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-nightly" diff --git a/lalinference/conda/install-bin.sh b/lalinference/conda/install-bin.sh index a5cc14256c..162f46e8fe 100644 --- a/lalinference/conda/install-bin.sh +++ b/lalinference/conda/install-bin.sh @@ -9,9 +9,6 @@ cd ${_builddir} # customisation for LALSuite development CI if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then - # allow debugging information - export CPPFLAGS="${CPPFLAGS} -UNDEBUG" - # declare nightly builds if [ "${CI_PIPELINE_SOURCE}" = "schedule" ] || [ "${CI_PIPELINE_SOURCE}" = "web" ]; then CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-nightly" diff --git a/lalinference/conda/install-python.sh b/lalinference/conda/install-python.sh index 07960c418e..9bf2c0c24c 100755 --- a/lalinference/conda/install-python.sh +++ b/lalinference/conda/install-python.sh @@ -13,9 +13,6 @@ cd ${_builddir} # customisation for LALSuite development CI if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then - # allow debugging information - export CPPFLAGS="${CPPFLAGS} -UNDEBUG" - # declare nightly builds if [ "${CI_PIPELINE_SOURCE}" = "schedule" ] || [ "${CI_PIPELINE_SOURCE}" = "web" ]; then CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-nightly" diff --git a/lalinference/configure.ac b/lalinference/configure.ac index 08afcb9ab7..59d83c03bb 100644 --- a/lalinference/configure.ac +++ b/lalinference/configure.ac @@ -108,6 +108,9 @@ LALSUITE_ENABLE_MPI # enable strict gcc flags LALSUITE_ENABLE_GCC_FLAGS +# enable strict definitions +LALSUITE_ENABLE_STRICT_DEFS + # optional lal libraries LALSUITE_ENABLE_LALFRAME LALSUITE_ENABLE_LALMETAIO diff --git a/lalinference/lib/LALInferenceHDF5.c b/lalinference/lib/LALInferenceHDF5.c index db69b83440..5411c94728 100644 --- a/lalinference/lib/LALInferenceHDF5.c +++ b/lalinference/lib/LALInferenceHDF5.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include @@ -116,9 +115,9 @@ int LALInferenceH5DatasetToVariablesArray( size_t nbytes = XLALH5DatasetQueryNBytes(dataset); char *data = XLALMalloc(nbytes); - assert(data); + XLAL_CHECK_ABORT(data); ret = XLALH5DatasetQueryData(data, dataset); - assert(ret == 0); + XLAL_CHECK_ABORT(ret == 0); LALInferenceVariables **va = NULL; UINT4 Nsamples = XLALH5DatasetQueryNPoints(dataset); @@ -133,7 +132,7 @@ int LALInferenceH5DatasetToVariablesArray( snprintf(pname, sizeof(pname), "FIELD_%d_VARY", i); INT4 value; ret = XLALH5AttributeQueryScalarValue(&value, gdataset, pname); - assert(ret == 0); + XLAL_CHECK_ABORT(ret == 0); vary[i] = value; } @@ -276,7 +275,7 @@ int LALInferenceH5VariablesArrayToDataset( /* Gather together data in one big array */ char *data = XLALCalloc(N, type_size); - assert(data); + XLAL_CHECK_ABORT(data); for (UINT4 i = 0; i < N; i++) { for (UINT4 j = 0; j < Nvary; j++) @@ -290,11 +289,11 @@ int LALInferenceH5VariablesArrayToDataset( /* Create table */ LALH5Dataset *dataset = XLALH5TableAlloc(h5file, TableName, Nvary, column_names, column_types, column_offsets, type_size); - assert(dataset); + XLAL_CHECK_ABORT(dataset); int ret = XLALH5TableAppend( dataset, column_offsets, column_sizes, N, type_size, data); (void) ret; - assert(ret == 0); + XLAL_CHECK_ABORT(ret == 0); XLALFree(data); LALH5Generic gdataset = {.dset = dataset}; @@ -305,7 +304,7 @@ int LALInferenceH5VariablesArrayToDataset( snprintf(pname, sizeof(pname), "FIELD_%d_VARY", i); ret = XLALH5AttributeAddScalar( gdataset, pname, &value, LAL_I4_TYPE_CODE); - assert(ret == 0); + XLAL_CHECK_ABORT(ret == 0); } /* Write attributes, if any */ diff --git a/lalinference/lib/LALInferenceInitCBC.c b/lalinference/lib/LALInferenceInitCBC.c index afd094bd08..4872c405ec 100644 --- a/lalinference/lib/LALInferenceInitCBC.c +++ b/lalinference/lib/LALInferenceInitCBC.c @@ -21,7 +21,6 @@ #include -#include #include #include #include @@ -654,7 +653,7 @@ void LALInferenceRegisterGaussianVariableREAL8(LALInferenceRunState *state, LALI } if((ppt=LALInferenceGetProcParamVal(state->commandLine,valopt))) startval=atof(ppt->value); - assert(stdev>0); + XLAL_CHECK_ABORT(stdev>0); LALInferenceAddVariable(var,name,&startval,LALINFERENCE_REAL8_t,varytype); LALInferenceAddGaussianPrior(state->priorArgs, name, &mean, &stdev, LALINFERENCE_REAL8_t); diff --git a/lalinference/lib/LALInferenceLikelihood.c b/lalinference/lib/LALInferenceLikelihood.c index 05037179f7..5d5e44f943 100644 --- a/lalinference/lib/LALInferenceLikelihood.c +++ b/lalinference/lib/LALInferenceLikelihood.c @@ -22,7 +22,6 @@ */ #include -#include #include #include #include @@ -83,9 +82,9 @@ static int get_calib_spline(LALInferenceVariables *vars, const char *ifoname, RE if(!*logfreqs) *logfreqs = XLALCreateREAL8Vector(npts); if(!*amps) *amps = XLALCreateREAL8Vector(npts); if(!*phases) *phases = XLALCreateREAL8Vector(npts); - assert((*logfreqs)->length==npts); - assert((*amps)->length==npts); - assert((*phases)->length==npts); + XLAL_CHECK_ABORT((*logfreqs)->length==npts); + XLAL_CHECK_ABORT((*amps)->length==npts); + XLAL_CHECK_ABORT((*phases)->length==npts); for(UINT4 i=0;i #include -#include struct fvec { REAL8 f; diff --git a/lalinference/lib/distance_integrator.c b/lalinference/lib/distance_integrator.c index c87e0d9854..efaabd38ea 100644 --- a/lalinference/lib/distance_integrator.c +++ b/lalinference/lib/distance_integrator.c @@ -20,8 +20,6 @@ #include "bayestar_cosmology.h" #include "omp_interruptible.h" -#include - #include #include @@ -72,13 +70,13 @@ void dVC_dVL_init(void) { const size_t len = sizeof(dVC_dVL_data) / sizeof(*dVC_dVL_data); dVC_dVL_interp = gsl_spline_alloc(gsl_interp_cspline, len); - assert(dVC_dVL_interp); + XLAL_CHECK_ABORT(dVC_dVL_interp); double x[len]; for (size_t i = 0; i < len; i ++) x[i] = dVC_dVL_tmin + i * dVC_dVL_dt; int ret = gsl_spline_init(dVC_dVL_interp, x, dVC_dVL_data, len); (void) ret; - assert(ret == GSL_SUCCESS); + XLAL_CHECK_ABORT(ret == GSL_SUCCESS); } static double radial_integrand(double r, void *params) @@ -286,12 +284,12 @@ log_radial_integrator *log_radial_integrator_init(double r1, double r2, int k, i double *z1=calloc(size,sizeof(*z1)); double *z2=calloc(size,sizeof(*z2)); double *z0=calloc(size*size,sizeof(*z0)); - assert(z0 && z1 && z2); + XLAL_CHECK_ABORT(z0 && z1 && z2); /* for (size_t i=0;ixmax); + XLAL_CHECK_ABORT(x <= integrator->xmax); if (p == 0) { /* note: p2 == 0 implies b == 0 */ - assert(b == 0); + XLAL_CHECK_ABORT(b == 0); int k1 = integrator->k + 1; if (k1 == 0) diff --git a/lalinference/test/LALInferencePriorTest.c b/lalinference/test/LALInferencePriorTest.c index c73fc84b34..e71fc05191 100644 --- a/lalinference/test/LALInferencePriorTest.c +++ b/lalinference/test/LALInferencePriorTest.c @@ -25,7 +25,6 @@ #include #include #include -#include #include "LALInferenceTest.h" #define EPSILON 1e-13 diff --git a/lalinference/test/test_cubic_interp.c b/lalinference/test/test_cubic_interp.c index 078f31033d..46550c84ab 100644 --- a/lalinference/test/test_cubic_interp.c +++ b/lalinference/test/test_cubic_interp.c @@ -21,8 +21,8 @@ #include #include #include -#include +#include #ifdef __GNUC__ #define UNUSED __attribute__ ((unused)) @@ -36,7 +36,7 @@ int main(int UNUSED argc, char UNUSED **argv) { static const double data[] = {0, 0, 0, 0}; cubic_interp *interp = cubic_interp_init(data, 4, -1, 1); - assert(interp); + XLAL_CHECK_EXIT(interp); for (double t = 0; t <= 1; t += 0.01) { const double result = cubic_interp_eval(interp, t); @@ -50,7 +50,7 @@ int main(int UNUSED argc, char UNUSED **argv) { static const double data[] = {1, 1, 1, 1}; cubic_interp *interp = cubic_interp_init(data, 4, -1, 1); - assert(interp); + XLAL_CHECK_EXIT(interp); for (double t = 0; t <= 1; t += 0.01) { const double result = cubic_interp_eval(interp, t); @@ -64,7 +64,7 @@ int main(int UNUSED argc, char UNUSED **argv) { static const double data[] = {1, 0, 1, 4}; cubic_interp *interp = cubic_interp_init(data, 4, -1, 1); - assert(interp); + XLAL_CHECK_EXIT(interp); for (double t = 0; t <= 1; t += 0.01) { const double result = cubic_interp_eval(interp, t); @@ -79,7 +79,7 @@ int main(int UNUSED argc, char UNUSED **argv) static const double data[] = { GSL_POSINF, GSL_POSINF, GSL_POSINF, GSL_POSINF}; cubic_interp *interp = cubic_interp_init(data, 4, -1, 1); - assert(interp); + XLAL_CHECK_EXIT(interp); for (double t = 0; t <= 1; t += 0.01) { const double result = cubic_interp_eval(interp, t); @@ -94,7 +94,7 @@ int main(int UNUSED argc, char UNUSED **argv) static const double data[] = { 0, GSL_POSINF, GSL_POSINF, GSL_POSINF}; cubic_interp *interp = cubic_interp_init(data, 4, -1, 1); - assert(interp); + XLAL_CHECK_EXIT(interp); for (double t = 0; t <= 1; t += 0.01) { const double result = cubic_interp_eval(interp, t); @@ -109,7 +109,7 @@ int main(int UNUSED argc, char UNUSED **argv) static const double data[] = { GSL_POSINF, GSL_POSINF, GSL_POSINF, 0}; cubic_interp *interp = cubic_interp_init(data, 4, -1, 1); - assert(interp); + XLAL_CHECK_EXIT(interp); for (double t = 0; t <= 1; t += 0.01) { const double result = cubic_interp_eval(interp, t); @@ -124,7 +124,7 @@ int main(int UNUSED argc, char UNUSED **argv) static const double data[] = { 0, GSL_POSINF, GSL_POSINF, 0}; cubic_interp *interp = cubic_interp_init(data, 4, -1, 1); - assert(interp); + XLAL_CHECK_EXIT(interp); for (double t = 0; t <= 1; t += 0.01) { const double result = cubic_interp_eval(interp, t); @@ -139,7 +139,7 @@ int main(int UNUSED argc, char UNUSED **argv) static const double data[] = { 0, 0, GSL_POSINF, 0}; cubic_interp *interp = cubic_interp_init(data, 4, -1, 1); - assert(interp); + XLAL_CHECK_EXIT(interp); for (double t = 0.01; t <= 1; t += 0.01) { const double result = cubic_interp_eval(interp, t); @@ -154,7 +154,7 @@ int main(int UNUSED argc, char UNUSED **argv) static const double data[] = { 0, GSL_NEGINF, GSL_POSINF, 0}; cubic_interp *interp = cubic_interp_init(data, 4, -1, 1); - assert(interp); + XLAL_CHECK_EXIT(interp); const double result = cubic_interp_eval(interp, 1); cubic_interp_free(interp); const double expected = GSL_POSINF; @@ -166,7 +166,7 @@ int main(int UNUSED argc, char UNUSED **argv) static const double data[] = { 0, GSL_POSINF, GSL_NEGINF, 0}; cubic_interp *interp = cubic_interp_init(data, 4, -1, 1); - assert(interp); + XLAL_CHECK_EXIT(interp); const double result = cubic_interp_eval(interp, 0); cubic_interp_free(interp); const double expected = GSL_POSINF; @@ -178,7 +178,7 @@ int main(int UNUSED argc, char UNUSED **argv) static const double data[] = { 0, GSL_NEGINF, GSL_NEGINF, GSL_NEGINF}; cubic_interp *interp = cubic_interp_init(data, 4, -1, 1); - assert(interp); + XLAL_CHECK_EXIT(interp); for (double t = 0; t <= 1; t += 0.01) { const double result = cubic_interp_eval(interp, t); @@ -193,7 +193,7 @@ int main(int UNUSED argc, char UNUSED **argv) static const double data[] = { GSL_NEGINF, GSL_NEGINF, GSL_NEGINF, 0}; cubic_interp *interp = cubic_interp_init(data, 4, -1, 1); - assert(interp); + XLAL_CHECK_EXIT(interp); for (double t = 0; t <= 1; t += 0.01) { const double result = cubic_interp_eval(interp, t); @@ -208,7 +208,7 @@ int main(int UNUSED argc, char UNUSED **argv) static const double data[] = { 0, GSL_NEGINF, GSL_NEGINF, 0}; cubic_interp *interp = cubic_interp_init(data, 4, -1, 1); - assert(interp); + XLAL_CHECK_EXIT(interp); for (double t = 0; t <= 1; t += 0.01) { const double result = cubic_interp_eval(interp, t); @@ -223,7 +223,7 @@ int main(int UNUSED argc, char UNUSED **argv) static const double data[] = { 0, 0, GSL_NEGINF, 0}; cubic_interp *interp = cubic_interp_init(data, 4, -1, 1); - assert(interp); + XLAL_CHECK_EXIT(interp); for (double t = 0.01; t <= 1; t += 0.01) { const double result = cubic_interp_eval(interp, t); @@ -238,7 +238,7 @@ int main(int UNUSED argc, char UNUSED **argv) static const double data[] = { 0, GSL_NEGINF, GSL_POSINF, 0}; cubic_interp *interp = cubic_interp_init(data, 4, -1, 1); - assert(interp); + XLAL_CHECK_EXIT(interp); const double result = cubic_interp_eval(interp, 0); cubic_interp_free(interp); const double expected = GSL_NEGINF; @@ -250,7 +250,7 @@ int main(int UNUSED argc, char UNUSED **argv) static const double data[] = { 0, GSL_POSINF, GSL_NEGINF, 0}; cubic_interp *interp = cubic_interp_init(data, 4, -1, 1); - assert(interp); + XLAL_CHECK_EXIT(interp); const double result = cubic_interp_eval(interp, 1); cubic_interp_free(interp); const double expected = GSL_NEGINF; @@ -262,7 +262,7 @@ int main(int UNUSED argc, char UNUSED **argv) static const double data[] = { 0, GSL_NEGINF, GSL_POSINF, 0}; cubic_interp *interp = cubic_interp_init(data, 4, -1, 1); - assert(interp); + XLAL_CHECK_EXIT(interp); for (double t = 0.01; t < 1; t += 0.01) { const double result = cubic_interp_eval(interp, t); @@ -296,7 +296,7 @@ int main(int UNUSED argc, char UNUSED **argv) constants[k]); } } - assert(interp); + XLAL_CHECK_EXIT(interp); bicubic_interp_free(interp); } } @@ -320,7 +320,7 @@ int main(int UNUSED argc, char UNUSED **argv) "testing bicubic interpolant for s^%d input", k); } } - assert(interp); + XLAL_CHECK_EXIT(interp); bicubic_interp_free(interp); } @@ -341,7 +341,7 @@ int main(int UNUSED argc, char UNUSED **argv) "testing bicubic interpolant for t^%d input", k); } } - assert(interp); + XLAL_CHECK_EXIT(interp); bicubic_interp_free(interp); } @@ -364,7 +364,7 @@ int main(int UNUSED argc, char UNUSED **argv) k, k); } } - assert(interp); + XLAL_CHECK_EXIT(interp); bicubic_interp_free(interp); } } diff --git a/lalinspiral/conda/build.sh b/lalinspiral/conda/build.sh index 2a6c45d253..f2aac0f5d3 100644 --- a/lalinspiral/conda/build.sh +++ b/lalinspiral/conda/build.sh @@ -8,9 +8,6 @@ cd _build # customisation for LALSuite development CI if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then - # allow debugging information - export CPPFLAGS="${CPPFLAGS} -UNDEBUG" - # declare nightly builds if [ "${CI_PIPELINE_SOURCE}" = "schedule" ] || [ "${CI_PIPELINE_SOURCE}" = "web" ]; then CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-nightly" diff --git a/lalinspiral/conda/install-python.sh b/lalinspiral/conda/install-python.sh index 07960c418e..9bf2c0c24c 100644 --- a/lalinspiral/conda/install-python.sh +++ b/lalinspiral/conda/install-python.sh @@ -13,9 +13,6 @@ cd ${_builddir} # customisation for LALSuite development CI if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then - # allow debugging information - export CPPFLAGS="${CPPFLAGS} -UNDEBUG" - # declare nightly builds if [ "${CI_PIPELINE_SOURCE}" = "schedule" ] || [ "${CI_PIPELINE_SOURCE}" = "web" ]; then CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-nightly" diff --git a/lalinspiral/configure.ac b/lalinspiral/configure.ac index ac3b4e6283..46a17f0136 100644 --- a/lalinspiral/configure.ac +++ b/lalinspiral/configure.ac @@ -93,6 +93,9 @@ LALSUITE_ENABLE_NIGHTLY # enable strict gcc flags LALSUITE_ENABLE_GCC_FLAGS +# enable strict definitions +LALSUITE_ENABLE_STRICT_DEFS + # enable SWIG wrapping modules LALSUITE_ENABLE_SWIG diff --git a/lalmetaio/conda/build.sh b/lalmetaio/conda/build.sh index a19ea235c8..76965f28b1 100644 --- a/lalmetaio/conda/build.sh +++ b/lalmetaio/conda/build.sh @@ -8,9 +8,6 @@ cd _build # customisation for LALSuite development CI if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then - # allow debugging information - export CPPFLAGS="${CPPFLAGS} -UNDEBUG" - # declare nightly builds if [ "${CI_PIPELINE_SOURCE}" = "schedule" ] || [ "${CI_PIPELINE_SOURCE}" = "web" ]; then CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-nightly" diff --git a/lalmetaio/conda/install-python.sh b/lalmetaio/conda/install-python.sh index daf791b9dc..3361d3de73 100644 --- a/lalmetaio/conda/install-python.sh +++ b/lalmetaio/conda/install-python.sh @@ -13,9 +13,6 @@ cd ${_builddir} # customisation for LALSuite development CI if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then - # allow debugging information - export CPPFLAGS="${CPPFLAGS} -UNDEBUG" - # declare nightly builds if [ "${CI_PIPELINE_SOURCE}" = "schedule" ] || [ "${CI_PIPELINE_SOURCE}" = "web" ]; then CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-nightly" diff --git a/lalmetaio/configure.ac b/lalmetaio/configure.ac index b0e2f15e0d..1669e4d054 100644 --- a/lalmetaio/configure.ac +++ b/lalmetaio/configure.ac @@ -84,6 +84,9 @@ LALSUITE_ENABLE_NIGHTLY # enable strict gcc flags LALSUITE_ENABLE_GCC_FLAGS +# enable strict definitions +LALSUITE_ENABLE_STRICT_DEFS + # enable SWIG wrapping modules LALSUITE_ENABLE_SWIG diff --git a/lalpulsar/conda/build.sh b/lalpulsar/conda/build.sh index 8b21cb4cd9..35a0890e6a 100644 --- a/lalpulsar/conda/build.sh +++ b/lalpulsar/conda/build.sh @@ -8,9 +8,6 @@ cd _build # customisation for LALSuite development CI if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then - # allow debugging information - export CPPFLAGS="${CPPFLAGS} -UNDEBUG" - # declare nightly builds if [ "${CI_PIPELINE_SOURCE}" = "schedule" ] || [ "${CI_PIPELINE_SOURCE}" = "web" ]; then CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-nightly" diff --git a/lalpulsar/conda/install-python.sh b/lalpulsar/conda/install-python.sh index dff4015de4..e8026a541a 100644 --- a/lalpulsar/conda/install-python.sh +++ b/lalpulsar/conda/install-python.sh @@ -13,9 +13,6 @@ cd ${_builddir} # customisation for LALSuite development CI if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then - # allow debugging information - export CPPFLAGS="${CPPFLAGS} -UNDEBUG" - # declare nightly builds if [ "${CI_PIPELINE_SOURCE}" = "schedule" ] || [ "${CI_PIPELINE_SOURCE}" = "web" ]; then CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-nightly" diff --git a/lalpulsar/configure.ac b/lalpulsar/configure.ac index b94cc6c702..40e89b370b 100644 --- a/lalpulsar/configure.ac +++ b/lalpulsar/configure.ac @@ -117,6 +117,9 @@ LALPULSAR_ENABLE_SISTR # enable strict gcc flags LALSUITE_ENABLE_GCC_FLAGS +# enable strict definitions +LALSUITE_ENABLE_STRICT_DEFS + # optional lal libraries LALSUITE_ENABLE_LALFRAME LALSUITE_ENABLE_LALSIMULATION diff --git a/lalsimulation/conda/build.sh b/lalsimulation/conda/build.sh index de10cc3bf2..3fd7214160 100644 --- a/lalsimulation/conda/build.sh +++ b/lalsimulation/conda/build.sh @@ -8,9 +8,6 @@ cd _build # customisation for LALSuite development CI if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then - # allow debugging information - export CPPFLAGS="${CPPFLAGS} -UNDEBUG" - # declare nightly builds if [ "${CI_PIPELINE_SOURCE}" = "schedule" ] || [ "${CI_PIPELINE_SOURCE}" = "web" ]; then CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-nightly" diff --git a/lalsimulation/conda/install-python.sh b/lalsimulation/conda/install-python.sh index 07960c418e..9bf2c0c24c 100644 --- a/lalsimulation/conda/install-python.sh +++ b/lalsimulation/conda/install-python.sh @@ -13,9 +13,6 @@ cd ${_builddir} # customisation for LALSuite development CI if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then - # allow debugging information - export CPPFLAGS="${CPPFLAGS} -UNDEBUG" - # declare nightly builds if [ "${CI_PIPELINE_SOURCE}" = "schedule" ] || [ "${CI_PIPELINE_SOURCE}" = "web" ]; then CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-nightly" diff --git a/lalsimulation/configure.ac b/lalsimulation/configure.ac index 4907b2de05..577bd9737f 100644 --- a/lalsimulation/configure.ac +++ b/lalsimulation/configure.ac @@ -88,6 +88,9 @@ LALSUITE_ENABLE_NIGHTLY # enable strict gcc flags LALSUITE_ENABLE_GCC_FLAGS +# enable strict definitions +LALSUITE_ENABLE_STRICT_DEFS + # enable SWIG wrapping modules LALSUITE_ENABLE_SWIG diff --git a/lalsimulation/lib/LALSimFindAttachTime.c b/lalsimulation/lib/LALSimFindAttachTime.c index a676029d21..740267cc07 100644 --- a/lalsimulation/lib/LALSimFindAttachTime.c +++ b/lalsimulation/lib/LALSimFindAttachTime.c @@ -1,4 +1,3 @@ -#include #include #include #include @@ -42,7 +41,7 @@ double XLALSimLocateOmegaTime( ) { /* check that retLenHi is at least 2 */ - assert( retLenHi > 2 && "retLenHi must be greater than 2" ); + XLAL_CHECK_ABORT( retLenHi > 2 && "retLenHi must be greater than 2" ); *tMaxOmega = 0; //Zach E: Fixes Heisenbug with ICC 16 and 17 compilers (5181); removing this line will result in segfaults with both compilers. /* @@ -83,7 +82,7 @@ double XLALSimLocateOmegaTime( timeHi.data = dynamicsHi->data; double dt = timeHi.data[1] - timeHi.data[0]; - double ddradiusVec[timeHi.length - 1]; + double XLAL_INIT_DECL(ddradiusVec, [timeHi.length - 1]); unsigned int k; for (k = 1; k < timeHi.length-1; k++) { ddradiusVec[k] = (radiusVec->data[k+1] - 2.*radiusVec->data[k] + radiusVec->data[k-1])/dt/dt; @@ -441,11 +440,11 @@ double XLALSimLocateAmplTime( if (debugPK) {debugRD = 0;} double dt = timeHi->data[1] - timeHi->data[0]; - double ddradiusVec[timeHi->length - 1]; + double XLAL_INIT_DECL(ddradiusVec, [timeHi->length - 1]); unsigned int k; /* check that timeHi->length is at least 2 */ - assert( timeHi->length > 2 && "timeHi->length must be greater than 2" ); + XLAL_CHECK_ABORT( timeHi->length > 2 && "timeHi->length must be greater than 2" ); for (k = 1; k < timeHi->length-1; k++) { ddradiusVec[k] = (radiusVec->data[k+1] - 2.*radiusVec->data[k] + radiusVec->data[k-1])/dt/dt; diff --git a/lalsimulation/lib/LALSimIMRPrecessingNRSur.c b/lalsimulation/lib/LALSimIMRPrecessingNRSur.c index cb07482818..fe2ce6d762 100644 --- a/lalsimulation/lib/LALSimIMRPrecessingNRSur.c +++ b/lalsimulation/lib/LALSimIMRPrecessingNRSur.c @@ -27,7 +27,6 @@ #define UNUSED #endif -#include #include #include #include @@ -295,12 +294,12 @@ static void PrecessingNRSur_LoadFitData( UNUSED size_t nwritten; nwritten = snprintf(tmp_name, str_size, "%s_coefs", name); - assert(nwritten < str_size); + XLAL_CHECK_ABORT(nwritten < str_size); (*fit_data)->coefs = NULL; ReadHDF5RealVectorDataset(sub, tmp_name, &((*fit_data)->coefs)); nwritten = snprintf(tmp_name, str_size, "%s_bfOrders", name); - assert(nwritten < str_size); + XLAL_CHECK_ABORT(nwritten < str_size); (*fit_data)->basisFunctionOrders = NULL; ReadHDF5LongMatrixDataset(sub, tmp_name, &((*fit_data)->basisFunctionOrders)); @@ -329,7 +328,7 @@ static void NRSur7dq4_LoadVectorFitData( for (size_t i=0; ifit_data[i] = fit_data; diff --git a/lalsimulation/lib/LALSimIMRSEOBNRv4TSurrogate.c b/lalsimulation/lib/LALSimIMRSEOBNRv4TSurrogate.c index 93881afaed..7366e543af 100644 --- a/lalsimulation/lib/LALSimIMRSEOBNRv4TSurrogate.c +++ b/lalsimulation/lib/LALSimIMRSEOBNRv4TSurrogate.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -235,7 +234,7 @@ static int TaylorF2Amplitude1PN( UNUSED static void save_gsl_frequency_series(const char filename[], gsl_vector *x, gsl_vector *y) { FILE *fp = fopen(filename, "w"); fprintf(stderr, "save_gsl_frequency_series: %s: %zu %zu\n", filename, x->size, y->size); - assert(x->size == y->size); + XLAL_CHECK_ABORT(x->size == y->size); for (size_t i=0; isize; i++) { fprintf(fp, "%g\t%g\n", gsl_vector_get(x, i), gsl_vector_get(y, i)); } diff --git a/lalsimulation/lib/LALSimNRHybSurUtilities.c b/lalsimulation/lib/LALSimNRHybSurUtilities.c index 5d78af6de1..fd7a5b8b7d 100644 --- a/lalsimulation/lib/LALSimNRHybSurUtilities.c +++ b/lalsimulation/lib/LALSimNRHybSurUtilities.c @@ -37,7 +37,6 @@ #include "LALSimNRHybSurUtilities.h" -#include #include #include #include @@ -164,7 +163,7 @@ static int NRHybSur_LoadDataPiece( for (int i=0; iampl_data_piece, file, sub_grp_name); if(ret != XLAL_SUCCESS) { @@ -300,7 +299,7 @@ static int NRHybSur_LoadSingleModeData( // phase of 22 mode nwritten = snprintf(sub_grp_name, str_size, "l%u_m%u/phase", ell, m); - assert(nwritten < str_size); + XLAL_CHECK_ABORT(nwritten < str_size); ret = NRHybSur_LoadDataPiece(&(data_pieces)->phase_res_data_piece, file, sub_grp_name); if(ret != XLAL_SUCCESS) { @@ -316,7 +315,7 @@ static int NRHybSur_LoadSingleModeData( if (m != 0 || ell % 2 == 0) { // Real part of coorbital frame mode nwritten = snprintf(sub_grp_name, str_size, "l%u_m%u/re", ell, m); - assert(nwritten < str_size); + XLAL_CHECK_ABORT(nwritten < str_size); ret = NRHybSur_LoadDataPiece(&(data_pieces)->coorb_re_data_piece, file, sub_grp_name); if(ret != XLAL_SUCCESS) { @@ -332,7 +331,7 @@ static int NRHybSur_LoadSingleModeData( if (m != 0 || ell % 2 == 1) { // Imaginary part of coorbital frame mode nwritten = snprintf(sub_grp_name, str_size, "l%u_m%u/im", ell, m); - assert(nwritten < str_size); + XLAL_CHECK_ABORT(nwritten < str_size); ret = NRHybSur_LoadDataPiece(&(data_pieces)->coorb_im_data_piece, file, sub_grp_name); if(ret != XLAL_SUCCESS) { diff --git a/lalsimulation/lib/LALSimNRSur3dq8Remnant.c b/lalsimulation/lib/LALSimNRSur3dq8Remnant.c index 25de454c5b..ddcf08a6ee 100644 --- a/lalsimulation/lib/LALSimNRSur3dq8Remnant.c +++ b/lalsimulation/lib/LALSimNRSur3dq8Remnant.c @@ -64,7 +64,6 @@ #include -#include #include #include #include diff --git a/lalsimulation/lib/LALSimNRSur7dq4Remnant.c b/lalsimulation/lib/LALSimNRSur7dq4Remnant.c index 4213783b33..bd3c531ec9 100644 --- a/lalsimulation/lib/LALSimNRSur7dq4Remnant.c +++ b/lalsimulation/lib/LALSimNRSur7dq4Remnant.c @@ -60,7 +60,6 @@ #include -#include #include #include #include diff --git a/lalsimulation/lib/LALSimNRSurRemnantUtils.c b/lalsimulation/lib/LALSimNRSurRemnantUtils.c index 979181f279..35d9a3a502 100644 --- a/lalsimulation/lib/LALSimNRSurRemnantUtils.c +++ b/lalsimulation/lib/LALSimNRSurRemnantUtils.c @@ -36,7 +36,6 @@ #include -#include #include #include #include @@ -220,7 +219,7 @@ int NRSurRemnant_LoadVectorFit( for (UINT4 i=0; i #include #include -#include #include #include #include @@ -99,7 +98,7 @@ static void Test_BHNS_spin_aligned(void) { input_BHNS_spin_aligned[i][2], input_BHNS_spin_aligned[i][3]); print_difference("XLALBHNS_spin_aligned", output, expected_BHNS_spin_aligned[i]); - assert(approximatelyEqual(output, expected_BHNS_spin_aligned[i], TOLERANCE_BHNS_SPIN_ALIGNED)); + XLAL_CHECK_EXIT(approximatelyEqual(output, expected_BHNS_spin_aligned[i], TOLERANCE_BHNS_SPIN_ALIGNED)); } } @@ -140,7 +139,7 @@ static void Test_BHNS_mass_aligned(void) { input_BHNS_mass_aligned[i][2], input_BHNS_mass_aligned[i][3]); print_difference("XLALBHNS_mass_aligned", output, expected_BHNS_mass_aligned[i]); - assert(approximatelyEqual(output, expected_BHNS_mass_aligned[i], TOLERANCE_BHNS_MASS_ALIGNED)); + XLAL_CHECK_EXIT(approximatelyEqual(output, expected_BHNS_mass_aligned[i], TOLERANCE_BHNS_MASS_ALIGNED)); } } @@ -195,7 +194,7 @@ static void Test_bbh_final_spin_non_precessing_UIB2016(void) { input_bbh_final_spin_non_precessing_UIB2016[i][2], input_bbh_final_spin_non_precessing_UIB2016[i][3]); print_difference("XLALbbh_final_spin_non_precessing_UIB2016", output, expected_bbh_final_spin_non_precessing_UIB2016[i]); - assert(approximatelyEqual(output, expected_bbh_final_spin_non_precessing_UIB2016[i], TOLERANCE_BBH_FINAL_SPIN_NON_PRECESSING_UIB2016)); + XLAL_CHECK_EXIT(approximatelyEqual(output, expected_bbh_final_spin_non_precessing_UIB2016[i], TOLERANCE_BBH_FINAL_SPIN_NON_PRECESSING_UIB2016)); } } @@ -250,7 +249,7 @@ static void Test_bbh_final_mass_non_precessing_UIB2016(void) { input_bbh_final_mass_non_precessing_UIB2016[i][2], input_bbh_final_mass_non_precessing_UIB2016[i][3]); print_difference("XLALbbh_final_mass_non_precessing_UIB2016", output, expected_bbh_final_mass_non_precessing_UIB2016[i]); - assert(approximatelyEqual(output, expected_bbh_final_mass_non_precessing_UIB2016[i], TOLERANCE_BBH_FINAL_MASS_NON_PRECESSING_UIB2016)); + XLAL_CHECK_EXIT(approximatelyEqual(output, expected_bbh_final_mass_non_precessing_UIB2016[i], TOLERANCE_BBH_FINAL_MASS_NON_PRECESSING_UIB2016)); } } diff --git a/lalsimulation/test/NSBHPropertiesTest.c b/lalsimulation/test/NSBHPropertiesTest.c index 141e104826..2f6a91f5e6 100644 --- a/lalsimulation/test/NSBHPropertiesTest.c +++ b/lalsimulation/test/NSBHPropertiesTest.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include @@ -78,7 +77,7 @@ static void Test_fGWinKerr(void) { input_fGWinKerr[i][1], input_fGWinKerr[i][2]); print_difference("XLALSimNSBH_fGWinKerr", output, expected_fGWinKerr[i]); - assert(approximatelyEqual(output, expected_fGWinKerr[i], TOLERANCE_FGWINKERR)); + XLAL_CHECK_EXIT(approximatelyEqual(output, expected_fGWinKerr[i], TOLERANCE_FGWINKERR)); } } @@ -96,7 +95,7 @@ static void Test_rKerrISCO(void) { double output = XLALSimNSBH_rKerrISCO( input_rKerrISCO[i][0]); print_difference("XLALSimNSBH_rKerrISCO", output, expected_rKerrISCO[i]); - assert(approximatelyEqual(output, expected_rKerrISCO[i], TOLERANCE_RKERRISCO)); + XLAL_CHECK_EXIT(approximatelyEqual(output, expected_rKerrISCO[i], TOLERANCE_RKERRISCO)); } } @@ -130,7 +129,7 @@ static void Test_xi_tide(void) { input_xi_tide[i][1], input_xi_tide[i][2]); print_difference("XLALSimNSBH_xi_tide", output, expected_xi_tide[i]); - assert(approximatelyEqual(output, expected_xi_tide[i], TOLERANCE_XI_TIDE)); + XLAL_CHECK_EXIT(approximatelyEqual(output, expected_xi_tide[i], TOLERANCE_XI_TIDE)); } } @@ -155,7 +154,7 @@ static void Test_compactness_from_lambda(void) { double output = XLALSimNSBH_compactness_from_lambda( input_compactness_from_lambda[i][0]); print_difference("XLALSimNSBH_compactness_from_lambda", output, expected_compactness_from_lambda[i]); - assert(approximatelyEqual(output, expected_compactness_from_lambda[i], TOLERANCE_COMPACTNESS_FROM_LAMBDA)); + XLAL_CHECK_EXIT(approximatelyEqual(output, expected_compactness_from_lambda[i], TOLERANCE_COMPACTNESS_FROM_LAMBDA)); } } @@ -186,7 +185,7 @@ static void Test_torus_mass_fit(void) { input_torus_mass_fit[i][1], input_torus_mass_fit[i][2]); print_difference("XLALSimNSBH_torus_mass_fit", output, expected_torus_mass_fit[i]); - assert(approximatelyEqual(output, expected_torus_mass_fit[i], TOLERANCE_TORUS_MASS_FIT)); + XLAL_CHECK_EXIT(approximatelyEqual(output, expected_torus_mass_fit[i], TOLERANCE_TORUS_MASS_FIT)); } } diff --git a/lalsimulation/test/PhenomNSBHTest.c b/lalsimulation/test/PhenomNSBHTest.c index 4a0d2245a2..8149812baa 100644 --- a/lalsimulation/test/PhenomNSBHTest.c +++ b/lalsimulation/test/PhenomNSBHTest.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include @@ -103,7 +102,7 @@ static void Test_x_D(void) { input_x_D[i][2], input_x_D[i][3]); print_difference("XLALSimIMRPhenomNSBH_x_D", output, expected_x_D[i]); - assert(approximatelyEqual(output, expected_x_D[i], TOLERANCE_X_D)); + XLAL_CHECK_EXIT(approximatelyEqual(output, expected_x_D[i], TOLERANCE_X_D)); } } @@ -151,7 +150,7 @@ static void Test_epsilon_ins_with_torus_mass(void) { input_epsilon_ins_with_torus_mass[i][2], input_epsilon_ins_with_torus_mass[i][3]); print_difference("XLALSimIMRPhenomNSBH_epsilon_ins_with_torus_mass", output, expected_epsilon_ins_with_torus_mass[i]); - assert(approximatelyEqual(output, expected_epsilon_ins_with_torus_mass[i], TOLERANCE_EPSILON_INS_WITH_TORUS_MASS)); + XLAL_CHECK_EXIT(approximatelyEqual(output, expected_epsilon_ins_with_torus_mass[i], TOLERANCE_EPSILON_INS_WITH_TORUS_MASS)); } } @@ -199,7 +198,7 @@ static void Test_x_D_prime(void) { input_x_D_prime[i][2], input_x_D_prime[i][3]); print_difference("XLALSimIMRPhenomNSBH_x_D_prime", output, expected_x_D_prime[i]); - assert(approximatelyEqual(output, expected_x_D_prime[i], TOLERANCE_X_D_PRIME)); + XLAL_CHECK_EXIT(approximatelyEqual(output, expected_x_D_prime[i], TOLERANCE_X_D_PRIME)); } } @@ -247,7 +246,7 @@ static void Test_sigma_tide_with_torus_mass(void) { input_sigma_tide_with_torus_mass[i][2], input_sigma_tide_with_torus_mass[i][3]); print_difference("XLALSimIMRPhenomNSBH_sigma_tide_with_torus_mass", output, expected_sigma_tide_with_torus_mass[i]); - assert(approximatelyEqual(output, expected_sigma_tide_with_torus_mass[i], TOLERANCE_SIGMA_TIDE_WITH_TORUS_MASS)); + XLAL_CHECK_EXIT(approximatelyEqual(output, expected_sigma_tide_with_torus_mass[i], TOLERANCE_SIGMA_TIDE_WITH_TORUS_MASS)); } } @@ -325,7 +324,7 @@ static void Test_epsilon_tide_ND(void) { double output = XLALSimIMRPhenomNSBH_epsilon_tide_ND( input_epsilon_tide_ND[i][0]); print_difference("XLALSimIMRPhenomNSBH_epsilon_tide_ND", output, expected_epsilon_tide_ND[i]); - assert(approximatelyEqual(output, expected_epsilon_tide_ND[i], TOLERANCE_EPSILON_TIDE_ND)); + XLAL_CHECK_EXIT(approximatelyEqual(output, expected_epsilon_tide_ND[i], TOLERANCE_EPSILON_TIDE_ND)); } } @@ -389,7 +388,7 @@ static void Test_sigma_tide_ND(void) { double output = XLALSimIMRPhenomNSBH_sigma_tide_ND( input_sigma_tide_ND[i][0]); print_difference("XLALSimIMRPhenomNSBH_sigma_tide_ND", output, expected_sigma_tide_ND[i]); - assert(approximatelyEqual(output, expected_sigma_tide_ND[i], TOLERANCE_SIGMA_TIDE_ND)); + XLAL_CHECK_EXIT(approximatelyEqual(output, expected_sigma_tide_ND[i], TOLERANCE_SIGMA_TIDE_ND)); } } @@ -479,7 +478,7 @@ static void Test_x_ND(void) { input_x_ND[i][2], input_x_ND[i][3]); print_difference("XLALSimIMRPhenomNSBH_x_ND", output, expected_x_ND[i]); - assert(approximatelyEqual(output, expected_x_ND[i], TOLERANCE_X_ND)); + XLAL_CHECK_EXIT(approximatelyEqual(output, expected_x_ND[i], TOLERANCE_X_ND)); } } @@ -569,7 +568,7 @@ static void Test_x_ND_prime(void) { input_x_ND_prime[i][2], input_x_ND_prime[i][3]); print_difference("XLALSimIMRPhenomNSBH_x_ND_prime", output, expected_x_ND_prime[i]); - assert(approximatelyEqual(output, expected_x_ND_prime[i], TOLERANCE_X_ND_PRIME)); + XLAL_CHECK_EXIT(approximatelyEqual(output, expected_x_ND_prime[i], TOLERANCE_X_ND_PRIME)); } } @@ -589,7 +588,7 @@ static void Test_delta2_prime(void) { input_delta2_prime[i][0], input_delta2_prime[i][1]); print_difference("XLALSimIMRPhenomNSBH_delta2_prime", output, expected_delta2_prime[i]); - assert(approximatelyEqual(output, expected_delta2_prime[i], TOLERANCE_DELTA2_PRIME)); + XLAL_CHECK_EXIT(approximatelyEqual(output, expected_delta2_prime[i], TOLERANCE_DELTA2_PRIME)); } } @@ -610,7 +609,7 @@ static void Test_baryonic_mass_from_C(void) { input_baryonic_mass_from_C[i][0], input_baryonic_mass_from_C[i][1]); print_difference("XLALSimIMRPhenomNSBH_baryonic_mass_from_C", output, expected_baryonic_mass_from_C[i]); - assert(approximatelyEqual(output, expected_baryonic_mass_from_C[i], TOLERANCE_BARYONIC_MASS_FROM_C)); + XLAL_CHECK_EXIT(approximatelyEqual(output, expected_baryonic_mass_from_C[i], TOLERANCE_BARYONIC_MASS_FROM_C)); } } @@ -634,11 +633,11 @@ static void Test_omega_tilde(void) { // Assert real part is approximately equal print_difference("XLALSimIMRPhenomNSBH_omega_tilde (real)", creal(output), creal(expected_omega_tilde[i])); - assert(approximatelyEqual(creal(output), creal(expected_omega_tilde[i]), TOLERANCE_OMEGA_TILDE)); + XLAL_CHECK_EXIT(approximatelyEqual(creal(output), creal(expected_omega_tilde[i]), TOLERANCE_OMEGA_TILDE)); // Assert imaginary part is approximately equal print_difference("XLALSimIMRPhenomNSBH_omega_tilde (imag)", cimag(output), cimag(expected_omega_tilde[i])); - assert(approximatelyEqual(cimag(output), cimag(expected_omega_tilde[i]), TOLERANCE_OMEGA_TILDE)); + XLAL_CHECK_EXIT(approximatelyEqual(cimag(output), cimag(expected_omega_tilde[i]), TOLERANCE_OMEGA_TILDE)); } } diff --git a/lalsimulation/test/PhenomPTest.c b/lalsimulation/test/PhenomPTest.c index 3e265b431a..9ce8600f80 100644 --- a/lalsimulation/test/PhenomPTest.c +++ b/lalsimulation/test/PhenomPTest.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include @@ -194,7 +193,7 @@ static void Test_alpha_epsilon(void) { const REAL8 eps = 1e-5; - assert( + XLAL_CHECK_EXIT( approximatelyEqual(alpha, alpha_expected, eps) && approximatelyEqual(epsilon, epsilon_expected, eps) && "Test_alpha_epsilon()" @@ -257,7 +256,7 @@ static void Test_XLALSimIMRPhenomPCalculateModelParameters(void) { //const REAL8 eps = DBL_EPSILON; const REAL8 eps = 1e-5; - assert(approximatelyEqual(chi_eff, chi_eff_expected, eps) + XLAL_CHECK_EXIT(approximatelyEqual(chi_eff, chi_eff_expected, eps) && approximatelyEqual(chip, chip_expected, eps) && approximatelyEqual(thetaJ, thetaJ_expected, eps) && approximatelyEqual(alpha0, alpha0_expected, eps) @@ -305,7 +304,7 @@ static void Test_PhenomC(void) { const REAL8 eps = 1e-5; - assert( + XLAL_CHECK_EXIT( approximatelyEqualC(hPC, hPC_expected, eps) && "Test_PhenomC()" ); @@ -388,7 +387,7 @@ static void Test_PhenomPCore(void) { COMPLEX16 hc_expected = -9.29441e-23 - I * 2.06616e-23; const REAL8 eps = 1e-5; - assert( + XLAL_CHECK_EXIT( approximatelyEqualC(hp, hp_expected, eps) && approximatelyEqualC(hc, hc_expected, eps) && "Test_PhenomPCore()" @@ -478,7 +477,7 @@ static void Test_XLALSimIMRPhenomP(void) { COMPLEX16 hc_expected = 2.6046e-23 + I * 5.17592e-23; const REAL8 eps = 1e-5; - assert( + XLAL_CHECK_EXIT( approximatelyEqualC(hp, hp_expected, eps) && approximatelyEqualC(hc, hc_expected, eps) && "XLALSimIMRPhenomP()" @@ -610,7 +609,7 @@ static void Test_PhenomC_PhenomP(void) { const REAL8 eps = 1e-5; - assert( + XLAL_CHECK_EXIT( approximatelyEqualC(match, match_expected, eps) && "Test_PhenomC_PhenomP()" ); @@ -757,7 +756,7 @@ static void Test_XLALSimIMRPhenomP_f_ref(void) { const REAL8 eps = 1e-5; - assert( + XLAL_CHECK_EXIT( approximatelyEqualC(hp, hp2, eps) && approximatelyEqualC(hc, hc2, eps) && "XLALSimIMRPhenomP_f_ref()" diff --git a/lalsimulation/test/SEOBNRv4_ROM_NRTidalv2_NSBH_Test.c b/lalsimulation/test/SEOBNRv4_ROM_NRTidalv2_NSBH_Test.c index ced512971d..83bee1d543 100644 --- a/lalsimulation/test/SEOBNRv4_ROM_NRTidalv2_NSBH_Test.c +++ b/lalsimulation/test/SEOBNRv4_ROM_NRTidalv2_NSBH_Test.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include @@ -118,7 +117,7 @@ static void Test_amplitude_correction_disruptive(void){ expected_amp_tidal->data[9]=0.8841072573277694; print_difference_FrequencySequence("Amplitude Correction",amp_tidal,expected_amp_tidal,freqs); - assert(approximatelyEqualREAL8Sequence(amp_tidal,expected_amp_tidal,1e-9)); + XLAL_CHECK_EXIT(approximatelyEqualREAL8Sequence(amp_tidal,expected_amp_tidal,1e-9)); } int main(int argc, char *argv[]) { diff --git a/lalsimulation/test/SphHarmTSTest.c b/lalsimulation/test/SphHarmTSTest.c index 1cac191e05..385fb28209 100644 --- a/lalsimulation/test/SphHarmTSTest.c +++ b/lalsimulation/test/SphHarmTSTest.c @@ -26,8 +26,6 @@ */ -#include - #include #include #include @@ -92,7 +90,7 @@ int main(void){ } XLALSphHarmTimeSeriesSetTData( ts, tdata ); REAL8Sequence *tdata_hlm = XLALSphHarmTimeSeriesGetTData( ts ); - assert( tdata_hlm == tdata ); + XLAL_CHECK_EXIT( tdata_hlm == tdata ); XLALDestroySphHarmTimeSeries( ts ); -- GitLab From bd5ed3e91dbe28d3a59d699768dd52020227f89a Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Thu, 1 Sep 2022 08:33:48 +0000 Subject: [PATCH 34/64] Merge branch 'user-env-colon' into 'master' gnuscripts/generate_user_env.awk: strip trailing colons from paths Closes #599 See merge request lscsoft/lalsuite!1977 (cherry picked from commit 5a550b6f2c9af86aff570f2181ec9747ae4ba39a) --- gnuscripts/generate_user_env.awk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnuscripts/generate_user_env.awk b/gnuscripts/generate_user_env.awk index 1be9aa07a6..1a41118d0f 100644 --- a/gnuscripts/generate_user_env.awk +++ b/gnuscripts/generate_user_env.awk @@ -105,16 +105,20 @@ END { } else { fisharraytranslate = "" } - print "csh:if ( ! ${?" name "} ) setenv " name print "sh:export " name if (sed[name] != "") { + print "csh:if ( ! ${?" name "} ) setenv " name print "csh:setenv " name " `echo \"$" name "\" | @SED@ -e '" sed[name] "'`" + print "csh:setenv " name " `echo \"" env[name] "\" | @SED@ -e 's|:$||;'`" print "sh:" name "=`echo \"$" name "\" | @SED@ -e '" sed[name] "'`" + print "sh:" name "=`echo \"" env[name] "\" | @SED@ -e 's|:$||;'`" print "fish:set " name " (echo \"$" name "\" | @SED@ -e 's| |:|g;" sed[name] "'" fisharraytranslate ")" + print "fish:set " name " (echo \"" env[name] "\" | @SED@ -e 's| |:|g;s|:$||'" fisharraytranslate ")" + } else { + print "csh:setenv " name " \"" env[name] "\"" + print "sh:" name "=\"" env[name] "\"" + print "fish:set " name " (echo \"" env[name] "\" | @SED@ -e 's| |:|g;'" fisharraytranslate ")" } - print "csh:setenv " name " \"" env[name] "\"" - print "sh:" name "=\"" env[name] "\"" - print "fish:set " name " (echo \"" env[name] "\" | @SED@ -e 's| |:|g;'" fisharraytranslate ")" } if (envempty) { print "generate_user_env.awk: no user environment script was generated" >"/dev/stderr" -- GitLab From 8c2b6889c81abc3e20a62dd2e37d0fbc1bd95142 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Fri, 26 Aug 2022 11:52:51 -0700 Subject: [PATCH 35/64] lal: mark as version 7.2.2 --- lal/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lal/configure.ac b/lal/configure.ac index 5ff013a1c1..81f06056ef 100644 --- a/lal/configure.ac +++ b/lal/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([LAL],[7.2.1],[lal-discuss@ligo.org]) +AC_INIT([LAL],[7.2.2],[lal-discuss@ligo.org]) AC_CONFIG_HEADERS([lib/config.h lib/LALConfig.h]) AC_CONFIG_SRCDIR([lib/std/LALStdio.h]) AC_CONFIG_AUX_DIR([gnuscripts]) -- GitLab From f594c1eeeeecb41b78c60153ac82e87f6a4ed0bc Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Tue, 6 Sep 2022 09:23:43 +0100 Subject: [PATCH 36/64] lal: bump library api version for 7.2.2 --- lal/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lal/configure.ac b/lal/configure.ac index 81f06056ef..e037e47c39 100644 --- a/lal/configure.ac +++ b/lal/configure.ac @@ -20,7 +20,7 @@ AC_CONFIG_MACRO_DIR([gnuscripts]) # 6. if any interfaces have been removed since the last public release, # then set age to 0. AC_SUBST([LIBCURRENT],[22]) -AC_SUBST([LIBREVISION],[1]) +AC_SUBST([LIBREVISION],[2]) AC_SUBST([LIBAGE],[2]) AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}]) AS_CASE([${host_os}], -- GitLab From 5168d97ea9fcd06a3b49dd03a1a82d5e700e514e Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Tue, 6 Sep 2022 09:22:04 +0100 Subject: [PATCH 37/64] lal: update packaging for 7.2.2 --- lal/debian/changelog | 6 ++++++ lal/lal.spec.in | 3 +++ 2 files changed, 9 insertions(+) diff --git a/lal/debian/changelog b/lal/debian/changelog index 99527de798..b9ba69d66d 100644 --- a/lal/debian/changelog +++ b/lal/debian/changelog @@ -1,3 +1,9 @@ +lal (7.2.2-1) unstable; urgency=low + + * Update for 7.2.2 + + -- Adam Mercer Tue, 06 Sep 2022 09:21:53 +0100 + lal (7.2.1-1) unstable; urgency=low * Update for 7.2.1 diff --git a/lal/lal.spec.in b/lal/lal.spec.in index 3b7af50880..c4ce062828 100644 --- a/lal/lal.spec.in +++ b/lal/lal.spec.in @@ -187,6 +187,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}} # dates should be formatted using: 'date +"%a %b %d %Y"' %changelog +* Tue Sep 06 2022 Adam Mercer 7.2.2-1 +- Update for 7.2.2 + * Thu Aug 18 2022 Adam Mercer 7.2.1-1 - Update for 7.2.1 -- GitLab From bcf0151aa1cb0de07c628c16932622d041f06a6c Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 11:51:14 +0100 Subject: [PATCH 38/64] lalframe: mark as version 2.0.3 --- lalframe/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalframe/configure.ac b/lalframe/configure.ac index f80efaeee6..2e000512e1 100644 --- a/lalframe/configure.ac +++ b/lalframe/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([LALFrame],[2.0.2],[lal-discuss@ligo.org]) +AC_INIT([LALFrame],[2.0.3],[lal-discuss@ligo.org]) AC_CONFIG_HEADERS([lib/config.h lib/LALFrameConfig.h]) AC_CONFIG_SRCDIR([lib/LALFrameIO.c]) AC_CONFIG_AUX_DIR([gnuscripts]) -- GitLab From 5f7572a2cbb22c0d04299738f2c165a4e6f46290 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 11:51:54 +0100 Subject: [PATCH 39/64] lalframe: bump dependency versions --- lalframe/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalframe/configure.ac b/lalframe/configure.ac index 2e000512e1..e372d68ecc 100644 --- a/lalframe/configure.ac +++ b/lalframe/configure.ac @@ -69,7 +69,7 @@ AM_INIT_AUTOMAKE([ \ ]) # version requirements -MIN_LAL_VERSION="7.2.1" +MIN_LAL_VERSION="7.2.2" MIN_FRAMECPPC_VERSION="2.5.5" MIN_FRAMEL_VERSION="8.39.2" AC_SUBST([MIN_LAL_VERSION]) -- GitLab From 383f6ca5715768185384dc36d3b5f3ceca81aea6 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 11:53:49 +0100 Subject: [PATCH 40/64] lalframe: update packaging for 2.0.3 --- lalframe/debian/changelog | 6 ++++++ lalframe/lalframe.spec.in | 3 +++ 2 files changed, 9 insertions(+) diff --git a/lalframe/debian/changelog b/lalframe/debian/changelog index e78c6239b0..d933e2dfb3 100644 --- a/lalframe/debian/changelog +++ b/lalframe/debian/changelog @@ -1,3 +1,9 @@ +lalframe (2.0.3-1) unstable; urgency=low + + * Update got 2.0.3 + + -- Adam Mercer Mon, 05 Sep 2022 11:53:35 +0100 + lalframe (2.0.2-1) unstable; urgency=low * Update for 2.0.2 diff --git a/lalframe/lalframe.spec.in b/lalframe/lalframe.spec.in index 23889dedd2..96a3a88c14 100644 --- a/lalframe/lalframe.spec.in +++ b/lalframe/lalframe.spec.in @@ -171,6 +171,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}} # dates should be formatted using: 'date +"%a %b %d %Y"' %changelog +* Mon Sep 05 2022 Adam Mercer 2.0.3-1 +- Update for 2.0.3 + * Thu Aug 18 2022 Adam Mercer 2.0.2-1 - Update for 2.0.2 -- GitLab From 8741805ff9edaece78e2218b7561b1c366cdfa86 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 11:56:55 +0100 Subject: [PATCH 41/64] lalmetaio: mark as version 3.0.2 --- lalmetaio/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalmetaio/configure.ac b/lalmetaio/configure.ac index 1669e4d054..832e9dd227 100644 --- a/lalmetaio/configure.ac +++ b/lalmetaio/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([LALMetaIO],[3.0.1],[lal-discuss@ligo.org]) +AC_INIT([LALMetaIO],[3.0.2],[lal-discuss@ligo.org]) AC_CONFIG_HEADERS([lib/config.h lib/LALMetaIOConfig.h]) AC_CONFIG_SRCDIR([lib/LIGOLwXML.c]) AC_CONFIG_AUX_DIR([gnuscripts]) -- GitLab From ad65ddd47967e6b57d498e7c3217d7cd28f81ff9 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 11:57:16 +0100 Subject: [PATCH 42/64] lalmetaio: bump dependency versions --- lalmetaio/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalmetaio/configure.ac b/lalmetaio/configure.ac index 832e9dd227..9190da87df 100644 --- a/lalmetaio/configure.ac +++ b/lalmetaio/configure.ac @@ -68,7 +68,7 @@ AM_INIT_AUTOMAKE([ \ ]) # version requirements -MIN_LAL_VERSION="7.2.1" +MIN_LAL_VERSION="7.2.2" AC_SUBST([MIN_LAL_VERSION]) AC_CANONICAL_HOST -- GitLab From 559f92782ad112ef143d4c33150f282349c4263a Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 11:59:16 +0100 Subject: [PATCH 43/64] lalmetaio: update packaging for 3.0.2 --- lalmetaio/debian/changelog | 6 ++++++ lalmetaio/lalmetaio.spec.in | 3 +++ 2 files changed, 9 insertions(+) diff --git a/lalmetaio/debian/changelog b/lalmetaio/debian/changelog index fef0df9d36..ca3c4cbc94 100644 --- a/lalmetaio/debian/changelog +++ b/lalmetaio/debian/changelog @@ -1,3 +1,9 @@ +lalmetaio (3.0.2-1) unstable; urgency=low + + * Update for 3.0.2 + + -- Adam Mercer Mon, 05 Sep 2022 11:58:56 +0100 + lalmetaio (3.0.1-1) unstable; urgency=low * Update for 3.0.1 diff --git a/lalmetaio/lalmetaio.spec.in b/lalmetaio/lalmetaio.spec.in index 7552fb55a0..80d382ef5d 100644 --- a/lalmetaio/lalmetaio.spec.in +++ b/lalmetaio/lalmetaio.spec.in @@ -168,6 +168,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}} # dates should be formatted using: 'date +"%a %b %d %Y"' %changelog +* Mon Sep 05 2022 Adam Mercer 3.0.2-1 +- Update for 3.0.2 + * Thu Aug 18 2022 Adam Mercer 3.0.1-1 - Update for 3.0.1 -- GitLab From 7cf9886bbb235d1c9545840df2dccb2ebfb0c7fa Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 12:00:09 +0100 Subject: [PATCH 44/64] lalsimulation: mark as version 4.0.2 --- lalsimulation/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalsimulation/configure.ac b/lalsimulation/configure.ac index 577bd9737f..99b9750f27 100644 --- a/lalsimulation/configure.ac +++ b/lalsimulation/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([LALSimulation],[4.0.1],[lal-discuss@ligo.org]) +AC_INIT([LALSimulation],[4.0.2],[lal-discuss@ligo.org]) AC_CONFIG_HEADERS([lib/config.h lib/LALSimulationConfig.h]) AC_CONFIG_SRCDIR([lib/LALSimulation.c]) AC_CONFIG_AUX_DIR([gnuscripts]) -- GitLab From b7aeff0c522b61424d14ffe993089a1197ddd388 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 12:00:27 +0100 Subject: [PATCH 45/64] lalsimulation: bump library api version for 4.0.2 --- lalsimulation/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalsimulation/configure.ac b/lalsimulation/configure.ac index 99b9750f27..3cbe8b568f 100644 --- a/lalsimulation/configure.ac +++ b/lalsimulation/configure.ac @@ -20,7 +20,7 @@ AC_CONFIG_MACRO_DIR([gnuscripts]) # 6. if any interfaces have been removed since the last public release, # then set age to 0. AC_SUBST([LIBCURRENT],[31]) -AC_SUBST([LIBREVISION],[1]) +AC_SUBST([LIBREVISION],[2]) AC_SUBST([LIBAGE],[0]) AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}]) AS_CASE([${host_os}], -- GitLab From a2fc36fa28b4fe7259ceb1656347dba87dad64e7 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 12:00:48 +0100 Subject: [PATCH 46/64] lalsimulation: bump dependency versions --- lalsimulation/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalsimulation/configure.ac b/lalsimulation/configure.ac index 3cbe8b568f..9c62731beb 100644 --- a/lalsimulation/configure.ac +++ b/lalsimulation/configure.ac @@ -72,7 +72,7 @@ AM_INIT_AUTOMAKE([ \ ]) # version requirements -MIN_LAL_VERSION="7.2.1" +MIN_LAL_VERSION="7.2.2" AC_SUBST([MIN_LAL_VERSION]) AC_CANONICAL_HOST -- GitLab From 233cc3963d87688c272b7affe7dd0b962e4c11a0 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 12:09:16 +0100 Subject: [PATCH 47/64] lalsimulation: update packaging for 4.0.2 --- lalsimulation/debian/changelog | 6 ++++++ lalsimulation/lalsimulation.spec.in | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lalsimulation/debian/changelog b/lalsimulation/debian/changelog index d2133b1450..ab0e1ca76f 100644 --- a/lalsimulation/debian/changelog +++ b/lalsimulation/debian/changelog @@ -1,3 +1,9 @@ +lalsimulation (4.0.2-1) unstable; urgency=low + + * Update for 4.0.2 + + -- Adam Mercer Mon, 05 Sep 2022 12:03:14 +0100 + lalsimulation (4.0.1-1) unstable; urgency=low * Update for 4.0.1 diff --git a/lalsimulation/lalsimulation.spec.in b/lalsimulation/lalsimulation.spec.in index d1e5eaed17..754be086de 100644 --- a/lalsimulation/lalsimulation.spec.in +++ b/lalsimulation/lalsimulation.spec.in @@ -182,8 +182,11 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}} # dates should be formatted using: 'date +"%a %b %d %Y"' %changelog +* Mon Sep 05 2022 Adam Mercer 4.0.2-1 +- Update for 4.0.2 + * Thu Aug 18 2022 Adam Mercer 4.0.1-1 -- Update got 4.0.1 +- Update for 4.0.1 * Tue Aug 02 2022 Adam Mercer 4.0.0-1 - Update for 4.0.0 -- GitLab From 0c24dc660ebac5b72171cd04c62e4462c3736f9e Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 12:10:15 +0100 Subject: [PATCH 48/64] lalburst: mark as version 1.6.2 --- lalburst/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalburst/configure.ac b/lalburst/configure.ac index dffd4ff08a..aa275550e2 100644 --- a/lalburst/configure.ac +++ b/lalburst/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([LALBurst],[1.6.1],[lal-discuss@ligo.org]) +AC_INIT([LALBurst],[1.6.2],[lal-discuss@ligo.org]) AC_CONFIG_HEADERS([lib/config.h lib/LALBurstConfig.h]) AC_CONFIG_SRCDIR([lib/EPSearch.c]) AC_CONFIG_AUX_DIR([gnuscripts]) -- GitLab From 8c042d2debc2fc8c8e37b78c91d16cdd4dba2b11 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 12:10:41 +0100 Subject: [PATCH 49/64] lalburst: bump dependency versions --- lalburst/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalburst/configure.ac b/lalburst/configure.ac index aa275550e2..069bdc49f9 100644 --- a/lalburst/configure.ac +++ b/lalburst/configure.ac @@ -68,7 +68,7 @@ AM_INIT_AUTOMAKE([ \ ]) # version requirements -MIN_LAL_VERSION="7.2.1" +MIN_LAL_VERSION="7.2.2" MIN_LALMETAIO_VERSION="3.0.0" MIN_LALSIMULATION_VERSION="4.0.0" MIN_PYTHON_LIGO_LW_VERSION="1.7.0" -- GitLab From f12fadd6cd14c05868067313617d1eded12827ab Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 12:13:18 +0100 Subject: [PATCH 50/64] lalburst: update packaging for 1.6.2 --- lalburst/debian/changelog | 6 ++++++ lalburst/lalburst.spec.in | 3 +++ 2 files changed, 9 insertions(+) diff --git a/lalburst/debian/changelog b/lalburst/debian/changelog index 1ec9a07072..06aa63bf02 100644 --- a/lalburst/debian/changelog +++ b/lalburst/debian/changelog @@ -1,3 +1,9 @@ +lalburst (1.6.2-1) unstable; urgency=low + + * Update for 1.6.2 + + -- Adam Mercer Mon, 05 Sep 2022 12:12:33 +0100 + lalburst (1.6.1-1) unstable; urgency=low * Update for 1.6.1 diff --git a/lalburst/lalburst.spec.in b/lalburst/lalburst.spec.in index b4785237bf..c46e5e8235 100644 --- a/lalburst/lalburst.spec.in +++ b/lalburst/lalburst.spec.in @@ -203,6 +203,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}} # dates should be formatted using: 'date +"%a %b %d %Y"' %changelog +* Mon Sep 05 2022 Adam Mercer 1.6.2-1 +- Update for 1.6.2 + * Thu Aug 18 2022 Adam Mercer 1.6.1-1 - Update for 1.6.1 -- GitLab From f9b9bd8f43ec0b5c1786361e649cb6881598a0f5 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 12:15:27 +0100 Subject: [PATCH 51/64] lalinspiral: mark as version 3.0.2 --- lalinspiral/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalinspiral/configure.ac b/lalinspiral/configure.ac index 46a17f0136..b49f270efe 100644 --- a/lalinspiral/configure.ac +++ b/lalinspiral/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([LALInspiral],[3.0.1],[lal-discuss@ligo.org]) +AC_INIT([LALInspiral],[3.0.2],[lal-discuss@ligo.org]) AC_CONFIG_HEADERS([lib/config.h lib/LALInspiralConfig.h]) AC_CONFIG_SRCDIR([lib/LALInspiral.h]) AC_CONFIG_AUX_DIR([gnuscripts]) -- GitLab From bb0915966350e5a63b085d8d40080ce648cfb8c9 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 12:15:45 +0100 Subject: [PATCH 52/64] lalinspiral: bump dependency versions --- lalinspiral/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalinspiral/configure.ac b/lalinspiral/configure.ac index b49f270efe..3e6ca720dc 100644 --- a/lalinspiral/configure.ac +++ b/lalinspiral/configure.ac @@ -69,7 +69,7 @@ AM_INIT_AUTOMAKE([ \ ]) # version requirements -MIN_LAL_VERSION="7.2.1" +MIN_LAL_VERSION="7.2.2" MIN_LALFRAME_VERSION="2.0.0" MIN_LALMETAIO_VERSION="3.0.0" MIN_LALSIMULATION_VERSION="4.0.0" -- GitLab From f00ae3d7a254b298a9981647f92608315d1f2c8c Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 12:20:33 +0100 Subject: [PATCH 53/64] lalinspiral: update packaging for 3.0.2 --- lalinspiral/debian/changelog | 6 ++++++ lalinspiral/lalinspiral.spec.in | 3 +++ 2 files changed, 9 insertions(+) diff --git a/lalinspiral/debian/changelog b/lalinspiral/debian/changelog index d3aa69bc17..70357eca07 100644 --- a/lalinspiral/debian/changelog +++ b/lalinspiral/debian/changelog @@ -1,3 +1,9 @@ +lalinspiral (3.0.2-1) unstable; urgency=low + + * Update for 3.0.2 + + -- Adam Mercer Mon, 05 Sep 2022 12:18:49 +0100 + lalinspiral (3.0.1-1) unstable; urgency=low * Update for 3.0.1 diff --git a/lalinspiral/lalinspiral.spec.in b/lalinspiral/lalinspiral.spec.in index fd097260fe..514fa39aba 100644 --- a/lalinspiral/lalinspiral.spec.in +++ b/lalinspiral/lalinspiral.spec.in @@ -204,6 +204,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}} # dates should be formatted using: 'date +"%a %b %d %Y"' %changelog +* Mon Sep 05 2022 Adam Mercer 3.0.2-1 +- Update for 3.0.2 + * Thu Aug 18 2022 Adam Mercer 3.0.1-1 - Update for 3.0.1 -- GitLab From 45cff376bbe092d7ceca742212ab455b0966002c Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 12:22:09 +0100 Subject: [PATCH 54/64] lalinference: mark as version 4.1.1 --- lalinference/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalinference/configure.ac b/lalinference/configure.ac index 59d83c03bb..6aa202e7c5 100644 --- a/lalinference/configure.ac +++ b/lalinference/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([LALInference],[4.1.0],[lal-discuss@ligo.org]) +AC_INIT([LALInference],[4.1.1],[lal-discuss@ligo.org]) AC_CONFIG_HEADERS([lib/config.h lib/LALInferenceConfig.h]) AC_CONFIG_SRCDIR([lib/LALInference.h]) AC_CONFIG_AUX_DIR([gnuscripts]) -- GitLab From a75b0c43c28390875aca8010956c4320feee956f Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 12:22:53 +0100 Subject: [PATCH 55/64] lalinference: bump library api version for 4.1.1 --- lalinference/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalinference/configure.ac b/lalinference/configure.ac index 6aa202e7c5..87af3f9b2e 100644 --- a/lalinference/configure.ac +++ b/lalinference/configure.ac @@ -20,7 +20,7 @@ AC_CONFIG_MACRO_DIR([gnuscripts]) # 6. if any interfaces have been removed since the last public release, # then set age to 0. AC_SUBST([LIBCURRENT],[24]) -AC_SUBST([LIBREVISION],[0]) +AC_SUBST([LIBREVISION],[1]) AC_SUBST([LIBAGE],[1]) AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}]) AS_CASE([${host_os}], -- GitLab From ac38554deaea48bb576600145f7add2642756800 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 12:23:13 +0100 Subject: [PATCH 56/64] lalinference: update dependency versions --- lalinference/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalinference/configure.ac b/lalinference/configure.ac index 87af3f9b2e..5c99778721 100644 --- a/lalinference/configure.ac +++ b/lalinference/configure.ac @@ -76,7 +76,7 @@ AM_INIT_AUTOMAKE([ \ # version requirements MIN_GLUE_VERSION="1.54.1" -MIN_LAL_VERSION="7.2.1" +MIN_LAL_VERSION="7.2.2" MIN_LALMETAIO_VERSION="3.0.0" MIN_LALFRAME_VERSION="2.0.0" MIN_LALSIMULATION_VERSION="4.0.0" -- GitLab From 60eb383a568bfe75a63e22807fd640a3e396f1f5 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 12:25:00 +0100 Subject: [PATCH 57/64] lalinference: update packaging for 4.1.1 --- lalinference/debian/changelog | 6 ++++++ lalinference/lalinference.spec.in | 3 +++ 2 files changed, 9 insertions(+) diff --git a/lalinference/debian/changelog b/lalinference/debian/changelog index a3bac7f6d7..cdcbe735b2 100644 --- a/lalinference/debian/changelog +++ b/lalinference/debian/changelog @@ -1,3 +1,9 @@ +lalinference (4.1.1-1) unstable; urgency=low + + * Update for 4.1.1 + + -- Adam Mercer Mon, 05 Sep 2022 12:24:50 +0100 + lalinference (4.1.0-1) unstable; urgency=low * Update for 4.1.0 diff --git a/lalinference/lalinference.spec.in b/lalinference/lalinference.spec.in index 7b6b87eeec..c8f6566ed6 100644 --- a/lalinference/lalinference.spec.in +++ b/lalinference/lalinference.spec.in @@ -241,6 +241,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}} # dates should be formatted using: 'date +"%a %b %d %Y"' %changelog +* Mon Sep 05 2022 Adam Mercer 4.1.1-1 +- Update for 4.1.1 + * Thu Aug 18 2022 Adam Mercer 4.1.0-1 - Update for 4.1.0 -- GitLab From 8f20ee43e2522a98bfb53e00ee862bee9bb7bf4a Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 12:25:38 +0100 Subject: [PATCH 58/64] lalpulsar: mark as version 5.0.2 --- lalpulsar/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalpulsar/configure.ac b/lalpulsar/configure.ac index 40e89b370b..ce843a77db 100644 --- a/lalpulsar/configure.ac +++ b/lalpulsar/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([LALPulsar],[5.0.1],[lal-discuss@ligo.org]) +AC_INIT([LALPulsar],[5.0.2],[lal-discuss@ligo.org]) AC_CONFIG_HEADERS([lib/config.h lib/LALPulsarConfig.h]) AC_CONFIG_SRCDIR([lib/ComputeFstat.c]) AC_CONFIG_AUX_DIR([gnuscripts]) -- GitLab From 98311dfc9fb980aaa09e1caff715efc3cd7f66d7 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 12:26:01 +0100 Subject: [PATCH 59/64] lalpulsar: update dependency versions --- lalpulsar/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalpulsar/configure.ac b/lalpulsar/configure.ac index ce843a77db..5522f6ad32 100644 --- a/lalpulsar/configure.ac +++ b/lalpulsar/configure.ac @@ -86,7 +86,7 @@ AM_INIT_AUTOMAKE([ \ ]) # version requirements -MIN_LAL_VERSION="7.2.1" +MIN_LAL_VERSION="7.2.2" MIN_LALFRAME_VERSION="2.0.0" MIN_LALSIMULATION_VERSION="3.1.0" MIN_LALINFERENCE_VERSION="4.1.0" -- GitLab From 646e40450fdd23c83be636caa474ee6300c20c64 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 12:27:59 +0100 Subject: [PATCH 60/64] lalpulsar: update packaging for 5.0.2 --- lalpulsar/debian/changelog | 6 ++++++ lalpulsar/lalpulsar.spec.in | 3 +++ 2 files changed, 9 insertions(+) diff --git a/lalpulsar/debian/changelog b/lalpulsar/debian/changelog index 4aaf022270..0736f0a05b 100644 --- a/lalpulsar/debian/changelog +++ b/lalpulsar/debian/changelog @@ -1,3 +1,9 @@ +lalpulsar (5.0.2-1) unstable; urgency=low + + * Update for 5.0.2 + + -- Adam Mercer Mon, 05 Sep 2022 12:27:45 +0100 + lalpulsar (5.0.1-1) unstable; urgency=low * Update for 5.0.1 diff --git a/lalpulsar/lalpulsar.spec.in b/lalpulsar/lalpulsar.spec.in index 428ad98b40..4d109873c8 100644 --- a/lalpulsar/lalpulsar.spec.in +++ b/lalpulsar/lalpulsar.spec.in @@ -214,6 +214,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}} # dates should be formatted using: 'date +"%a %b %d %Y"' %changelog +* Mon Sep 05 2022 Adam Mercer 5.0.2-1 +- Update for 5.0.2 + * Thu Aug 18 2022 Adam Mercer 5.0.1-1 - Update for 5.0.1 -- GitLab From b24ffe8323fddd0ea849c569207190cf4c0c085b Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 12:30:14 +0100 Subject: [PATCH 61/64] lalapps: mark as version 9.0.2 --- lalapps/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalapps/configure.ac b/lalapps/configure.ac index 7b892ac5e4..bb2efbd36b 100644 --- a/lalapps/configure.ac +++ b/lalapps/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([LALApps],[9.0.1],[lal-discuss@ligo.org]) +AC_INIT([LALApps],[9.0.2],[lal-discuss@ligo.org]) AC_CONFIG_HEADERS([src/config.h]) AC_CONFIG_SRCDIR([src/lalapps/version2.c.in]) AC_CONFIG_AUX_DIR([gnuscripts]) -- GitLab From c108074fce3403b1ad6d3ecdfb152e0f47d05ed5 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 12:30:34 +0100 Subject: [PATCH 62/64] lalapps: update dependency versions --- lalapps/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalapps/configure.ac b/lalapps/configure.ac index bb2efbd36b..2169856ef9 100644 --- a/lalapps/configure.ac +++ b/lalapps/configure.ac @@ -43,7 +43,7 @@ AM_INIT_AUTOMAKE([ \ # version requirements MIN_FRAMEL_VERSION="8.39.2" -MIN_LAL_VERSION="7.2.1" +MIN_LAL_VERSION="7.2.2" MIN_LALFRAME_VERSION="2.0.0" MIN_LALMETAIO_VERSION="3.0.0" MIN_LALSIMULATION_VERSION="4.0.0" -- GitLab From 655887c480607a34dcb984bd4c7e04b6b9289b16 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 5 Sep 2022 12:32:23 +0100 Subject: [PATCH 63/64] lalapps: update packaging for 9.0.2 --- lalapps/debian/changelog | 6 ++++++ lalapps/lalapps.spec.in | 3 +++ 2 files changed, 9 insertions(+) diff --git a/lalapps/debian/changelog b/lalapps/debian/changelog index 0eacd57137..d70fa09c15 100644 --- a/lalapps/debian/changelog +++ b/lalapps/debian/changelog @@ -1,3 +1,9 @@ +lalapps (9.0.2-1) unstable; urgency=low + + * Update for 9.0.2 + + -- Adam Mercer Mon, 05 Sep 2022 12:32:17 +0100 + lalapps (9.0.1-1) unstable; urgency=low * Update for 9.0.1 diff --git a/lalapps/lalapps.spec.in b/lalapps/lalapps.spec.in index 13075980e7..34f3f04722 100644 --- a/lalapps/lalapps.spec.in +++ b/lalapps/lalapps.spec.in @@ -148,6 +148,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}} # dates should be formatted using: 'date +"%a %b %d %Y"' %changelog +* Mon Sep 05 2022 Adam Mercer 9.0.2-1 +- Update for 9.0.2 + * Thu Aug 18 2022 Adam Mercer 9.0.1-1 - Update for 9.0.1 -- GitLab From f7003a0d1b9811e05caba042bccc6baaa4cdd020 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Fri, 26 Aug 2022 11:53:11 -0700 Subject: [PATCH 64/64] top-level: mark as version 7.8 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f8c89a4221..3dadcaad26 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([LALSuite],[7.7],[lal-discuss@ligo.org]) +AC_INIT([LALSuite],[7.8],[lal-discuss@ligo.org]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_AUX_DIR([gnuscripts]) AC_CONFIG_MACRO_DIR([gnuscripts]) -- GitLab