summaryrefslogtreecommitdiff
path: root/numpy/core/include
diff options
context:
space:
mode:
authorSebastian Berg <sebastianb@nvidia.com>2023-01-05 14:11:14 +0100
committerSebastian Berg <sebastianb@nvidia.com>2023-01-05 14:48:54 +0100
commitd0a613cc50967d2f723111bb3b3ec83df606ddfd (patch)
tree7feb80aaab827891b6ef8221c8353d2ab037f3ee /numpy/core/include
parent3b5ba53b645f486319ec181871525b76393e5b75 (diff)
downloadnumpy-d0a613cc50967d2f723111bb3b3ec83df606ddfd.tar.gz
MAINT: Move export for scipy arm64 helper into main module
This is a follow up to gh-22679 which addressed gh-22673. The main thing is that we want the functions to be available after importing NumPy, so they need to be part of multiarray. However, `npymath` is a static library, so the symbols are not really exported there. The former PR did actually work in practice but this seems like it is technically the right place? For some reason, I had to add nextafter to be able to do: from scipy.spatial.distance import euclidean with the SciPy 1.9.3 wheels. SciPy test collection works with this for the 1.9.3 wheel, so this should be all the symbols hopefully.
Diffstat (limited to 'numpy/core/include')
-rw-r--r--numpy/core/include/numpy/npy_math.h14
1 files changed, 3 insertions, 11 deletions
diff --git a/numpy/core/include/numpy/npy_math.h b/numpy/core/include/numpy/npy_math.h
index a1fd11396..2fcd41eb0 100644
--- a/numpy/core/include/numpy/npy_math.h
+++ b/numpy/core/include/numpy/npy_math.h
@@ -184,30 +184,22 @@ NPY_INPLACE double npy_atan2(double x, double y);
#define npy_fmod fmod
#define npy_floor floor
#define npy_expm1 expm1
+#define npy_log1p log1p
#define npy_acosh acosh
+#define npy_asinh asinh
#define npy_atanh atanh
#define npy_rint rint
#define npy_trunc trunc
#define npy_exp2 exp2
#define npy_frexp frexp
#define npy_ldexp ldexp
+#define npy_copysign copysign
#define npy_exp exp
#define npy_sqrt sqrt
#define npy_pow pow
#define npy_modf modf
#define npy_nextafter nextafter
-#if defined(__arm64__) && defined(__APPLE__)
-/* due to a build problem with scipy, export these as functions */
-NPY_INPLACE double npy_asinh(double x);
-NPY_INPLACE double npy_copysign(double y, double x);
-NPY_INPLACE double npy_log1p(double x);
-#else
-#define npy_asinh asinh
-#define npy_copysign copysign
-#define npy_log1p log1p
-#endif
-
double npy_spacing(double x);
/*