CLN: Fix small type mismatches on variables

Author: bashtage

randomstate/array_utilities.pxi

@@ -16,7 +16,7 @@ ctypedef uint32_t (* random_uint_1_i_32)(aug_state* state, uint32_t a) nogil
 ctypedef int32_t (* random_int_2_i_32)(aug_state* state, int32_t a, int32_t b) nogil
 ctypedef int64_t (* random_int_2_i)(aug_state* state, int64_t a, int64_t b) nogil
 
-ctypedef void (* random_double_fill)(aug_state* state, int count, double *out) nogil
+ctypedef void (* random_double_fill)(aug_state* state, np.npy_intp count, double *out) nogil
 
 cdef Py_ssize_t compute_numel(size):
     cdef Py_ssize_t i, n = 1
@@ -104,25 +104,28 @@ cdef object cont_broadcast_1(aug_state* state, void* func, object size, object l
                              object a, object a_name, constraint_type a_constraint):
 
     cdef np.ndarray a_arr, randoms
+    cdef double *randoms_data
     cdef np.broadcast it
     cdef random_double_1 f = (<random_double_1>func)
+    cdef np.npy_intp i, n
 
     a_arr = <np.ndarray>np.PyArray_FROM_OTF(a, np.NPY_DOUBLE, np.NPY_ALIGNED)
     if a_constraint != CONS_NONE:
         check_array_constraint(a_arr, a_name, a_constraint)
 
     if size is not None:
-        randoms = np.empty(size, np.double)
+        randoms = <np.ndarray>np.empty(size, np.double)
     else:
-        #randoms = np.empty(np.shape(a_arr), np.double)
         randoms = np.PyArray_SimpleNew(np.PyArray_NDIM(a_arr), np.PyArray_DIMS(a_arr), np.NPY_DOUBLE)
 
-
+    randoms_data = <double *>np.PyArray_DATA(randoms)
+    n = np.PyArray_SIZE(randoms)
     it = np.broadcast(randoms, a_arr)
+
     with lock, nogil:
-        while np.PyArray_MultiIter_NOTDONE(it):
+        for i in range(n):
             a_val = (<double*>np.PyArray_MultiIter_DATA(it, 1))[0]
-            (<double*>np.PyArray_MultiIter_DATA(it, 0))[0] = f(state, a_val)
+            randoms_data[i] = f(state, a_val)
 
             np.PyArray_MultiIter_NEXT(it)
 
@@ -132,8 +135,10 @@ cdef object cont_broadcast_2(aug_state* state, void* func, object size, object l
                  object a, object a_name, constraint_type a_constraint,
                  object b, object b_name, constraint_type b_constraint):
     cdef np.ndarray a_arr, b_arr, randoms
+    cdef double *randoms_data
     cdef np.broadcast it
     cdef random_double_2 f = (<random_double_2>func)
+    cdef np.npy_intp i, n
 
     a_arr = <np.ndarray>np.PyArray_FROM_OTF(a, np.NPY_DOUBLE, np.NPY_ALIGNED)
     if a_constraint != CONS_NONE:
