[numexpr] 03/04: Drop 0002-relax-test-on-sparc.patch: it does not actually fix the issue

Antonio Valentino a_valentino-guest at moszumanska.debian.org
Sun Dec 8 12:48:13 UTC 2013


This is an automated email from the git hooks/post-receive script.

a_valentino-guest pushed a commit to branch master
in repository numexpr.

commit 362efb4a4439f939013329e34ca7aa07cbbfe381
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sun Dec 8 12:22:40 2013 +0000

    Drop 0002-relax-test-on-sparc.patch: it does not actually fix the issue
---
 debian/changelog                              |  3 ++
 debian/patches/0002-relax-test-on-sparc.patch | 47 ---------------------------
 debian/patches/series                         |  1 -
 3 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 209d4d3..41b977d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ numexpr (2.2.2-3) UNRELEASED; urgency=medium
 
   * debian/rules:
     - run unittests in verbose mode
+  * debian/patches
+    - dropped patch: 0002-relax-test-on-sparc.patch
+      It does not actually fix the issue.
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 08 Dec 2013 12:12:48 +0000
 
diff --git a/debian/patches/0002-relax-test-on-sparc.patch b/debian/patches/0002-relax-test-on-sparc.patch
deleted file mode 100644
index e9f6aae..0000000
--- a/debian/patches/0002-relax-test-on-sparc.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Tue, 26 Nov 2013 18:34:19 +0000
-Subject: relax test on sparc
-
-A couple of tests fail on sparc (debug mode) because assertions on
-floating point array comparisons are not satisfied.
-As temporary workaround the precision of floating point comparison is
-relaxed (only on sparc) in order to allow the test to pass.
----
- numexpr/tests/test_numexpr.py | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/numexpr/tests/test_numexpr.py b/numexpr/tests/test_numexpr.py
-index 3b4ba80..3544d0f 100644
---- a/numexpr/tests/test_numexpr.py
-+++ b/numexpr/tests/test_numexpr.py
-@@ -220,7 +220,11 @@ class test_evaluate(TestCase):
-         b = arange(1e6) * 0.1
-         x = (a + 2*b) / (1 + a + 4*b*b)
-         y = evaluate("(a + 2*b) / (1 + a + 4*b*b)")
--        assert_array_almost_equal(x, y)
-+        import platform
-+        if 'sparc' in platform.machine():
-+            assert_array_almost_equal(x, y, 4)
-+        else:
-+            assert_array_almost_equal(x, y)
- 
-     def test_complex_expr(self):
-         def complex(a, b):
-@@ -290,12 +294,16 @@ class test_evaluate(TestCase):
-             assert_array_almost_equal(b, c)
- 
-     def test_changing_nthreads_01_dec(self):
-+        import platform
-         a = linspace(-1, 1, 1e6)
-         b = ((.25*a + .75)*a - 1.5)*a - 2
-         for nthreads in range(6, 1, -1):
-             numexpr.set_num_threads(nthreads)
-             c = evaluate("((.25*a + .75)*a - 1.5)*a - 2")
--            assert_array_almost_equal(b, c)
-+            if 'sparc' in platform.machine():
-+                assert_array_almost_equal(b, c, 4)
-+            else:
-+                assert_array_almost_equal(b, c)
- 
- 
- tests = [
diff --git a/debian/patches/series b/debian/patches/series
index 2784b5d..dbfc991 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-debian-changes-1.3.1-1.patch
-0002-relax-test-on-sparc.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/numexpr.git



More information about the debian-science-commits mailing list