Better minimisation behaviour for multi_promotable_dtypes()

Author: honno

array_api_tests/dtype_helpers.py

@@ -27,16 +27,16 @@
 ]
 
 
-_int_names = ('int8', 'int16', 'int32', 'int64')
 _uint_names = ('uint8', 'uint16', 'uint32', 'uint64')
+_int_names = ('int8', 'int16', 'int32', 'int64')
 _float_names = ('float32', 'float64')
-_dtype_names = ('bool',) + _int_names + _uint_names + _float_names
+_dtype_names = ('bool',) + _uint_names + _int_names + _float_names
 
 
-int_dtypes = tuple(getattr(xp, name) for name in _int_names)
 uint_dtypes = tuple(getattr(xp, name) for name in _uint_names)
+int_dtypes = tuple(getattr(xp, name) for name in _int_names)
 float_dtypes = tuple(getattr(xp, name) for name in _float_names)
-all_int_dtypes = int_dtypes + uint_dtypes
+all_int_dtypes = uint_dtypes + int_dtypes
 numeric_dtypes = all_int_dtypes + float_dtypes
 all_dtypes = (xp.bool,) + numeric_dtypes
 bool_and_all_int_dtypes = (xp.bool,) + all_int_dtypes

array_api_tests/test_type_promotion.py

@@ -46,13 +46,15 @@ def multi_promotable_dtypes(
     allow_bool: bool = True,
 ) -> st.SearchStrategy[Tuple[DT, ...]]:
     strats = [
+        st.lists(st.sampled_from(dh.uint_dtypes), min_size=2),
+        st.lists(st.sampled_from(dh.int_dtypes), min_size=2),
+        st.lists(st.sampled_from(dh.float_dtypes), min_size=2),
         st.lists(st.sampled_from(dh.all_int_dtypes), min_size=2).filter(
             lambda l: not (xp.uint64 in l and any(d in dh.int_dtypes for d in l))
         ),
-        st.lists(st.sampled_from(dh.float_dtypes), min_size=2),
     ]
     if allow_bool:
-        strats.append(st.lists(st.just(xp.bool), min_size=2))
+        strats.insert(0, st.lists(st.just(xp.bool), min_size=2))
     return st.one_of(strats).map(tuple)