r46660 - in /packages/healpix/healpix-cxx/trunk/debian: README.Debian changelog rules

[lsinger-guest at users.alioth.debian.org]

Author: lsinger-guest
Date: Fri May 16 19:29:06 2014
New Revision: 46660

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46660
Log:
healpix-cxx: disable OpenMP on kfreebsd-i386, closes #740889

Modified:
    packages/healpix/healpix-cxx/trunk/debian/README.Debian
    packages/healpix/healpix-cxx/trunk/debian/changelog
    packages/healpix/healpix-cxx/trunk/debian/rules

Modified: packages/healpix/healpix-cxx/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/healpix/healpix-cxx/trunk/debian/README.Debian?rev=46660&op=diff
==============================================================================
--- packages/healpix/healpix-cxx/trunk/debian/README.Debian	(original)
+++ packages/healpix/healpix-cxx/trunk/debian/README.Debian	Fri May 16 19:29:06 2014
@@ -2,3 +2,7 @@
 The community's interest in healpix-cxx is only in the shared library
 and its Python wrapper, Healpy. The binaries will eventually be provided
 via the functionally superior Fortran implementation.
+
+On the kfreebsd-i386 architecture, the map2alm_iter2 function can fail to
+converge if using multiple OpenMP cores. For this reason, OpenMP is disabled
+on kfreebsd-i386.

Modified: packages/healpix/healpix-cxx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/healpix/healpix-cxx/trunk/debian/changelog?rev=46660&op=diff
==============================================================================
--- packages/healpix/healpix-cxx/trunk/debian/changelog	(original)
+++ packages/healpix/healpix-cxx/trunk/debian/changelog	Fri May 16 19:29:06 2014
@@ -1,3 +1,11 @@
+healpix-cxx (3.11.2-6) UNRELEASED; urgency=medium
+
+  * Disable OpenMP on kfreebsd-i386. When using multiple OpenMP threads on
+    this architecture, the map2alm_iter2 function does not converge. As a
+    result, the unit tests would run indefinitely. Closes: #740889
+
+ -- Leo Singer <leo.singer at ligo.org>  Fri, 16 May 2014 11:37:27 -0700
+
 healpix-cxx (3.11.2-5) unstable; urgency=medium
 
   * Add -dbg package

Modified: packages/healpix/healpix-cxx/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/healpix/healpix-cxx/trunk/debian/rules?rev=46660&op=diff
==============================================================================
--- packages/healpix/healpix-cxx/trunk/debian/rules	(original)
+++ packages/healpix/healpix-cxx/trunk/debian/rules	Fri May 16 19:29:06 2014
@@ -1,7 +1,21 @@
 #!/usr/bin/make -f
+
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+# If building for kfreebsd-i386, disable OpenMP.
+# On this architecture, if OpenMP is enabled the map2alm_iter2 function
+# fails to converge, so the check_alm2mapalm unit test runs indefinitely.
+ifeq ($(DEB_HOST_ARCH),kfreebsd-i386)
+EXTRA_CONFIGURE_ARGS=--disable-openmp
+else
+EXTRA_CONFIGURE_ARGS=
+endif
 
 %:
 	dh $@
 
+override_dh_auto_configure:
+	dh_auto_configure -- $(EXTRA_CONFIGURE_ARGS)
+
 override_dh_strip:
 	dh_strip --dbg-package=libhealpix-cxx0-dbg