|
@@ -1,43 +0,0 @@
|
|
|
-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
|
|
|
-
|