Merge pull request #16639 from anirudh2290/fix_timedelta_promotion_uint

BUG: Fix uint->timedelta promotion to raise TypeError
numpy · Jun 20, 2020 · 69555f5 · 69555f5
2 parents 2f156d8 + 27edfbb
commit 69555f5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -166,6 +166,9 @@ numpy/core/src/umath/simd.inc
 numpy/core/src/umath/struct_ufunc_test.c
 numpy/core/src/umath/test_rational.c
 numpy/core/src/umath/umath_tests.c
+numpy/core/src/umath/_umath_tests.dispatch.avx2.c
+numpy/core/src/umath/_umath_tests.dispatch.h
+numpy/core/src/umath/_umath_tests.dispatch.sse41.c
 numpy/distutils/__config__.py
 numpy/linalg/umath_linalg.c
 doc/source/**/generated/

diff --git a/doc/release/upcoming_changes/16592.compatibility.rst b/doc/release/upcoming_changes/16592.compatibility.rst
@@ -1,7 +1,13 @@
-float->timedelta promotion will raise a TypeError
--------------------------------------------------
+float->timedelta and uint64->timedelta promotion will raise a TypeError
+-----------------------------------------------------------------------
 Float and timedelta promotion consistently raises a TypeError.
 ``np.promote_types("float32", "m8")`` aligns with
 ``np.promote_types("m8", "float32")`` now and both raise a TypeError.
 Previously, ``np.promote_types("float32", "m8")`` returned ``"m8"`` which
 was considered a bug.
+
+Uint64 and timedelta promotion consistently raises a TypeError.
+``np.promote_types("uint64", "m8")`` aligns with
+``np.promote_types("m8", "uint64")`` now and both raise a TypeError.
+Previously, ``np.promote_types("uint64", "m8")`` returned ``"m8"`` which
+was considered a bug.
diff --git a/numpy/core/src/multiarray/convert_datatype.c b/numpy/core/src/multiarray/convert_datatype.c
@@ -1419,7 +1419,7 @@ PyArray_PromoteTypes(PyArray_Descr *type1, PyArray_Descr *type2)
             }
             break;
         case NPY_TIMEDELTA:
-            if (PyTypeNum_ISINTEGER(type_num1)) {
+            if (PyTypeNum_ISSIGNED(type_num1)) {
                 return ensure_dtype_nbo(type2);
             }
             break;

diff --git a/numpy/core/tests/test_datetime.py b/numpy/core/tests/test_datetime.py
@@ -778,6 +778,8 @@ def test_dtype_promotion(self):
         # timedelta and float cannot be safely cast with each other
         assert_raises(TypeError, np.promote_types, "float32", "m8")
         assert_raises(TypeError, np.promote_types, "m8", "float32")
+        assert_raises(TypeError, np.promote_types, "uint64", "m8")
+        assert_raises(TypeError, np.promote_types, "m8", "uint64")
 
         # timedelta <op> timedelta may overflow with big unit ranges
         assert_raises(OverflowError, np.promote_types,