move hypot to optional for windows, fix pow and log2

Signed-off-by: mattip <[email protected]>

Author: mattip

numpy/core/setup_common.py

@@ -124,14 +124,16 @@ def set_sig(sig):
         "floor", "ceil", "sqrt", "log10", "log", "exp", "asin",
         "acos", "atan", "fmod", 'modf', 'frexp', 'ldexp',
         "expm1", "log1p", "acosh", "asinh", "atanh",
-        "rint", "trunc", "exp2", "hypot", "atan2",
+        "rint", "trunc", "exp2", "atan2",
         "copysign", "nextafter", "strtoll", "strtoull", "cbrt"]
 
 OPTIONAL_STDFUNCS = [
         # cygwin
         "log2",
         # macos for powl
         "pow",
+        # 32-bit windows
+        "hypot"
 ]
 
 OPTIONAL_LOCALE_FUNCS = ["strtold_l"]

numpy/core/src/npymath/npy_math_internal.h.src

@@ -94,10 +94,11 @@ static const npy_uint64 MAGIC64[] = {0x5555555555555555ull, 0x3333333333333333ul
  * classification instead of calling npy_isinf/npy_isnan: we should have some
  * macros for this, though, instead of doing it manually
  */
-#ifndef HAVE_LOG2
 NPY_INPLACE double npy_log2(double x)
 {
-#ifdef HAVE_FREXP
+#ifdef HAVE_LOG2
+    return log2(x);
+#elif defined(HAVE_FREXP)
     if (!npy_isfinite(x) || x <= 0.) {
         /* special value result */
         return npy_log(x);
@@ -127,7 +128,38 @@ NPY_INPLACE double npy_log2(double x)
     return NPY_LOG2E * npy_log(x);
 #endif
 }
+
+NPY_INPLACE double npy_hypot(double x, double y)
+{
+#ifdef HAVE_HYPOT
+    return hypot(x, y);
+#else
+    double yx;
+
+    if (npy_isinf(x) || npy_isinf(y)) {
+        return NPY_INFINITY;
+    }
+
+    if (npy_isnan(x) || npy_isnan(y)) {
+        return NPY_NAN;
+    }
+
+    x = npy_fabs(x);
+    y = npy_fabs(y);
+    if (x < y) {
+        double temp = x;
+        x = y;
+        y = temp;
+    }
+    if (x == 0.) {
+        return 0.;
+    }
+    else {
+        yx = y/x;
+        return x*npy_sqrt(1.+yx*yx);
+    }
 #endif
+}
 
 /*
  *
@@ -194,12 +226,73 @@ NPY_INPLACE @type@ npy_@kind@@c@(@type@ x)
 
 /**end repeat1**/
 
+#undef WORKAROUND_APPLE_TRIG_BUG
+
+/* C99 mandatory */
+
+/**begin repeat1
+ * #kind = atan2,fmod,copysign#
+ * #KIND = ATAN2,FMOD,COPYSIGN#
+ */
+NPY_INPLACE @type@ npy_@kind@@c@(@type@ x, @type@ y)
+{
+    return NPY__FP_SFX(@kind@)(x, y);
+}
+/**end repeat1**/
+
+
+NPY_INPLACE @type@ npy_modf@c@(@type@ x, @type@ *iptr)
+{
+    return NPY__FP_SFX(modf)(x, iptr);
+}
+
+NPY_INPLACE @type@ npy_ldexp@c@(@type@ x, int exp)
+{
+    return NPY__FP_SFX(ldexp)(x, exp);
+}
+
+NPY_INPLACE @type@ npy_frexp@c@(@type@ x, int* exp)
+{
+    return NPY__FP_SFX(frexp)(x, exp);
+}
+
+NPY_INPLACE @type@ npy_cbrt@c@(@type@ x)
+{
+    return NPY__FP_SFX(cbrt)(x);
+}
+
+/**end repeat**/
+
 /* Optional C99 functions */
 
+/**begin repeat
+ * #type = npy_longdouble, npy_float#
+ * #TYPE = LONGDOUBLE, FLOAT#
+ * #c = l,f#
+ * #C = L,F#
+ */
+#undef NPY__FP_SFX
+#if NPY_SIZEOF_@TYPE@ == NPY_SIZEOF_DOUBLE
+    #define NPY__FP_SFX(X) X
+#else
+    #define NPY__FP_SFX(X) NPY_CAT(X, @c@)
+#endif
+
 /**begin repeat1
  * #kind = log2#
  * #KIND = LOG2#
  */
+
+#ifdef @kind@@c@
+#undef @kind@@c@
+#endif
+#ifndef HAVE_@KIND@@C@
+NPY_INPLACE @type@ npy_@kind@@c@(@type@ x)
+{
+    return (@type@) npy_@kind@((double)x);
+}
+#endif
+
 #ifdef HAVE_@KIND@@C@
 NPY_INPLACE @type@ npy_@kind@@c@(@type@ x)
 {
@@ -209,11 +302,10 @@ NPY_INPLACE @type@ npy_@kind@@c@(@type@ x)
 
 /**end repeat1**/
 
-#undef WORKAROUND_APPLE_TRIG_BUG
 
 /**begin repeat1
- * #kind = pow#
- * #KIND = POW#
+ * #kind = hypot,pow#
+ * #KIND = HYPOT,POW#
  */
 #ifdef @kind@@c@
 #undef @kind@@c@
@@ -232,42 +324,10 @@ NPY_INPLACE @type@ npy_@kind@@c@(@type@ x, @type@ y)
 }
 #endif
 /**end repeat1**/
+/**end repeat**/
 
 
-/* C99 mandatory */
-
-/**begin repeat1
- * #kind = atan2,hypot,fmod,copysign#
- * #KIND = ATAN2,HYPOT,FMOD,COPYSIGN#
- */
-NPY_INPLACE @type@ npy_@kind@@c@(@type@ x, @type@ y)
-{
-    return NPY__FP_SFX(@kind@)(x, y);
-}
-/**end repeat1**/
-
-
-NPY_INPLACE @type@ npy_modf@c@(@type@ x, @type@ *iptr)
-{
-    return NPY__FP_SFX(modf)(x, iptr);
-}
-
-NPY_INPLACE @type@ npy_ldexp@c@(@type@ x, int exp)
-{
-    return NPY__FP_SFX(ldexp)(x, exp);
-}
-
-NPY_INPLACE @type@ npy_frexp@c@(@type@ x, int* exp)
-{
-    return NPY__FP_SFX(frexp)(x, exp);
-}
-
-NPY_INPLACE @type@ npy_cbrt@c@(@type@ x)
-{
-    return NPY__FP_SFX(cbrt)(x);
-}
 #undef NPY__FP_SFX
-/**end repeat**/
 
 
 /*
@@ -603,3 +663,10 @@ npy_popcount@c@(npy_@type@ a)
     return npy_popcountu@c@(a < 0 ? -a : a);
 }
 /**end repeat**/
+
+/* XXX: will moving this to a define break anything? */
+
+NPY_INPLACE double npy_pow(double x, double y)
+{
+    return pow(x, y);
+}