Merge pull request #22161 from mattip/simplify-npy_math2

MAINT: simplify complex math function handling in npymath

numpy/core/feature_detection_cmath.h

@@ -0,0 +1,41 @@
+#include <complex.h>
+
+#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
+#define cfloat _Fcomplex
+#define cdouble _Dcomplex
+#define cldouble _Lcomplex
+#else
+#define cfloat complex float
+#define cdouble complex double
+#define cldouble complex long double
+#endif
+
+cfloat csinf(cfloat);
+cfloat ccosf(cfloat);
+cfloat ctanf(cfloat);
+cfloat csinhf(cfloat);
+cfloat ccoshf(cfloat);
+cfloat ctanhf(cfloat);
+float crealf(cfloat);
+float cimagf(cfloat);
+cfloat conjf(cfloat);
+
+cdouble csin(cdouble);
+cdouble ccos(cdouble);
+cdouble ctan(cdouble);
+cdouble csinh(cdouble);
+cdouble ccosh(cdouble);
+cdouble ctanh(cdouble);
+double creal(cdouble);
+double cimag(cdouble);
+cdouble conj(cdouble);
+
+cldouble csinl(cldouble);
+cldouble ccosl(cldouble);
+cldouble ctanl(cldouble);
+cldouble csinhl(cldouble);
+cldouble ccoshl(cldouble);
+cldouble ctanhl(cldouble);
+long double creall(cldouble);
+long double cimagl(cldouble);
+cldouble conjl(cldouble);

numpy/core/setup.py

@@ -134,7 +134,7 @@ def check_math_capabilities(config, ext, moredefs, mathlibs):
     def check_func(
         func_name,
         decl=False,
-        headers=["feature_detection_math.h"],
+        headers=["feature_detection_math.h", "feature_detection_cmath.h"],
     ):
         return config.check_func(
             func_name,
@@ -145,8 +145,10 @@ def check_func(
             headers=headers,
         )
 
-    def check_funcs_once(funcs_name, headers=["feature_detection_math.h"],
-                         add_to_moredefs=True):
+    def check_funcs_once(
+            funcs_name,
+            headers=["feature_detection_math.h", "feature_detection_cmath.h"],
+            add_to_moredefs=True):
         call = dict([(f, True) for f in funcs_name])
         call_args = dict([(f, FUNC_CALL_ARGS[f]) for f in funcs_name])
         st = config.check_funcs_once(
@@ -161,7 +163,9 @@ def check_funcs_once(funcs_name, headers=["feature_detection_math.h"],
             moredefs.extend([(fname2def(f), 1) for f in funcs_name])
         return st
 
-    def check_funcs(funcs_name, headers=["feature_detection_math.h"]):
+    def check_funcs(
+            funcs_name,
+            headers=["feature_detection_math.h", "feature_detection_cmath.h"]):
         # Use check_funcs_once first, and if it does not work, test func per
         # func. Return success only if all the functions are available
         if not check_funcs_once(funcs_name, headers=headers):

numpy/core/setup_common.py

@@ -102,12 +102,14 @@ def set_sig(sig):
     args = args.rpartition(")")[0]
     funcname = prefix.rpartition(" ")[-1]
     args = [arg.strip() for arg in args.split(",")]
-    FUNC_CALL_ARGS[funcname] = ", ".join("(%s) 0" % arg for arg in args)
+    # We use {0} because 0 alone cannot be cast to complex on MSVC in C:
+    FUNC_CALL_ARGS[funcname] = ", ".join("(%s){0}" % arg for arg in args)
 
 
 for file in [
     "feature_detection_locale.h",
     "feature_detection_math.h",
+    "feature_detection_cmath.h",
     "feature_detection_misc.h",
     "feature_detection_stdio.h",
 ]:
@@ -128,6 +130,8 @@ def set_sig(sig):
     "rint", "trunc", "exp2", 
     "copysign", "nextafter", "strtoll", "strtoull", "cbrt",
     "log2", "pow", "hypot", "atan2",
+    "csin", "csinh", "ccos", "ccosh", "ctan", "ctanh",
+    "creal", "cimag", "conj"
 ]
 
 OPTIONAL_LOCALE_FUNCS = ["strtold_l"]
@@ -147,8 +151,7 @@ def set_sig(sig):
     ]
 C99_COMPLEX_FUNCS = [
     "cabs", "cacos", "cacosh", "carg", "casin", "casinh", "catan",
-    "catanh", "ccos", "ccosh", "cexp", "cimag", "clog", "conj", "cpow",
-    "cproj", "creal", "csin", "csinh", "csqrt", "ctan", "ctanh"
+    "catanh", "cexp", "clog", "cpow", "csqrt",
     ]
 
 OPTIONAL_HEADERS = [