MAINT: changes from review

mattip · mattip · commit 259b6e3a877b · 2019-11-07T09:28:11.000-07:00
diff --git a/numpy/core/src/umath/loops.c.src b/numpy/core/src/umath/loops.c.src
@@ -1245,16 +1245,6 @@ NPY_NO_EXPORT void
     }
 }
 
-
-NPY_NO_EXPORT void
-@TYPE@_isnan(char **args, npy_intp *dimensions, npy_intp *steps, void *NPY_UNUSED(func))
-{
-    UNARY_LOOP {
-        const @type@ in1 = *(@type@ *)ip1;
-        *((npy_bool *)op1) = (in1 == NPY_DATETIME_NAT);
-    }
-}
-
 NPY_NO_EXPORT void
 @TYPE@_isinf(char **args, npy_intp *dimensions, npy_intp *steps, void *NPY_UNUSED(func))
 {
diff --git a/numpy/core/src/umath/loops.h.src b/numpy/core/src/umath/loops.h.src
@@ -480,8 +480,7 @@ NPY_NO_EXPORT void
 NPY_NO_EXPORT void
 @TYPE@_isinf(char **args, npy_intp *dimensions, npy_intp *steps, void *NPY_UNUSED(func));
 
-NPY_NO_EXPORT void
-@TYPE@_isnan(char **args, npy_intp *dimensions, npy_intp *steps, void *NPY_UNUSED(func));
+#define @TYPE@_isnan @TYPE@_isnat
 
 NPY_NO_EXPORT void
 @TYPE@__ones_like(char **args, npy_intp *dimensions, npy_intp *steps, void *NPY_UNUSED(data));
diff --git a/numpy/core/tests/test_datetime.py b/numpy/core/tests/test_datetime.py
@@ -2242,19 +2242,19 @@ def test_isfinite_scalar(self):
 
     @pytest.mark.parametrize('unit', ['Y', 'M', 'W', 'D', 'h', 'm', 's', 'ms',
                                       'us', 'ns', 'ps', 'fs', 'as'])
-    def test_isxx_units(self, unit):
+    @pytest.mark.parametrize('dstr', ['<datetime64[%s]', '>datetime64[%s]',
+                                      '<timedelta64[%s]', '>timedelta64[%s]'])
+    def test_isfinite_isinf_isnan_units(self, unit, dstr):
         '''check isfinite, isinf, isnan for all units of <M, >M, <m, >m dtypes
         '''
         arr_val = [123, -321, "NaT"]
-        dstr = ['<datetime64[%s]', '>datetime64[%s]',
-                '<timedelta64[%s]', '>timedelta64[%s]']
-        for arr in [np.array(arr_val,  dtype= s % unit) for s in dstr]:
-            pos = np.array([True, True,  False])
-            neg = np.array([False, False,  True])
-            false = np.array([False, False,  False])
-            assert_equal(np.isfinite(arr), pos)
-            assert_equal(np.isinf(arr), false)
-            assert_equal(np.isnan(arr), neg)
+        arr = np.array(arr_val,  dtype= dstr % unit)
+        pos = np.array([True, True,  False])
+        neg = np.array([False, False,  True])
+        false = np.array([False, False,  False])
+        assert_equal(np.isfinite(arr), pos)
+        assert_equal(np.isinf(arr), false)
+        assert_equal(np.isnan(arr), neg)
 
     def test_corecursive_input(self):
         # construct a co-recursive list
diff --git a/numpy/testing/_private/utils.py b/numpy/testing/_private/utils.py
@@ -387,6 +387,11 @@ def assert_equal(actual, desired, err_msg='', verbose=True):
                 raise AssertionError(msg)
 
     except (TypeError, ValueError, NotImplementedError, DeprecationWarning):
+        # version 1.18:
+        # datetime64/timedelta64 used to raise since they had no isnan
+        # implementation. Now they do, but raise a DeprecationWarning when
+        # compared to 0. When that restriction is removed, they will still
+        # raise an error when signbit is called.
         pass
 
     try:

Original file line number	Diff line number	Diff line change
`@@ -1245,16 +1245,6 @@ NPY_NO_EXPORT void`
`1245`	`1245`	`}`
`1246`	`1246`	`}`
`1247`	`1247`
`1248`		`-`
`1249`		`-NPY_NO_EXPORT void`
`1250`		`-@TYPE@_isnan(char *args, npy_intp dimensions, npy_intp steps, void NPY_UNUSED(func))`
`1251`		`-{`
`1252`		`- UNARY_LOOP {`
`1253`		`- const @type@ in1 = (@type@ )ip1;`
`1254`		`- ((npy_bool )op1) = (in1 == NPY_DATETIME_NAT);`
`1255`		`- }`
`1256`		`-}`
`1257`		`-`
`1258`	`1248`	`NPY_NO_EXPORT void`
`1259`	`1249`	`@TYPE@_isinf(char *args, npy_intp dimensions, npy_intp steps, void NPY_UNUSED(func))`
`1260`	`1250`	`{`