Merge branch 'master' into 2023-fixes

Author: asmeurer

array_api_tests/test_array_object.py

@@ -243,10 +243,11 @@ def test_setitem_masking(shape, data):
 
 
 def make_scalar_casting_param(
-    method_name: str, dtype_name: DataType, stype: ScalarType
+    method_name: str, dtype: DataType, stype: ScalarType
 ) -> Param:
+    dtype_name = dh.dtype_to_name[dtype]
     return pytest.param(
-        method_name, dtype_name, stype, id=f"{method_name}({dtype_name})"
+        method_name, dtype, stype, id=f"{method_name}({dtype_name})"
     )
 
 

array_api_tests/test_special_cases.py

@@ -23,7 +23,7 @@
 from warnings import warn
 
 import pytest
-from hypothesis import given, note, settings
+from hypothesis import given, note, settings, assume
 from hypothesis import strategies as st
 
 from array_api_tests.typing import Array, DataType
@@ -1333,10 +1333,11 @@ def test_empty_arrays(func_name, expected):  # TODO: parse docstrings to get exp
 )
 def test_nan_propagation(func_name, x, data):
     func = getattr(xp, func_name)
-    set_idx = data.draw(
-        xps.indices(x.shape, max_dims=0, allow_ellipsis=False), label="set idx"
+    nan_positions = data.draw(
+        hh.arrays(dtype=hh.bool_dtype, shape=x.shape), label="nan_positions"
     )
-    x[set_idx] = float("nan")
+    assume(xp.any(nan_positions))
+    x = xp.where(nan_positions, xp.asarray(float("nan")), x)
     note(f"{x=}")
 
     out = func(x)

conftest.py

@@ -1,7 +1,6 @@
 from functools import lru_cache
 from pathlib import Path
 import argparse
-import math
 import warnings
 import os
 
@@ -37,7 +36,7 @@ def pytest_addoption(parser):
         "--hypothesis-max-examples",
         "--max-examples",
         action="store",
-        default=20,
+        default=100,
         type=int,
         help="set the Hypothesis max_examples setting",
     )
@@ -162,7 +161,7 @@ def pytest_collection_modifyitems(config, items):
 
     disabled_exts = config.getoption("--disable-extension")
     disabled_dds = config.getoption("--disable-data-dependent-shapes")
-    unvectorized_max_examples = math.ceil(math.log(config.getoption("--hypothesis-max-examples")))
+    unvectorized_max_examples = config.getoption("--hypothesis-max-examples")//10
 
     # 2. Iterate through items and apply markers accordingly
     # ------------------------------------------------------
@@ -226,7 +225,7 @@ def pytest_collection_modifyitems(config, items):
     # ----------------------------------
 
     bad_ids_end_msg = (
-        "Note the relevant tests might not of been collected by pytest, or "
+        "Note the relevant tests might not have been collected by pytest, or "
         "another specified id might have already matched a test."
     )
     bad_skip_ids = [id_ for id_, matched in skip_id_matched.items() if not matched]