Internally flatmap promotable_dtypes

Author: honno

array_api_tests/hypothesis_helpers.py

@@ -3,8 +3,9 @@
 from math import sqrt
 
 from hypothesis.strategies import (lists, integers, builds, sampled_from,
-                                   shared, floats, just, composite, one_of,
-                                   none, booleans)
+                                   shared, tuples as hypotheses_tuples,
+                                   floats, just, composite, one_of, none,
+                                   booleans, SearchStrategy)
 from hypothesis.extra.numpy import mutually_broadcastable_shapes
 from hypothesis.extra.array_api import make_strategies_namespace
 from hypothesis import assume
@@ -70,6 +71,8 @@ def make_dtype_pairs():
     return dtype_pairs
 
 def promotable_dtypes(dtype):
+    if isinstance(dtype, SearchStrategy):
+        return dtype.flatmap(promotable_dtypes)
     dtype_pairs = make_dtype_pairs()
     dtypes = [j for i, j in dtype_pairs if i == dtype]
     return sampled_from(dtypes)

array_api_tests/test_creation_functions.py

@@ -84,7 +84,7 @@ def test_empty(shape, dtype):
         dtype=shared_dtypes,
         shape=xps.array_shapes(),
     ),
-    dtype=one_of(none(), shared_dtypes.flatmap(promotable_dtypes)),
+    dtype=one_of(none(), promotable_dtypes(shared_dtypes)),
 )
 def test_empty_like(a, dtype):
     kwargs = {} if dtype is None else {'dtype': dtype}
@@ -155,8 +155,8 @@ def test_full(shape, fill_value, dtype):
         dtype=shared_dtypes,
         shape=xps.array_shapes(),
     ),
-    fill_value=shared_dtypes.flatmap(promotable_dtypes).flatmap(xps.from_dtype),
-    dtype=one_of(none(), shared_dtypes.flatmap(promotable_dtypes)),
+    fill_value=promotable_dtypes(shared_dtypes).flatmap(xps.from_dtype),
+    dtype=one_of(none(), promotable_dtypes(shared_dtypes)),
 )
 def test_full_like(a, fill_value, dtype):
     kwargs = {} if dtype is None else {'dtype': dtype}
@@ -247,7 +247,7 @@ def test_ones(shape, dtype):
         dtype=shared_dtypes,
         shape=xps.array_shapes(),
     ),
-    dtype=one_of(none(), shared_dtypes.flatmap(promotable_dtypes)),
+    dtype=one_of(none(), promotable_dtypes(shared_dtypes)),
 )
 def test_ones_like(a, dtype):
     kwargs = {} if dtype is None else {'dtype': dtype}
@@ -298,7 +298,7 @@ def test_zeros(shape, dtype):
         dtype=shared_dtypes,
         shape=xps.array_shapes(),
     ),
-    dtype=one_of(none(), shared_dtypes.flatmap(promotable_dtypes)),
+    dtype=one_of(none(), promotable_dtypes(shared_dtypes)),
 )
 def test_zeros_like(a, dtype):
     kwargs = {} if dtype is None else {'dtype': dtype}