Rudimentary elementwise parameters refactor

Author: honno

array_api_tests/dtype_helpers.py

@@ -3,15 +3,15 @@
 
 __all__ = [
     'dtypes_to_scalars',
-    'input_types',
+    'category_to_dtypes',
     'promotion_table',
     'dtype_nbits',
     'dtype_signed',
+    'func_in_categories',
+    'func_out_categories',
     'binary_operators',
     'unary_operators',
     'operators_to_functions',
-    'elementwise_function_input_types',
-    'elementwise_function_output_types',
 ]
 
 
@@ -30,7 +30,7 @@
 }
 
 
-input_types = {
+category_to_dtypes = {
     'any': all_dtypes,
     'boolean': (xp.bool,),
     'floating': float_dtypes,
@@ -84,6 +84,7 @@
 promotion_table = {
     (xp.bool, xp.bool): xp.bool,
     **_numeric_promotions,
+    # TODO: dont unpack pairs of the same dtype
     **{(d2, d1): res for (d1, d2), res in _numeric_promotions.items()},
 }
 
@@ -102,7 +103,7 @@
 }
 
 
-elementwise_function_input_types = {
+func_in_categories = {
     'abs': 'numeric',
     'acos': 'floating',
     'acosh': 'floating',
@@ -162,7 +163,7 @@
 }
 
 
-elementwise_function_output_types = {
+func_out_categories = {
     'abs': 'promoted',
     'acos': 'promoted',
     'acosh': 'promoted',

array_api_tests/test_broadcasting.py

@@ -10,7 +10,7 @@
 from .hypothesis_helpers import shapes, FILTER_UNDEFINED_DTYPES
 from .pytest_helpers import raises, doesnt_raise, nargs
 
-from .dtype_helpers import elementwise_function_input_types, input_types
+from .dtype_helpers import func_in_categories, category_to_dtypes
 from .function_stubs import elementwise_functions
 from . import _array_module
 from ._array_module import ones, _UndefinedStub
@@ -115,7 +115,7 @@ def test_broadcasting_hypothesis(func_name, shape1, shape2, data):
     # Internal consistency checks
     assert nargs(func_name) == 2
 
-    dtype = data.draw(sampled_from(input_types[elementwise_function_input_types[func_name]]))
+    dtype = data.draw(sampled_from(category_to_dtypes[func_in_categories[func_name]]))
     if FILTER_UNDEFINED_DTYPES:
         assume(not isinstance(dtype, _UndefinedStub))
     func = getattr(_array_module, func_name)

array_api_tests/test_signatures.py

@@ -4,7 +4,7 @@
 
 from ._array_module import mod, mod_name, ones, eye, float64, bool, int64
 from .pytest_helpers import raises, doesnt_raise
-from .dtype_helpers import elementwise_function_input_types, operators_to_functions
+from .dtype_helpers import func_in_categories, operators_to_functions
 
 from . import function_stubs
 
@@ -163,9 +163,9 @@ def test_function_positional_args(name):
         n = operators_to_functions[name[:2] + name[3:]]
     else:
         n = operators_to_functions.get(name, name)
-    if 'boolean' in elementwise_function_input_types.get(n, 'floating'):
+    if 'boolean' in func_in_categories.get(n, 'floating'):
         dtype = bool
-    elif 'integer' in elementwise_function_input_types.get(n, 'floating'):
+    elif 'integer' in func_in_categories.get(n, 'floating'):
         dtype = int64
 
     if array_method(name):