Merge pull request #743 from DeaMariaLeon/bench3

test: Modified index and slice tests in order to vary ranks

Author: DeaMariaLeon

benchmarks/conftest.py

@@ -4,3 +4,8 @@
 @pytest.fixture
 def seed(scope="session"):
     return 42
+
+
+@pytest.fixture
+def max_size(scope="session"):
+    return 2**26

benchmarks/test_benchmark_coo.py

@@ -15,8 +15,8 @@ def side_ids(side):
 
 
 @pytest.mark.parametrize("side", [100, 500, 1000], ids=side_ids)
-def test_matmul(benchmark, side, seed):
-    if side**2 >= 2**26:
+def test_matmul(benchmark, side, seed, max_size):
+    if side**2 >= max_size:
         pytest.skip()
     rng = np.random.default_rng(seed=seed)
     x = sparse.random((side, side), density=DENSITY, random_state=rng)
@@ -29,15 +29,15 @@ def bench():
         x @ y
 
 
-def elemwise_test_name(param):
+def get_test_id(param):
     side, rank = param
     return f"{side=}-{rank=}"
 
 
-@pytest.fixture(params=itertools.product([100, 500, 1000], [1, 2, 3, 4]), ids=elemwise_test_name)
-def elemwise_args(request, seed):
+@pytest.fixture(params=itertools.product([100, 500, 1000], [1, 2, 3, 4]), ids=get_test_id)
+def elemwise_args(request, seed, max_size):
     side, rank = request.param
-    if side**rank >= 2**26:
+    if side**rank >= max_size:
         pytest.skip()
     rng = np.random.default_rng(seed=seed)
     shape = (side,) * rank
@@ -57,9 +57,9 @@ def bench():
 
 
 @pytest.fixture(params=[100, 500, 1000], ids=side_ids)
-def elemwise_broadcast_args(request, seed):
+def elemwise_broadcast_args(request, seed, max_size):
     side = request.param
-    if side**2 >= 2**26:
+    if side**2 >= max_size:
         pytest.skip()
     rng = np.random.default_rng(seed=seed)
     x = sparse.random((side, 1, side), density=DENSITY, random_state=rng)
@@ -77,65 +77,46 @@ def bench():
         f(x, y)
 
 
-@pytest.fixture(params=[100, 500, 1000], ids=side_ids)
-def indexing_args(request, seed):
-    side = request.param
-    if side**3 >= 2**26:
+@pytest.fixture(params=itertools.product([100, 500, 1000], [1, 2, 3]), ids=get_test_id)
+def indexing_args(request, seed, max_size):
+    side, rank = request.param
+    if side**rank >= max_size:
         pytest.skip()
     rng = np.random.default_rng(seed=seed)
+    shape = (side,) * rank
 
-    return sparse.random((side, side, side), density=DENSITY, random_state=rng)
+    return sparse.random(shape, density=DENSITY, random_state=rng)
 
 
 def test_index_scalar(benchmark, indexing_args):
     x = indexing_args
     side = x.shape[0]
+    rank = x.ndim
 
-    x[side // 2, side // 2, side // 2]  # Numba compilation
+    x[(side // 2,) * rank]  # Numba compilation
 
     @benchmark
     def bench():
-        x[side // 2, side // 2, side // 2]
+        x[(side // 2,) * rank]
 
 
 def test_index_slice(benchmark, indexing_args):
     x = indexing_args
     side = x.shape[0]
+    rank = x.ndim
 
-    x[: side // 2]  # Numba compilation
-
-    @benchmark
-    def bench():
-        x[: side // 2]
-
-
-def test_index_slice2(benchmark, indexing_args):
-    x = indexing_args
-    side = x.shape[0]
-
-    x[: side // 2, : side // 2]  # Numba compilation
-
-    @benchmark
-    def bench():
-        x[: side // 2, : side // 2]
-
-
-def test_index_slice3(benchmark, indexing_args):
-    x = indexing_args
-    side = x.shape[0]
-
-    x[: side // 2, : side // 2, : side // 2]  # Numba compilation
+    x[(slice(side // 2),) * rank]  # Numba compilation
 
     @benchmark
     def bench():
-        x[: side // 2, : side // 2, : side // 2]
+        x[(slice(side // 2),) * rank]
 
 
 def test_index_fancy(benchmark, indexing_args, seed):
     x = indexing_args
     side = x.shape[0]
     rng = np.random.default_rng(seed=seed)
-    index = rng.integers(0, side, side // 2)
+    index = rng.integers(0, side, size=(side // 2,))
 
     x[index]  # Numba compilation