python-numpy: Ensure `_npy_scaled_cexp{, f, l}` is defined when needed
diff mbox series

Message ID 20170922223053.25433-1-abrodkin@synopsys.com
State Accepted
Headers show
Series
  • python-numpy: Ensure `_npy_scaled_cexp{, f, l}` is defined when needed
Related show

Commit Message

Alexey Brodkin Sept. 22, 2017, 10:30 p.m. UTC
With update of Numpy to the latest version we've got one change which
breaks Numpy compilcation in some cases.

This change back-ports upstream fix from:
https://github.com/numpy/numpy/pull/9740

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Rahul Bedarkar <rahulbedarkar89@gmail.com>
Cc: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Peter Korsgaard <peter@korsgaard.com>
---

Note it supersedes http://patchwork.ozlabs.org/patch/816381/.

 ..._npy_scaled_cexp-f-l-is-defined-when-need.patch | 43 ++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 package/python-numpy/0003-BUG-Ensure-_npy_scaled_cexp-f-l-is-defined-when-need.patch

Comments

Arnout Vandecappelle Sept. 26, 2017, 8:58 p.m. UTC | #1
On 23-09-17 00:30, Alexey Brodkin wrote:
> With update of Numpy to the latest version we've got one change which
> breaks Numpy compilcation in some cases.
> 
> This change back-ports upstream fix from:
> https://github.com/numpy/numpy/pull/9740
> 
> Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
> Cc: Rahul Bedarkar <rahulbedarkar89@gmail.com>
> Cc: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
> Cc: Arnout Vandecappelle <arnout@mind.be>
> Cc: Peter Korsgaard <peter@korsgaard.com>

 Applied to master, thanks. It has apparently also been merged upstream, great!

 Regards,
 Arnout

[snip]

Patch
diff mbox series

diff --git a/package/python-numpy/0003-BUG-Ensure-_npy_scaled_cexp-f-l-is-defined-when-need.patch b/package/python-numpy/0003-BUG-Ensure-_npy_scaled_cexp-f-l-is-defined-when-need.patch
new file mode 100644
index 0000000000..a243df544e
--- /dev/null
+++ b/package/python-numpy/0003-BUG-Ensure-_npy_scaled_cexp-f-l-is-defined-when-need.patch
@@ -0,0 +1,43 @@ 
+From 9aa5d577c58f04f9606674dd6f326aee1bf1e6e8 Mon Sep 17 00:00:00 2001
+From: Charles Harris <charlesr.harris@gmail.com>
+Date: Thu, 21 Sep 2017 10:10:05 -0600
+Subject: [PATCH] BUG: Ensure `_npy_scaled_cexp{,f,l}` is defined when needed.
+
+The `_npy_scaled_cexp{,f,l}` functions were previously only defined when
+the npy_cexp fallback functions were needed, but they are also called by
+the npy_csinh and npy_ccosh functions.
+
+Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
+---
+ numpy/core/src/npymath/npy_math_complex.c.src | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/numpy/core/src/npymath/npy_math_complex.c.src b/numpy/core/src/npymath/npy_math_complex.c.src
+index a82a6737c..fb31e8e6a 100644
+--- a/numpy/core/src/npymath/npy_math_complex.c.src
++++ b/numpy/core/src/npymath/npy_math_complex.c.src
+@@ -184,7 +184,9 @@ npy_carg@c@(@ctype@ z)
+ #define SCALED_CEXP_LOWERL 11357.216553474703895L
+ #define SCALED_CEXP_UPPERL 22756.021937783004509L
+ 
+-#ifndef HAVE_CEXP@C@
++#if !defined(HAVE_CSINH@C@) || \
++    !defined(HAVE_CCOSH@C@) || \
++    !defined(HAVE_CEXP@C@)
+ 
+ static
+ @ctype@
+@@ -212,6 +214,10 @@ _npy_scaled_cexp@c@(@type@ x, @type@ y, npy_int expt)
+                          npy_ldexp@c@(mant * mantsin, expt + exsin));
+ }
+ 
++#endif
++
++#ifndef HAVE_CEXP@C@
++
+ @ctype@
+ npy_cexp@c@(@ctype@ z)
+ {
+-- 
+2.11.0
+