Added copysign, signbit

Author: lshaw8317

numexpr/expressions.py

@@ -350,6 +350,7 @@ def multiply(x, y):
     'arctan2': func(numpy.arctan2, 'float'),
     'hypot': func(numpy.hypot, 'double'),
     'nextafter': func(numpy.nextafter, 'double'),
+    'copysign': func(numpy.copysign, 'double'),
 
     'log': func(numpy.log, 'float'),
     'log1p': func(numpy.log1p, 'float'),
@@ -371,9 +372,10 @@ def multiply(x, y):
     'complex': func(complex, 'complex'),
     'conj': func(numpy.conj, 'complex'),
 
-    'isnan': func(numpy.isnan, 'bool'),
-    'isfinite': func(numpy.isfinite, 'bool'),
-    'isinf': func(numpy.isinf, 'bool'),
+    'isnan': func(numpy.isnan, 'double'),
+    'isfinite': func(numpy.isfinite, 'double'),
+    'isinf': func(numpy.isinf, 'double'),
+    'signbit': func(numpy.signbit, 'double'),
 
     'sum': gen_reduce_axis_func('sum'),
     'prod': gen_reduce_axis_func('prod'),
@@ -531,6 +533,6 @@ class FuncNode(OpNode):
     def __init__(self, opcode=None, args=None, kind=None):
         if (kind is None) and (args is not None):
             kind = commonKind(args)
-        if opcode in ("isnan", "isfinite", "isinf"): # bodge for boolean return functions
+        if opcode in ("isnan", "isfinite", "isinf", "signbit"): # bodge for boolean return functions
             kind = 'bool'
         OpNode.__init__(self, opcode, args, kind)

numexpr/functions.hpp

@@ -54,6 +54,7 @@ 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_NEXTAFTER_FFF, "nextafter_fff", nextafterf, nextafterf2, vsNextAfter)
+FUNC_FFF(FUNC_COPYSIGN_FFF, "copysign_fff", copysignf, copysignf2, vsCopySign)
 FUNC_FFF(FUNC_FFF_LAST,    NULL,          NULL,   NULL,    NULL)
 #ifdef ELIDE_FUNC_FFF
 #undef ELIDE_FUNC_FFF
@@ -89,7 +90,7 @@ FUNC_DD(FUNC_CEIL_DD,    "ceil_dd",     ceil,  vdCeil)
 FUNC_DD(FUNC_FLOOR_DD,   "floor_dd",    floor, vdFloor)
 FUNC_DD(FUNC_TRUNC_DD,   "trunc_dd",    trunc, vdTrunc)
  //rint rounds to nearest even integer, matching NumPy (round doesn't)
-FUNC_DD(FUNC_ROUND_DD,   "round_dd",    rint, vdRint)
+FUNC_DD(FUNC_ROUND_DD,   "round_dd",    rint,  vdRint)
 FUNC_DD(FUNC_DD_LAST,    NULL,          NULL,  NULL)
 #ifdef ELIDE_FUNC_DD
 #undef ELIDE_FUNC_DD
@@ -104,6 +105,7 @@ FUNC_DD(FUNC_DD_LAST,    NULL,          NULL,  NULL)
 FUNC_BD(FUNC_ISNAN_BD,   "isnan_bd",    isnand, vdIsnan)
 FUNC_BD(FUNC_ISFINITE_BD, "isfinite_bd", isfinited, vdIsfinite)
 FUNC_BD(FUNC_ISINF_BD, "isinf_bd", isinfd, vdIsinf)
+FUNC_BD(FUNC_SIGNBIT_BD, "signbit_bd",  signbit, vdSignBit)
 FUNC_BD(FUNC_BD_LAST,    NULL,          NULL,  NULL)
 #ifdef ELIDE_FUNC_BD
 #undef ELIDE_FUNC_BD
@@ -115,9 +117,10 @@ FUNC_BD(FUNC_BD_LAST,    NULL,          NULL,  NULL)
 #define ELIDE_FUNC_BF
 #define FUNC_BF(...)
 #endif // use wrappers as there is name collision with isnanf in std
