Merge pull request #45 from bashtage/update-to-latest-numpy

UPD: Sync with recent NumPy changes

Author: bashtage

randomstate/bounded_integers.pxi

@@ -20,7 +20,7 @@ cdef object _rand_int64(low, high, size, aug_state *state, lock):
     if size is None:
         with lock:
             random_bounded_uint64_fill(state, off, rng, 1, &buf)
-        return <int64_t>buf
+        return np.int64(<int64_t>buf)
     else:
         array = <np.ndarray>np.empty(size, np.int64)
         cnt = np.PyArray_SIZE(array)
@@ -75,7 +75,7 @@ cdef object _rand_int32(low, high, size, aug_state *state, lock):
     if size is None:
         with lock:
             random_bounded_uint32_fill(state, off, rng, 1, &buf)
-        return <int32_t>buf
+        return np.int32(<int32_t>buf)
     else:
         array = <np.ndarray>np.empty(size, np.int32)
         cnt = np.PyArray_SIZE(array)
@@ -95,7 +95,7 @@ cdef object _rand_int16(low, high, size, aug_state *state, lock):
     if size is None:
         with lock:
             random_bounded_uint16_fill(state, off, rng, 1, &buf)
-        return <int16_t>buf
+        return np.int16(<int16_t>buf)
     else:
         array = <np.ndarray>np.empty(size, np.int16)
         cnt = np.PyArray_SIZE(array)
@@ -115,7 +115,7 @@ cdef object _rand_int8(low, high, size, aug_state *state, lock):
     if size is None:
         with lock:
             random_bounded_uint8_fill(state, off, rng, 1, &buf)
-        return <int8_t>buf
+        return np.int8(<int8_t>buf)
     else:
         array = <np.ndarray>np.empty(size, np.int8)
         cnt = np.PyArray_SIZE(array)
@@ -138,7 +138,7 @@ cdef object _rand_uint64(low, high, size, aug_state *state, lock):
     if size is None:
         with lock:
             random_bounded_uint64_fill(state, off, rng, 1, &buf)
-        return <uint64_t>buf
+        return np.uint64(<uint64_t>buf)
     else:
         array = <np.ndarray>np.empty(size, np.uint64)
         cnt = np.PyArray_SIZE(array)
@@ -158,7 +158,7 @@ cdef object _rand_uint32(low, high, size, aug_state *state, lock):
     if size is None:
         with lock:
             random_bounded_uint32_fill(state, off, rng, 1, &buf)
-        return <uint32_t>buf
+        return np.uint32(<uint32_t>buf)
     else:
         array = <np.ndarray>np.empty(size, np.uint32)
         cnt = np.PyArray_SIZE(array)
@@ -178,7 +178,7 @@ cdef object _rand_uint16(low, high, size, aug_state *state, lock):
     if size is None:
         with lock:
             random_bounded_uint16_fill(state, off, rng, 1, &buf)
-        return <uint16_t>buf
+        return np.uint16(<uint16_t>buf)
     else:
         array = <np.ndarray>np.empty(size, np.uint16)
         cnt = np.PyArray_SIZE(array)
@@ -198,7 +198,7 @@ cdef object _rand_uint8(low, high, size, aug_state *state, lock):
     if size is None:
         with lock:
             random_bounded_uint8_fill(state, off, rng, 1, &buf)
-        return <uint8_t>buf
+        return np.uint8(<uint8_t>buf)
     else:
         array = <np.ndarray>np.empty(size, np.uint8)
         cnt = np.PyArray_SIZE(array)
@@ -219,7 +219,7 @@ cdef object _rand_bool(low, high, size, aug_state *state, lock):
     if size is None:
         with lock:
             random_bool_fill(state, off, rng, 1, &buf)
-        return <np.npy_bool>buf
+        return np.bool_(<np.npy_bool>buf)
     else:
         array = <np.ndarray>np.empty(size, np.bool)
         cnt = np.PyArray_SIZE(array)

randomstate/randomstate.pyx

@@ -761,7 +761,7 @@ cdef class RandomState:
             randoms_data[i] = random_positive_int(&self.rng_state)
         return randoms
 
