Merge pull request numpy#5618 from johntyree/arrfill_ulonglong

BUG: Fixes ndarray.fill to accept maximum uint64 value

Author: juliantaylor

numpy/core/src/multiarray/convert.c

@@ -350,16 +350,33 @@ PyArray_FillWithScalar(PyArrayObject *arr, PyObject *obj)
     }
     /* Python integer */
     else if (PyLong_Check(obj) || PyInt_Check(obj)) {
-        npy_longlong v = PyLong_AsLongLong(obj);
-        if (v == -1 && PyErr_Occurred()) {
-            return -1;
+        /* Try long long before unsigned long long */
+        npy_longlong ll_v = PyLong_AsLongLong(obj);
+        if (ll_v == -1 && PyErr_Occurred()) {
+            /* Long long failed, try unsigned long long */
+            npy_ulonglong ull_v;
+            PyErr_Clear();
+            ull_v = PyLong_AsUnsignedLongLong(obj);
+            if (ull_v == (unsigned long long)-1 && PyErr_Occurred()) {
+                return -1;
+            }
+            value = (char *)value_buffer;
+            *(npy_ulonglong *)value = ull_v;
+
+            dtype = PyArray_DescrFromType(NPY_ULONGLONG);
+            if (dtype == NULL) {
+                return -1;
+            }
         }
-        value = (char *)value_buffer;
-        *(npy_longlong *)value = v;
+        else {
+            /* Long long succeeded */
+            value = (char *)value_buffer;
+            *(npy_longlong *)value = ll_v;
 
-        dtype = PyArray_DescrFromType(NPY_LONGLONG);
-        if (dtype == NULL) {
-            return -1;
+            dtype = PyArray_DescrFromType(NPY_LONGLONG);
+            if (dtype == NULL) {
+                return -1;
+            }
         }
     }
     /* Python float */

numpy/core/tests/test_multiarray.py

@@ -204,6 +204,14 @@ def test_fill(self):
             y[...] = 1
             assert_equal(x, y)
 
+    def test_fill_max_uint64(self):
+        x = empty((3, 2, 1), dtype=uint64)
+        y = empty((3, 2, 1), dtype=uint64)
+        value = 2**64 - 1
+        y[...] = value
+        x.fill(value)
+        assert_array_equal(x, y)
+
     def test_fill_struct_array(self):
         # Filling from a scalar
         x = array([(0, 0.0), (1, 1.0)], dtype='i4,f8')