-FUNC_BF(FUNC_ISNAN_BF,   "isnan_bf",    isnanf_,  isnanf2, vfIsnan)
-FUNC_BF(FUNC_ISFINITE_BF, "isfinite_bf", isfinitef_, isfinitef2, vfIsfinite)
-FUNC_BF(FUNC_ISINF_BF, "isinf_bf", isinff_, isinff2, vfIsinf)
+FUNC_BF(FUNC_ISNAN_BF,   "isnan_bf",    isnanf_,  isnanf2, vsIsnan)
+FUNC_BF(FUNC_ISFINITE_BF, "isfinite_bf", isfinitef_, isfinitef2, vsIsfinite)
+FUNC_BF(FUNC_ISINF_BF, "isinf_bf", isinff_, isinff2, vsIsinf)
+FUNC_BF(FUNC_SIGNBIT_BF, "signbit_bf", signbitf, signbitf2, vsSignBit)
 FUNC_BF(FUNC_BF_LAST,    NULL,            NULL,        NULL,    NULL)
 #ifdef ELIDE_FUNC_BF
 #undef ELIDE_FUNC_BF
@@ -132,6 +135,7 @@ 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_NEXTAFTER_DDD, "nextafter_ddd", nextafter, vdNextAfter)
+FUNC_DDD(FUNC_COPYSIGN_DDD, "copysign_ddd", copysign, vdCopySign)
 FUNC_DDD(FUNC_DDD_LAST,    NULL,          NULL,  NULL)
 #ifdef ELIDE_FUNC_DDD
 #undef ELIDE_FUNC_DDD

numexpr/interpreter.cpp

@@ -221,28 +221,35 @@ FuncBFPtr functions_bf[] = {
 #endif
 
 #ifdef USE_VML
-/* no isnan, isfinite or isinf in VML */
-static void vfIsfinite(MKL_INT n, const float* x1, bool* dest)
+/* no isnan, isfinite, isinf or signbit in VML */
+static void vsIsfinite(MKL_INT n, const float* x1, bool* dest)
 {
     MKL_INT j;
     for (j=0; j<n; j++) {
         dest[j] = isfinitef_(x1[j]);
     };
 };
-static void vfIsinf(MKL_INT n, const float* x1, bool* dest)
+static void vsIsinf(MKL_INT n, const float* x1, bool* dest)
 {
     MKL_INT j;
     for (j=0; j<n; j++) {
         dest[j] = isinff_(x1[j]);
     };
 };
-static void vfIsnan(MKL_INT n, const float* x1, bool* dest)
+static void vsIsnan(MKL_INT n, const float* x1, bool* dest)
 {
     MKL_INT j;
     for (j=0; j<n; j++) {
         dest[j] = isnanf_(x1[j]);
     };
 };
+static void vsSignBit(MKL_INT n, const float* x1, bool* dest)
+{
+    MKL_INT j;
+    for (j=0; j<n; j++) {
+        dest[j] = signbitf(x1[j]);
+    };
+};
 #endif
 
 #ifdef USE_VML
@@ -262,7 +269,7 @@ FuncBDPtr functions_bd[] = {
 };
 
 #ifdef USE_VML
-/* no isnan, isfinite or isinf in VML */
+/* no isnan, isfinite, isinf, signbit in VML */
 static void vdIsfinite(MKL_INT n, const double* x1, bool* dest)
 {
     MKL_INT j;
@@ -284,6 +291,13 @@ static void vdIsnan(MKL_INT n, const double* x1, bool* dest)
         dest[j] = isnand(x1[j]);
     };
 };
+static void vdSignBit(MKL_INT n, const double* x1, bool* dest)
+{
+    MKL_INT j;
+    for (j=0; j<n; j++) {
+        dest[j] = signbit(x1[j]);
+    };
+};
 #endif
 
 #ifdef USE_VML

numexpr/msvc_function_stubs.hpp

@@ -41,6 +41,8 @@
 #define fabsf(x)    ((float)fabs((double)(x)))
 #define fmodf(x, y)    ((float)fmod((double)(x), (double)(y)))
 #define atan2f(x, y)    ((float)atan2((double)(x), (double)(y)))
+#define hypotf(x, y)    ((float)hypot((double)(x), (double)(y)))
+#define copysignf(x, y)    ((float)copysign((double)(x), (double)(y)))
 #define ceilf(x)    ((float)ceil((double)(x)))
 #define hypotf(x)    ((float)hypot((double)(x)))
 #define rintf(x)    ((float)rint((double)(x)))
