Add hypot

Author: lshaw8317

numexpr/expressions.py

@@ -348,6 +348,7 @@ def multiply(x, y):
 
     'fmod': func(numpy.fmod, 'float'),
     'arctan2': func(numpy.arctan2, 'float'),
+    'hypot': func(numpy.hypot, 'float'),
 
     'log': func(numpy.log, 'float'),
     'log1p': func(numpy.log1p, 'float'),

numexpr/functions.hpp

@@ -49,6 +49,7 @@ FUNC_FF(FUNC_FF_LAST,    NULL,          NULL,   NULL,    NULL)
 #endif
 FUNC_FFF(FUNC_FMOD_FFF,    "fmod_fff",    fmodf,  fmodf2,  vsfmod)
 FUNC_FFF(FUNC_ARCTAN2_FFF, "arctan2_fff", atan2f, atan2f2, vsAtan2)
+FUNC_FFF(FUNC_HYPOT_FFF, "hypot_fff", hypotf, hypotf2, vsHypot)
 FUNC_FFF(FUNC_FFF_LAST,    NULL,          NULL,   NULL,    NULL)
 #ifdef ELIDE_FUNC_FFF
 #undef ELIDE_FUNC_FFF
@@ -122,6 +123,7 @@ FUNC_BF(FUNC_BF_LAST,    NULL,            NULL,        NULL,    NULL)
 #endif
 FUNC_DDD(FUNC_FMOD_DDD,    "fmod_ddd",    fmod,  vdfmod)
 FUNC_DDD(FUNC_ARCTAN2_DDD, "arctan2_ddd", atan2, vdAtan2)
+FUNC_DDD(FUNC_HYPOT_DDD, "hypot_ddd", hypot, vdHypot)
 FUNC_DDD(FUNC_DDD_LAST,    NULL,          NULL,  NULL)
 #ifdef ELIDE_FUNC_DDD
 #undef ELIDE_FUNC_DDD

numexpr/interpreter.cpp

@@ -413,6 +413,16 @@ static void vzLog1p(MKL_INT n, const MKL_Complex16* x1, MKL_Complex16* dest)
     vzLn(n, dest, dest);
 };
 
+static void vzLog2(MKL_INT n, const MKL_Complex16* x1, MKL_Complex16* dest)
+{
+    MKL_INT j;
+    vzLn(n, x1, dest);
+    for (j=0; j<n; j++) {
+        dest[j].real = dest[j].real * M_LOG2_E;
+        dest[j].imag = dest[j].imag * M_LOG2_E;
+    };
+};
+
 /* Use this instead of native vzAbs in VML as it seems to work badly */
 static void vzAbs_(MKL_INT n, const MKL_Complex16* x1, MKL_Complex16* dest)
 {

numexpr/msvc_function_stubs.hpp

@@ -42,6 +42,7 @@
 #define fmodf(x, y)    ((float)fmod((double)(x), (double)(y)))
 #define atan2f(x, y)    ((float)atan2((double)(x), (double)(y)))
 #define ceilf(x)    ((float)ceil((double)(x)))
+#define hypotf(x)    ((float)hypot((double)(x)))
 
 /* The next are directly called from interp_body.cpp */
 #define powf(x, y)    ((float)pow((double)(x), (double)(y)))
@@ -148,6 +149,11 @@ inline float atan2f2(float x, float y) {
     return atan2f(x, y);
 }
 
+inline float hypotf2(float x, float y) {
+    return hypotf(x, y);
+}
+
+
 // Boolean output functions
 inline bool isnanf2(float x) {
     return isnanf_(x);

numexpr/necompiler.py

@@ -74,6 +74,7 @@
     "isnan",
     "isfinite",
     "isinf",
+    "hypot"
     ]
 
 

numexpr/tests/test_numexpr.py

@@ -25,9 +25,9 @@
 from numpy import (allclose, arange, arccos, arccosh, arcsin, arcsinh, arctan,
                    arctan2, arctanh, array, array_equal, cdouble, ceil, conj,
                    copy, cos, cosh, empty, exp, expm1, float64, floor, fmod,
-                   int32, int64, isinf, isnan, linspace, log, log1p, log2,
-                   log10, ones_like, prod, ravel, rec, shape, sin, sinh, sqrt,
-                   sum, tan, tanh, uint16, where, zeros)
+                   hypot, int32, int64, isinf, isnan, linspace, log, log1p,
+                   log2, log10, ones_like, prod, ravel, rec, shape, sin, sinh,
+                   sqrt, sum, tan, tanh, uint16, where, zeros)
 from numpy.testing import (assert_allclose, assert_array_almost_equal,
                            assert_array_equal, assert_equal)
 
@@ -714,7 +714,7 @@ def test_ex_uses_vml(self):
         vml_funcs = [ "sin", "cos", "tan", "arcsin", "arccos", "arctan",
                       "sinh", "cosh", "tanh", "arcsinh", "arccosh", "arctanh",
                       "log", "log1p","log10", "log2", "exp", "expm1", "abs", "conj",
-                      "arctan2", "fmod"]
+                      "arctan2", "fmod", "hypot"]
         for func in vml_funcs:
             strexpr = func+'(a)'
             _, ex_uses_vml = numexpr.necompiler.getExprNames(strexpr, {})
@@ -813,7 +813,7 @@ def test_changing_nthreads_01_dec(self):
 tests.append(('1_ARG_FUNCS', func1tests))
 
 func2tests = []
-for func in ['arctan2', 'fmod']:
+for func in ['arctan2', 'fmod', 'hypot']:
     func2tests.append("a + %s(b+c, d+1)" % func)
     func2tests.append("a + %s(b+c, 1)" % func)
     func2tests.append("a + %s(1, d+1)" % func)
@@ -877,6 +877,7 @@ class Skip(Exception): pass
                 or "%" in expr
                 or "arctan2" in expr
                 or "fmod" in expr
+                or "hypot" in expr
                 or "floor" in expr
                 or "ceil" in expr
             )