-    def randint(self, low, high=None, size=None, dtype='l'):
+    def randint(self, low, high=None, size=None, dtype=int):
         """
         randint(low, high=None, size=None, dtype='l')
 
@@ -788,7 +788,7 @@ cdef class RandomState:
             Desired dtype of the result. All dtypes are determined by their
             name, i.e., 'int64', 'int', etc, so byteorder is not available
             and a specific precision may have different C types depending
-            on the platform. The default value is 'l' (C long).
+            on the platform. The default value is 'np.int'.
 
             .. versionadded:: 1.11.0
 
@@ -836,23 +836,28 @@ cdef class RandomState:
             raise ValueError("low >= high")
 
         if key == 'int32':
-            return _rand_int32(low, high - 1, size, &self.rng_state, self.lock)
+            ret = _rand_int32(low, high - 1, size, &self.rng_state, self.lock)
         elif key == 'int64':
-            return _rand_int64(low, high - 1, size, &self.rng_state, self.lock)
+            ret = _rand_int64(low, high - 1, size, &self.rng_state, self.lock)
         elif key == 'int16':
-            return _rand_int16(low, high - 1, size, &self.rng_state, self.lock)
+            ret = _rand_int16(low, high - 1, size, &self.rng_state, self.lock)
         elif key == 'int8':
-            return _rand_int8(low, high - 1, size, &self.rng_state, self.lock)
+            ret = _rand_int8(low, high - 1, size, &self.rng_state, self.lock)
         elif key == 'uint64':
-            return _rand_uint64(low, high - 1, size, &self.rng_state, self.lock)
+            ret = _rand_uint64(low, high - 1, size, &self.rng_state, self.lock)
         elif key == 'uint32':
-            return _rand_uint32(low, high - 1, size, &self.rng_state, self.lock)
+            ret = _rand_uint32(low, high - 1, size, &self.rng_state, self.lock)
         elif key == 'uint16':
-            return _rand_uint16(low, high - 1, size, &self.rng_state, self.lock)
+            ret = _rand_uint16(low, high - 1, size, &self.rng_state, self.lock)
         elif key == 'uint8':
-            return _rand_uint8(low, high - 1, size, &self.rng_state, self.lock)
+            ret = _rand_uint8(low, high - 1, size, &self.rng_state, self.lock)
         elif key == 'bool':
-            return _rand_bool(low, high - 1, size, &self.rng_state, self.lock)
+            ret = _rand_bool(low, high - 1, size, &self.rng_state, self.lock)
+
+        if size is None:
+            if dtype in (np.bool, np.int, np.long):
+                return dtype(ret)
+        return ret
 
     def bytes(self, np.npy_intp length):
         """
@@ -3567,11 +3572,13 @@ cdef class RandomState:
         the probability density function:
 
         >>> import matplotlib.pyplot as plt
-        >>> import scipy.special as sps
-        Truncate s values at 50 so plot is interesting
+        >>> from scipy import special
+
+        Truncate s values at 50 so plot is interesting:
+
         >>> count, bins, ignored = plt.hist(s[s<50], 50, normed=True)
         >>> x = np.arange(1., 50.)
-        >>> y = x**(-a)/sps.zetac(a)
+        >>> y = x**(-a) / special.zetac(a)
         >>> plt.plot(x, y/max(y), linewidth=2, color='r')
         >>> plt.show()
 

randomstate/tests/tests_numpy_mt19937.py

@@ -137,25 +137,25 @@ class TestRandint(TestCase):
     rfunc = random.randint
 
     # valid integer/boolean types
-    itype = [np.bool, np.int8, np.uint8, np.int16, np.uint16,
+    itype = [np.bool_, np.int8, np.uint8, np.int16, np.uint16,
              np.int32, np.uint32, np.int64, np.uint64]
 
     def test_unsupported_type(self):
         assert_raises(TypeError, self.rfunc, 1, dtype=np.float)
 
     def test_bounds_checking(self):
         for dt in self.itype:
-            lbnd = 0 if dt is np.bool else np.iinfo(dt).min
-            ubnd = 2 if dt is np.bool else np.iinfo(dt).max + 1
+            lbnd = 0 if dt is np.bool_ else np.iinfo(dt).min
+            ubnd = 2 if dt is np.bool_ else np.iinfo(dt).max + 1
             assert_raises(ValueError, self.rfunc, lbnd - 1, ubnd, dtype=dt)
             assert_raises(ValueError, self.rfunc, lbnd, ubnd + 1, dtype=dt)
             assert_raises(ValueError, self.rfunc, ubnd, lbnd, dtype=dt)
             assert_raises(ValueError, self.rfunc, 1, 0, dtype=dt)
 
     def test_rng_zero_and_extremes(self):
         for dt in self.itype:
-            lbnd = 0 if dt is np.bool else np.iinfo(dt).min
-            ubnd = 2 if dt is np.bool else np.iinfo(dt).max + 1
+            lbnd = 0 if dt is np.bool_ else np.iinfo(dt).min
+            ubnd = 2 if dt is np.bool_ else np.iinfo(dt).max + 1
             tgt = ubnd - 1
             assert_equal(self.rfunc(tgt, tgt + 1, size=1000, dtype=dt), tgt)
             tgt = lbnd
@@ -208,6 +208,24 @@ def test_repeatability(self):
         res = hashlib.md5(val).hexdigest()
         assert_(tgt[np.dtype(np.bool).name] == res)
 
+    def test_respect_dtype_singleton(self):
+        # See gh-7203
+        for dt in self.itype:
+            lbnd = 0 if dt is np.bool_ else np.iinfo(dt).min
+            ubnd = 2 if dt is np.bool_ else np.iinfo(dt).max + 1
+
+            sample = self.rfunc(lbnd, ubnd, dtype=dt)
+            self.assertEqual(sample.dtype, np.dtype(dt))
+
+        for dt in (np.bool, np.int, np.long):
+            lbnd = 0 if dt is np.bool else np.iinfo(dt).min
+            ubnd = 2 if dt is np.bool else np.iinfo(dt).max + 1
+
+            # gh-7284: Ensure that we get Python data types
+            sample = self.rfunc(lbnd, ubnd, dtype=dt)
+            self.assertFalse(hasattr(sample, 'dtype'))
+            self.assertEqual(type(sample), dt)
+
 
 class TestRandomDist(TestCase):
     # Make sure the random distribution returns the correct value for a