Merge pull request #524 from pydata/add_isinf

Add isinf function

Author: lshaw8317

numexpr/expressions.py

@@ -368,6 +368,7 @@ def multiply(x, y):
 
     'isnan': func(numpy.isnan, 'bool'),
     'isfinite': func(numpy.isfinite, 'bool'),
+    'isinf': func(numpy.isinf, 'bool'),
 
     'sum': gen_reduce_axis_func('sum'),
     'prod': gen_reduce_axis_func('prod'),
@@ -524,6 +525,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"): # bodge for boolean return functions
+        if opcode in ("isnan", "isfinite", "isinf"): # bodge for boolean return functions
             kind = 'bool'
         OpNode.__init__(self, opcode, args, kind)

numexpr/functions.hpp

@@ -93,6 +93,7 @@ FUNC_DD(FUNC_DD_LAST,    NULL,          NULL,  NULL)
 #endif
 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_BD_LAST,    NULL,          NULL,  NULL)
 #ifdef ELIDE_FUNC_BD
 #undef ELIDE_FUNC_BD
@@ -106,6 +107,7 @@ FUNC_BD(FUNC_BD_LAST,    NULL,          NULL,  NULL)
 #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_BF_LAST,    NULL,            NULL,        NULL,    NULL)
 #ifdef ELIDE_FUNC_BF
 #undef ELIDE_FUNC_BF

numexpr/msvc_function_stubs.hpp

@@ -54,7 +54,8 @@ inline bool isfinitef_(float x) { return !!::_finite(x); }   // MSVC has _finite
 inline bool isnanf_(float x)    { return !!::_isnan(x); }    // MSVC has _isnan
 inline bool isfinited(double x) { return !!::_finite(x); }
 inline bool isnand(double x)    { return !!::_isnan(x); }
-
+inline bool isinfd(double x) { return !!::isinf(x); }
+inline bool isinff_(float x)    { return !!::isinf(x); }
 
 /* Now the actual stubs */
 
@@ -151,6 +152,11 @@ inline bool isfinitef2(float x) {
     return isfinitef_(x);
 }
 
+inline bool isinff2(float x) {
+    return isinff_(x);
+}
+
+
 // Needed for allowing the internal casting in numexpr machinery for
 // conjugate operations
 inline float fconjf2(float x) {

numexpr/necompiler.py

@@ -71,7 +71,8 @@
     "ceil",
     "floor",
     "isnan",
-    "isfinite"
+    "isfinite",
+    "isinf",
     ]
 
 

numexpr/numexpr_config.hpp

@@ -55,6 +55,8 @@ inline bool isfinitef_(float x) { return !!::isfinite(x); }
 inline bool isnanf_(float x)    { return !!::isnan(x); }
 inline bool isfinited(double x) { return !!::isfinite(x); }
 inline bool isnand(double x)    { return !!::isnan(x); }
+inline bool isinff_(float x) { return !!::isinf(x); }
+inline bool isinfd(double x)    { return !!::isinf(x); }
 #endif
 
 #endif // NUMEXPR_CONFIG_HPP

numexpr/tests/test_numexpr.py

@@ -703,10 +703,12 @@ def test_bool_funcs(self):
 
         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))
 
     if 'sparc' not in platform.machine():
         # Execution order set here so as to not use too many threads