@@ -160,6 +162,10 @@ inline float nextafterf2(float x, float y) {
     return nextafterf(x, y);
 }
 
+inline float copysignf2(float x, float y) {
+    return copysignf(x, y);
+}
+
 
 // Boolean output functions
 inline bool isnanf2(float x) {
@@ -197,4 +203,8 @@ inline float truncf2(float x) {
     return truncf(x);
 }
 
+inline float signbitf2(float x) {
+    return signbitf(x);
+}
+
 #endif // NUMEXPR_MSVC_FUNCTION_STUBS_HPP

numexpr/necompiler.py

@@ -77,7 +77,9 @@
     "hypot",
     "round",
     "trunc",
-    "nextafter"
+    "nextafter",
+    "copysign",
+    "signbit"
     ]
 
 

numexpr/numexpr_config.hpp

@@ -41,7 +41,8 @@
 #include "mkl_service.h"
 #endif
 #include <cmath>
-
+//no single precision version of signbit in C++ standard
+inline bool signbitf(float x) { return signbit((double)x); }
 #ifdef _WIN32
   #ifndef __MINGW32__
     #include "missing_posix_functions.hpp"

numexpr/tests/test_numexpr.py

@@ -24,11 +24,11 @@
 from numpy import all as alltrue
 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,
-                   hypot, int32, int64, isinf, isnan, linspace, log, log1p,
-                   log2, log10, nextafter, ones_like, prod, ravel, rec, round,
-                   shape, sin, sinh, sqrt, sum, tan, tanh, trunc, uint16,
-                   where, zeros)
+                   copy, copysign, cos, cosh, empty, exp, expm1, float64,
+                   floor, fmod, hypot, int32, int64, isfinite, isinf, isnan,
+                   linspace, log, log1p, log2, log10, nextafter, ones_like,
+                   prod, ravel, rec, round, shape, signbit, sin, sinh, sqrt,
+                   sum, tan, tanh, trunc, uint16, where, zeros)
 from numpy.testing import (assert_allclose, assert_array_almost_equal,
                            assert_array_equal, assert_equal)
 
@@ -728,20 +728,26 @@ def test_bool_funcs(self):
         a = np.arange(2 * array_size, dtype=dtype)
         a[array_size//2] = np.nan
         a[array_size//3] = np.inf
+        a[array_size//4] = -2
+
+        assert_equal(evaluate("isnan(a)"), isnan(a))
+        assert_equal(evaluate("isfinite(a)"), isfinite(a))
+        assert_equal(evaluate("isinf(a)"), isinf(a))
+        assert_equal(evaluate("signbit(a)"), signbit(a))
 
-        assert np.all(evaluate("isnan(a)") == np.isnan(a))
-        assert np.all(evaluate("isfinite(a)") == np.isfinite(a))
-        assert np.all(evaluate("isinf(a)") == np.isinf(a))
         a = a.astype(np.float64)
         assert a.dtype == np.float64
-        assert np.all(evaluate("isnan(a)") == np.isnan(a))
-        assert np.all(evaluate("isfinite(a)") == np.isfinite(a))
-        assert np.all(evaluate("isinf(a)") == np.isinf(a))
+        assert_equal(evaluate("isnan(a)"), isnan(a))
+        assert_equal(evaluate("isfinite(a)"), isfinite(a))
+        assert_equal(evaluate("isinf(a)"), isinf(a))
+        assert_equal(evaluate("signbit(a)"), signbit(a))
+
         a = a.astype(np.complex128)
         assert a.dtype == np.complex128
         assert np.all(evaluate("isnan(a)") == np.isnan(a))
         assert np.all(evaluate("isfinite(a)") == np.isfinite(a))
         assert np.all(evaluate("isinf(a)") == np.isinf(a))
+        # signbit not defined for complex numbers
 
     if 'sparc' not in platform.machine():
         # Execution order set here so as to not use too many threads
@@ -814,7 +820,7 @@ def test_changing_nthreads_01_dec(self):
 tests.append(('1_ARG_FUNCS', func1tests))
 
 func2tests = []
-for func in ['arctan2', 'fmod', 'hypot', 'nextafter']:
+for func in ['arctan2', 'fmod', 'hypot', 'nextafter', 'copysign']:
     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)