pool/lalapps
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 919074 from home:badshah400:branches:science

Browse Source 
Add lalapps-disable-testWeave-for-non-x86_64.patch: Disable Weave related tests on all but x86_64 where tolerance errors show up, see https://git.ligo.org/lscsoft/lalsuite/-/issues/105, boo#1189928; introduces BuildRequires: libtool and requires running autoreconf before configure.

OBS-URL: https://build.opensuse.org/request/show/919074
OBS-URL: https://build.opensuse.org/package/show/science/lalapps?expand=0&rev=13
This commit is contained in:
Atri Bhattacharya 2021-09-15 09:05:43 +00:00 committed by Git OBS Bridge
parent 7c573533f8
commit 3528a24633
3 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lalapps-disable-testWeave-for-non-x86_64.patch Normal file
View File

@ -0,0 +1,33 @@
Index: lalapps-7.2.0/src/pulsar/Weave/Makefile.am
===================================================================
--- lalapps-7.2.0.orig/src/pulsar/Weave/Makefile.am
+++ lalapps-7.2.0/src/pulsar/Weave/Makefile.am
@@ -75,5 +75,10 @@ if !CFITSIO
skip_tests += $(test_scripts)
endif
+# Skip Weave tests on non-x86_64
+if SKIP_WEAVE_TESTS
+skip_tests += $(test_scripts)
+endif
+
# testWeave_reference_results.sh requires output from tests that compare against reference results
testWeave_reference_results.log: testWeave_interpolating.log testWeave_non_interpolating.log testWeave_single_segment.log
Index: lalapps-7.2.0/configure.ac
===================================================================
--- lalapps-7.2.0.orig/configure.ac
+++ lalapps-7.2.0/configure.ac
@@ -318,6 +318,13 @@ AM_CPPFLAGS="-I\$(top_srcdir)/src ${AM_C
# RedHat-derived systems.
AC_SUBST([pkgpythondir], ["\${pkgpyexecdir}"])
+# testWeave_* results have tolerance issues that show up in some archs, use only for x86_64
+# See https://git.ligo.org/lscsoft/lalsuite/-/issues/105
+AC_MSG_CHECKING([if arch is non-x86_64 so weave tests should be disabled])
+AC_DEFINE([SKIP_WEAVE_TESTS], [0], [Set to 1 for non-x86_64 architectures])
+AS_IF([test x"$(arch)" != "xx86_64"], AC_MSG_RESULT([yes]), AC_MSG_RESULT([no]))
+AM_CONDITIONAL([SKIP_WEAVE_TESTS], [test x"$(arch)" != "xx86_64"])
+
# output
AC_OUTPUT
AC_MSG_NOTICE([

9
lalapps.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Sep 13 13:58:08 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>
- Add lalapps-disable-testWeave-for-non-x86_64.patch: Disable
Weave related tests on all but x86_64 where tolerance errors
show up, see https://git.ligo.org/lscsoft/lalsuite/-/issues/105,
boo#1189928; introduces BuildRequires: libtool and requires
running autoreconf before configure.
-------------------------------------------------------------------
Tue Jun 8 20:51:27 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>

8
lalapps.spec
View File

@ -31,6 +31,8 @@ Source: http://software.ligo.org/lscsoft/source/lalsuite/%{name}-%{versi
Patch0: lalapps-fix-uninitialised-var.patch
# PATCH-FIX-UPSTREAM lalapps-gcc11-array-bounds-decl.patch badshah400@gmail.com -- Fix building with gcc 11 by correcting array bounds declaration; patch part of upstream merge request [https://git.ligo.org/lscsoft/lalsuite/-/merge_requests/1605]
Patch1: lalapps-gcc11-array-bounds-decl.patch
# PATCH-FIX-UPSTREAM lalapps-disable-testWeave-for-non-x86_64.patch badshah400@gmail.com -- Disable Weave related tests on all but x86_64 where tolerance errors show up, see https://git.ligo.org/lscsoft/lalsuite/-/issues/105
Patch2: lalapps-disable-testWeave-for-non-x86_64.patch
BuildRequires: %{python_module astropy}
BuildRequires: %{python_module devel}
BuildRequires: %{python_module glue}
@ -67,6 +69,9 @@ BuildRequires: bc
BuildRequires: lalpulsar-data
Requires: python3-%{name} = %{version}
# /SECTION
# SECTION Required for Patch2
BuildRequires: libtool
# /SECTION
# 32-bit no longer supported upstream
ExcludeArch: %{ix86}
%define python_subpackage_only 1
@ -110,6 +115,8 @@ sed -Ei "1{s|/usr/bin/env python|%{_bindir}/python3|}" \
src/pulsar/HeterodyneSearch/make_frame_cache
%build
# Patch2 touches autotool files
autoreconf -fvi
%{python_expand # Necessary to run %%configure for all active python flavors
export PYTHON=%{_bindir}/$python
mkdir ../$python
@ -117,7 +124,6 @@ cp -pr ./ ../$python
pushd ../$python
# FIXME: Failures because XLAL_ERROR implictly converts to function return type
export CFLAGS+=" -Wno-enum-conversion"
%configure \
%configure --enable-swig
%make_build
popd