Merge pull request numpy#28116 from WarrenWeckesser/fix-zipf-compiler-warning

MAINT: random: Explicitly cast RAND_INT_MAX to double to avoid compiler warning

Author: rgommers

numpy/random/_common.pyx

@@ -467,7 +467,7 @@ cdef int check_constraint(double val, object name, constraint_type cons) except
         # Note: Assume value is integral (double of LONG_MAX should work out)
         if val < 0:
             raise ValueError(name + " < 0")
-        elif val > LONG_MAX:
+        elif val > <double> LONG_MAX:
             raise ValueError(
                     name + " is out of bounds for long, consider using "
                     "the new generator API for 64bit integers.")
@@ -918,31 +918,33 @@ cdef object disc(void *func, void *state, object size, object lock,
         else:
             raise NotImplementedError("No vector path available")
 
+    # At this point, we know is_scalar is True.
+
     if narg_double > 0:
         _da = PyFloat_AsDouble(a)
-        if a_constraint != CONS_NONE and is_scalar:
+        if a_constraint != CONS_NONE:
             check_constraint(_da, a_name, a_constraint)
 
         if narg_double > 1:
             _db = PyFloat_AsDouble(b)
-            if b_constraint != CONS_NONE and is_scalar:
+            if b_constraint != CONS_NONE:
                 check_constraint(_db, b_name, b_constraint)
         elif narg_int64 == 1:
             _ib = <int64_t>b
-            if b_constraint != CONS_NONE and is_scalar:
+            if b_constraint != CONS_NONE:
                 check_constraint(<double>_ib, b_name, b_constraint)
     else:
         if narg_int64 > 0:
             _ia = <int64_t>a
-            if a_constraint != CONS_NONE and is_scalar:
+            if a_constraint != CONS_NONE:
                 check_constraint(<double>_ia, a_name, a_constraint)
         if narg_int64 > 1:
             _ib = <int64_t>b
-            if b_constraint != CONS_NONE and is_scalar:
+            if b_constraint != CONS_NONE:
                 check_constraint(<double>_ib, b_name, b_constraint)
         if narg_int64 > 2:
             _ic = <int64_t>c
-            if c_constraint != CONS_NONE and is_scalar:
+            if c_constraint != CONS_NONE:
                 check_constraint(<double>_ic, c_name, c_constraint)
 
     if size is None:

numpy/random/src/distributions/distributions.c

@@ -1023,7 +1023,7 @@ RAND_INT_TYPE random_zipf(bitgen_t *bitgen_state, double a) {
    * Values below Umin would result in X being rejected because it is too
    * large, so there is no point in including them in the distribution of U.
    */
-  Umin = pow(RAND_INT_MAX, -am1);
+  Umin = pow((double) RAND_INT_MAX, -am1);
   while (1) {
     double U01, T, U, V, X;