@@ -144,18 +149,22 @@ cdef object cont_broadcast_2(aug_state* state, void* func, object size, object l
         check_array_constraint(b_arr, b_name, b_constraint)
 
     if size is not None:
-        randoms = np.empty(size, np.double)
+        randoms = <np.ndarray>np.empty(size, np.double)
     else:
         it = np.PyArray_MultiIterNew2(a_arr, b_arr)
-        randoms = np.empty(it.shape, np.double)
+        randoms = <np.ndarray>np.empty(it.shape, np.double)
         #randoms = np.PyArray_SimpleNew(it.nd, np.PyArray_DIMS(it), np.NPY_DOUBLE)
+    # TODO: These are needed when using a for loop
+
+    randoms_data = <double *>np.PyArray_DATA(randoms)
+    n = np.PyArray_SIZE(randoms)
 
     it = np.PyArray_MultiIterNew3(randoms, a_arr, b_arr)
     with lock, nogil:
-        while np.PyArray_MultiIter_NOTDONE(it):
+        for i in range(n):
             a_val = (<double*>np.PyArray_MultiIter_DATA(it, 1))[0]
             b_val = (<double*>np.PyArray_MultiIter_DATA(it, 2))[0]
-            (<double*>np.PyArray_MultiIter_DATA(it, 0))[0] = f(state, a_val, b_val)
+            randoms_data[i] = f(state, a_val, b_val)
 
             np.PyArray_MultiIter_NEXT(it)
 

randomstate/bounded_integers.pxi

@@ -13,7 +13,7 @@ cdef object _rand_int64(low, high, size, aug_state *state, lock):
     cdef uint64_t off, rng, buf
     cdef uint64_t *out
     cdef np.ndarray array
-    cdef int cnt
+    cdef np.npy_intp cnt
 
     rng = <uint64_t>(high - low)
     off = <uint64_t>(<int64_t>low)
@@ -68,7 +68,7 @@ cdef object _rand_int32(low, high, size, aug_state *state, lock):
     cdef uint32_t off, rng, buf
     cdef uint32_t *out
     cdef np.ndarray array
-    cdef int cnt
+    cdef np.npy_intp cnt
 
     rng = <uint32_t>(high - low)
     off = <uint32_t>(<int32_t>low)
@@ -88,7 +88,7 @@ cdef object _rand_int16(low, high, size, aug_state *state, lock):
     cdef uint16_t off, rng, buf
     cdef uint16_t *out
     cdef np.ndarray array
-    cdef int cnt
+    cdef np.npy_intp cnt
 
     rng = <uint16_t>(high - low)
     off = <uint16_t>(<int16_t>low)
@@ -108,7 +108,7 @@ cdef object _rand_int8(low, high, size, aug_state *state, lock):
     cdef uint8_t off, rng, buf
     cdef uint8_t *out
     cdef np.ndarray array
-    cdef int cnt
+    cdef np.npy_intp cnt
 
     rng = <uint8_t>(high - low)
     off = <uint8_t>(<int8_t>low)
@@ -131,7 +131,7 @@ cdef object _rand_uint64(low, high, size, aug_state *state, lock):
     cdef uint64_t off, rng, buf
     cdef uint64_t *out
     cdef np.ndarray array
-    cdef int cnt
+    cdef np.npy_intp cnt
 
     rng = <uint64_t>(high - low)
     off = <uint64_t>low
@@ -151,7 +151,7 @@ cdef object _rand_uint32(low, high, size, aug_state *state, lock):
     cdef uint32_t off, rng, buf
     cdef uint32_t *out
     cdef np.ndarray array
-    cdef int cnt
+    cdef np.npy_intp cnt
 
     rng = <uint32_t>(high - low)
     off = <uint32_t>low
@@ -171,7 +171,7 @@ cdef object _rand_uint16(low, high, size, aug_state *state, lock):
     cdef uint16_t off, rng, buf
     cdef uint16_t *out
     cdef np.ndarray array
-    cdef int cnt
+    cdef np.npy_intp cnt
 
     rng = <uint16_t>(high - low)
     off = <uint16_t>low
@@ -191,7 +191,7 @@ cdef object _rand_uint8(low, high, size, aug_state *state, lock):
     cdef uint8_t off, rng, buf
     cdef uint8_t *out
     cdef np.ndarray array
-    cdef int cnt
+    cdef np.npy_intp cnt
 
     rng = <uint8_t>(high - low)
     off = <uint8_t>low
@@ -212,7 +212,7 @@ cdef object _rand_bool(low, high, size, aug_state *state, lock):
     cdef int8_t off, rng, buf
     cdef int8_t *out
     cdef np.ndarray array
-    cdef int cnt
+    cdef np.npy_intp cnt
 
     rng = <uint8_t>(high - low)
     off = <uint8_t>low

randomstate/distributions.c

@@ -36,7 +36,7 @@ double random_standard_uniform(aug_state* state)
 }
 
 
