diff options
| author | Pan Jan <rumcajsgajos@gmail.com> | 2020-04-01 20:09:18 +0200 |
|---|---|---|
| committer | Pan Jan <rumcajsgajos@gmail.com> | 2020-04-01 20:09:18 +0200 |
| commit | b4c0a7ad979cead8708c944c2c3bf537908d72c6 (patch) | |
| tree | 81bd0bbb469fd1dc25a95475b3a555c38b67b9e5 /numpy | |
| parent | 62df90e5e864bfae304e98dba0b2bdd7080dba68 (diff) | |
| download | numpy-b4c0a7ad979cead8708c944c2c3bf537908d72c6.tar.gz | |
Replace checks with direct function call
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/random/_generator.pyx | 6 | ||||
| -rw-r--r-- | numpy/random/mtrand.pyx | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/numpy/random/_generator.pyx b/numpy/random/_generator.pyx index ed5137a46..0ebd4d17a 100644 --- a/numpy/random/_generator.pyx +++ b/numpy/random/_generator.pyx @@ -3643,10 +3643,8 @@ cdef class Generator: d = len(pvals) on = <np.ndarray>np.PyArray_FROM_OTF(n, np.NPY_INT64, np.NPY_ALIGNED) - parr = <np.ndarray>np.PyArray_FROM_OTF( - pvals, np.NPY_DOUBLE, np.NPY_ALIGNED | np.NPY_ARRAY_C_CONTIGUOUS) - if np.PyArray_NDIM(parr) != 1: - raise ValueError("pvals must be 1d array") + parr = <np.ndarray>np.PyArray_FROMANY( + pvals, np.NPY_DOUBLE, 1, 1, np.NPY_ARRAY_ALIGNED | np.NPY_ARRAY_C_CONTIGUOUS) pix = <double*>np.PyArray_DATA(parr) check_array_constraint(parr, 'pvals', CONS_BOUNDED_0_1) if kahan_sum(pix, d-1) > (1.0 + 1e-12): diff --git a/numpy/random/mtrand.pyx b/numpy/random/mtrand.pyx index 6d36dda36..049eeb2bd 100644 --- a/numpy/random/mtrand.pyx +++ b/numpy/random/mtrand.pyx @@ -4199,10 +4199,8 @@ cdef class RandomState: cdef long ni d = len(pvals) - parr = <np.ndarray>np.PyArray_FROM_OTF( - pvals, np.NPY_DOUBLE, np.NPY_ALIGNED | np.NPY_ARRAY_C_CONTIGUOUS) - if np.PyArray_NDIM(parr) != 1: - raise ValueError("pvals must be 1d array") + parr = <np.ndarray>np.PyArray_FROMANY( + pvals, np.NPY_DOUBLE, 1, 1, np.NPY_ARRAY_ALIGNED | np.NPY_ARRAY_C_CONTIGUOUS) pix = <double*>np.PyArray_DATA(parr) check_array_constraint(parr, 'pvals', CONS_BOUNDED_0_1) if kahan_sum(pix, d-1) > (1.0 + 1e-12): |