Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BUG: random: Revert gh-14458 and refix gh-14557. #14502

Merged
merged 3 commits into from Sep 14, 2019
Merged

BUG: random: Revert gh-14458 and refix gh-14557. #14502

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
744856e
MAINT: random: Revert gh-14458.
WarrenWeckesser Sep 12, 2019
1afcaee
BUG: random: Fix the mistaken duplicate line. Fixes gh-14557.
WarrenWeckesser Sep 12, 2019
85d82d4
DOC: Update RandomState docstring from master.
charris Sep 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions numpy/random/mtrand.pyx
View file
Open in desktop
Expand Up @@ -83,8 +83,8 @@ cdef class RandomState:
See Also
--------
Generator
mt19937.MT19937
Bit_Generators
MT19937
:ref:`bit_generator`

"""
cdef public object _bit_generator
Expand Down Expand Up @@ -3493,9 +3493,9 @@ cdef class RandomState:
cdef int64_t lngood, lnbad, lnsample

# This cast to long is required to ensure that the values are inbounds
ongood = <np.ndarray>np.PyArray_FROM_OTF(ngood, np.NPY_INT64, np.NPY_ALIGNED)
onbad = <np.ndarray>np.PyArray_FROM_OTF(nbad, np.NPY_INT64, np.NPY_ALIGNED)
onsample = <np.ndarray>np.PyArray_FROM_OTF(nsample, np.NPY_INT64, np.NPY_ALIGNED)
ongood = <np.ndarray>np.PyArray_FROM_OTF(ngood, np.NPY_LONG, np.NPY_ALIGNED)
onbad = <np.ndarray>np.PyArray_FROM_OTF(nbad, np.NPY_LONG, np.NPY_ALIGNED)
onsample = <np.ndarray>np.PyArray_FROM_OTF(nsample, np.NPY_LONG, np.NPY_ALIGNED)

if np.PyArray_NDIM(ongood) == np.PyArray_NDIM(onbad) == np.PyArray_NDIM(onsample) == 0:

Expand All @@ -3517,7 +3517,7 @@ cdef class RandomState:
# Convert to int64, if necessary, to use int64 infrastructure
ongood = ongood.astype(np.int64)
onbad = onbad.astype(np.int64)
onbad = onbad.astype(np.int64)
onsample = onsample.astype(np.int64)
out = discrete_broadcast_iii(&legacy_random_hypergeometric,&self._bitgen, size, self.lock,
ongood, 'ngood', CONS_NON_NEGATIVE,
onbad, 'nbad', CONS_NON_NEGATIVE,
Expand Down