-void random_uniform_fill(aug_state* state, int count, double *out)
+void random_uniform_fill(aug_state* state, intptr_t count, double *out)
 {
     int i;
     for (i=0; i < count; i++) {
@@ -50,7 +50,7 @@ double random_standard_exponential(aug_state* state)
     return -log(1.0 - random_double(state));
 }
 
-void random_standard_exponential_fill(aug_state* state, int count, double *out)
+void random_standard_exponential_fill(aug_state* state, intptr_t count, double *out)
 {
     int i;
     for (i=0; i < count; i++) {
@@ -87,7 +87,7 @@ double random_gauss(aug_state* state) {
     }
 }
 
-void random_gauss_fill(aug_state* state, int count, double *out) {
+void random_gauss_fill(aug_state* state, intptr_t count, double *out) {
     int i;
     double f, x1, x2, r2;
     for (i = 0; i< count; i++) {
@@ -1354,7 +1354,7 @@ double random_gauss_zig_julia(aug_state *state) {
 }
 
 
-void random_gauss_zig_julia_fill(aug_state *state, int count, double *out) {
+void random_gauss_zig_julia_fill(aug_state *state, intptr_t count, double *out) {
     uint64_t r;
     int64_t rabs;
     int idx, i;
@@ -1444,7 +1444,7 @@ static inline uint64_t gen_mask(uint64_t max)
  * Fills an array with cnt random npy_uint64 between off and off + rng
  * inclusive. The numbers wrap if rng is sufficiently large.
  */
-void random_bounded_uint64_fill(aug_state *state, uint64_t off, uint64_t rng, int cnt, uint64_t *out)
+void random_bounded_uint64_fill(aug_state *state, uint64_t off, uint64_t rng, intptr_t cnt, uint64_t *out)
 {
     uint64_t val, mask;
     int i;
@@ -1478,7 +1478,7 @@ void random_bounded_uint64_fill(aug_state *state, uint64_t off, uint64_t rng, in
  * Fills an array with cnt random npy_uint32 between off and off + rng
  * inclusive. The numbers wrap if rng is sufficiently large.
  */
-void random_bounded_uint32_fill(aug_state *state, uint32_t off, uint32_t rng, int cnt, uint32_t *out)
+void random_bounded_uint32_fill(aug_state *state, uint32_t off, uint32_t rng, intptr_t cnt, uint32_t *out)
 {
     uint32_t val, mask = rng;
     int i;
@@ -1504,7 +1504,7 @@ void random_bounded_uint32_fill(aug_state *state, uint32_t off, uint32_t rng, in
  * Fills an array with cnt random npy_uint16 between off and off + rng
  * inclusive. The numbers wrap if rng is sufficiently large.
  */
-void random_bounded_uint16_fill(aug_state *state, uint16_t off, uint16_t rng, int cnt, uint16_t *out)
+void random_bounded_uint16_fill(aug_state *state, uint16_t off, uint16_t rng, intptr_t cnt, uint16_t *out)
 {
     uint16_t val, mask;
     int i;
@@ -1541,7 +1541,7 @@ void random_bounded_uint16_fill(aug_state *state, uint16_t off, uint16_t rng, in
  * Fills an array with cnt random npy_uint8 between off and off + rng
  * inclusive. The numbers wrap if rng is sufficiently large.
  */
-void random_bounded_uint8_fill(aug_state *state, uint8_t off, uint8_t rng, int cnt, uint8_t *out)
+void random_bounded_uint8_fill(aug_state *state, uint8_t off, uint8_t rng, intptr_t cnt, uint8_t *out)
 {
     uint8_t val, mask = rng;
     int i;
@@ -1580,7 +1580,7 @@ void random_bounded_uint8_fill(aug_state *state, uint8_t off, uint8_t rng, int c
  * inclusive.
  */
 /* TODO: This needs to use bools. See original */
-void random_bool_fill(aug_state *state, int8_t off, int8_t rng, int cnt, int8_t *out)
+void random_bool_fill(aug_state *state, int8_t off, int8_t rng, intptr_t cnt, int8_t *out)
 {
     int i;
     uint32_t buf = 0;

randomstate/distributions.h

@@ -2,10 +2,12 @@
 #include <stdlib.h>
 
 #ifdef _WIN32
+#include "src/common/stdint.h"
 typedef int bool;
 #define false 0
 #define true 1
 #else
+#include <stdint.h>
 #endif
 
 #ifndef min
@@ -121,20 +123,20 @@ extern unsigned long random_uint(aug_state* state);
 
 extern unsigned long random_interval(aug_state* state, unsigned long max);
 
-extern void random_bounded_uint64_fill(aug_state *state, uint64_t off, uint64_t rng, int cnt, uint64_t *out);
+extern void random_bounded_uint64_fill(aug_state *state, uint64_t off, uint64_t rng, intptr_t cnt, uint64_t *out);
 
-extern void random_bounded_uint32_fill(aug_state *state, uint32_t off, uint32_t rng, int cnt,uint32_t *out);
+extern void random_bounded_uint32_fill(aug_state *state, uint32_t off, uint32_t rng, intptr_t cnt, uint32_t *out);
 
-extern void random_bounded_uint16_fill(aug_state *state, uint16_t off, uint16_t rng, int cnt, uint16_t *out);
+extern void random_bounded_uint16_fill(aug_state *state, uint16_t off, uint16_t rng, intptr_t cnt, uint16_t *out);
 
-extern void random_bounded_uint8_fill(aug_state *state, uint8_t off, uint8_t rng, int cnt, uint8_t *out);
+extern void random_bounded_uint8_fill(aug_state *state, uint8_t off, uint8_t rng, intptr_t cnt, uint8_t *out);
 
-extern void random_bool_fill(aug_state *state, int8_t off, int8_t rng, int cnt, int8_t *out);
+extern void random_bool_fill(aug_state *state, int8_t off, int8_t rng, intptr_t cnt, int8_t *out);
 
-extern void random_uniform_fill(aug_state* state, int count, double *out);
+extern void random_uniform_fill(aug_state* state, intptr_t count, double *out);
 
-extern void random_standard_exponential_fill(aug_state* state, int count, double *out);
+extern void random_standard_exponential_fill(aug_state* state, intptr_t count, double *out);
 
-extern void random_gauss_fill(aug_state* state, int count, double *out);
+extern void random_gauss_fill(aug_state* state, intptr_t count, double *out);
 
-extern void random_gauss_zig_julia_fill(aug_state *state, int count, double *out);
+extern void random_gauss_zig_julia_fill(aug_state *state, intptr_t count, double *out);

randomstate/interface.pyx

@@ -102,15 +102,15 @@ cdef extern from "distributions.h":
     cdef long random_zipf(aug_state *state, double a) nogil
     cdef long random_hypergeometric(aug_state *state, long good, long bad, long sample) nogil
 
-    cdef void random_bounded_uint64_fill(aug_state *state, uint64_t off, uint64_t rng, int cnt, uint64_t *out) nogil
-    cdef void random_bounded_uint32_fill(aug_state *state, uint32_t off, uint32_t rng, int cnt,uint32_t *out) nogil
-    cdef void random_bounded_uint16_fill(aug_state *state, uint16_t off, uint16_t rng, int cnt, uint16_t *out) nogil
-    cdef void random_bounded_uint8_fill(aug_state *state, uint8_t off, uint8_t rng, int cnt, uint8_t *out) nogil
-    cdef void random_bool_fill(aug_state *state, int8_t off, int8_t rng, int cnt, int8_t *out) nogil
-    cdef void random_uniform_fill(aug_state *state, int cnt, double *out) nogil
-    cdef void random_standard_exponential_fill(aug_state* state, int count, double *out) nogil
-    cdef void random_gauss_fill(aug_state* state, int count, double *out) nogil
-    cdef void random_gauss_zig_julia_fill(aug_state* state, int count, double *out) nogil
+    cdef void random_bounded_uint64_fill(aug_state *state, uint64_t off, uint64_t rng, intptr_t cnt, uint64_t *out) nogil
+    cdef void random_bounded_uint32_fill(aug_state *state, uint32_t off, uint32_t rng, intptr_t cnt,uint32_t *out) nogil
+    cdef void random_bounded_uint16_fill(aug_state *state, uint16_t off, uint16_t rng, intptr_t cnt, uint16_t *out) nogil
+    cdef void random_bounded_uint8_fill(aug_state *state, uint8_t off, uint8_t rng, intptr_t cnt, uint8_t *out) nogil
+    cdef void random_bool_fill(aug_state *state, int8_t off, int8_t rng, intptr_t cnt, int8_t *out) nogil
+    cdef void random_uniform_fill(aug_state *state, intptr_t cnt, double *out) nogil
+    cdef void random_standard_exponential_fill(aug_state* state, intptr_t count, double *out) nogil
+    cdef void random_gauss_fill(aug_state* state, intptr_t count, double *out) nogil
+    cdef void random_gauss_zig_julia_fill(aug_state* state, intptr_t count, double *out) nogil
 
 include "array_utilities.pxi"
 include "bounded_integers.pxi"