Split out different types of dtypes

asmeurer · asmeurer · commit ce37065a5fca · 2021-01-07T15:35:45.000-07:00
diff --git a/array_api_tests/_array_module.py b/array_api_tests/_array_module.py
@@ -53,20 +53,32 @@ def __repr__(self):
     __call__ = _raise
     __getattr__ = _raise
 
-_dtypes = [
-    'bool',
-    'int8',
+_integer_dtypes = [
+        'int8',
     'int16',
     'int32',
     'int64',
     'uint8',
     'uint16',
     'uint32',
     'uint64',
+]
+
+_floating_dtypes = [
     'float32',
     'float64',
 ]
 
+_numeric_dtypes = [
+    *_integer_dtypes,
+    *_floating_dtypes,
+]
+
+_dtypes = [
+    'bool',
+    *_numeric_dtypes
+]
+
 for func_name in function_stubs.__all__ + _dtypes:
     try:
         globals()[func_name] = getattr(mod, func_name)
diff --git a/array_api_tests/hypothesis_helpers.py b/array_api_tests/hypothesis_helpers.py
@@ -7,13 +7,22 @@
 from hypothesis import assume
 
 from .pytest_helpers import nargs
-from ._array_module import _dtypes, ones, full
+from ._array_module import (_integer_dtypes, _floating_dtypes,
+                            _numeric_dtypes, _dtypes, ones, full)
 from . import _array_module
 
 from .function_stubs import elementwise_functions
 
+integer_dtype_objects = [getattr(_array_module, t) for t in _integer_dtypes]
+floating_dtype_objects = [getattr(_array_module, t) for t in _floating_dtypes]
+numeric_dtype_objects = [getattr(_array_module, t) for t in _numeric_dtypes]
 dtype_objects = [getattr(_array_module, t) for t in _dtypes]
+
+integer_dtypes = sampled_from(integer_dtype_objects)
+floating_dtypes = sampled_from(floating_dtype_objects)
+numeric_dtypes = sampled_from(numeric_dtype_objects)
 dtypes = sampled_from(dtype_objects)
+
 shared_dtypes = shared(dtypes)
 
 # shared() allows us to draw either the function or the function name and they
