fixed tolerance for cholesky and reduced number of tests

Author: thib-s

tests/test_orthogonality_conv.py

@@ -249,8 +249,8 @@ def test_dilation_strided(
 
 
 @pytest.mark.parametrize("kernel_size", [3, 4, 5])
-@pytest.mark.parametrize("input_channels", [2, 4, 8, 16, 32])
-@pytest.mark.parametrize("output_channels", [2, 4, 8, 16, 32])
+@pytest.mark.parametrize("input_channels", [2, 4, 32])
+@pytest.mark.parametrize("output_channels", [2, 4, 32])
 @pytest.mark.parametrize("stride", [2, 4])
 @pytest.mark.parametrize("groups", [1])
 def test_strided(kernel_size, input_channels, output_channels, stride, groups):
@@ -340,8 +340,8 @@ def test_even_kernels(kernel_size, input_channels, output_channels, stride, grou
 
 
 @pytest.mark.parametrize("kernel_size", [1, 2])
-@pytest.mark.parametrize("input_channels", [4, 8, 16, 32, 64])
-@pytest.mark.parametrize("output_channels", [4, 8, 16, 32, 64])
+@pytest.mark.parametrize("input_channels", [4, 8, 32])
+@pytest.mark.parametrize("output_channels", [4, 8, 32])
 @pytest.mark.parametrize("groups", [1, 2])
 def test_rko(kernel_size, input_channels, output_channels, groups):
     """
@@ -475,19 +475,6 @@ def test_invalid_dilation_with_stride():
             groups=1,
             padding=0,
         )
-    # with pytest.raises( # catched as you cannot instanciate FastBlockConv2d with co > ci & s>1
-    #     ValueError,
-    #     match=r"dilation must be 1 when stride is not 1",
-    # ):
-    #     FastBlockConv2d(
-    #         in_channels=8,
-    #         out_channels=16,
-    #         kernel_size=3,
-    #         stride=2,
-    #         dilation=2,  # Invalid: dilation > 1 while stride > 1
-    #         groups=1,
-    #         padding=0,
-    #     )
     with pytest.raises(
         ValueError,
         match=r"dilation must be 1 when stride is not 1",
@@ -576,6 +563,6 @@ def test_parametrizers_standard_configs(
             kernel_size,
             kernel_size,
         ),
-        tol=3e-2 if ortho_params.startswith("cholesky") else 1e-3,
+        tol=5e-2 if ortho_params.startswith("cholesky") else 1e-3,
         sigma_min_requirement=0.75 if ortho_params.startswith("cholesky") else 0.95,
     )

tests/test_orthogonality_conv_transpose.py

@@ -35,8 +35,8 @@ def _compute_sv_impulse_response_layer(layer, img_shape):
 
 
 @pytest.mark.parametrize("kernel_size", [1, 2, 3])
-@pytest.mark.parametrize("input_channels", [4, 8, 16, 32])
-@pytest.mark.parametrize("output_channels", [4, 8, 16, 32])
+@pytest.mark.parametrize("input_channels", [4, 8, 32])
+@pytest.mark.parametrize("output_channels", [4, 8, 32])
 @pytest.mark.parametrize("stride", [1, 2])
 @pytest.mark.parametrize("groups", [1, 2])
 def test_convtranspose(kernel_size, input_channels, output_channels, stride, groups):
@@ -182,40 +182,6 @@ def test_parametrizers_standard_configs(
             kernel_size,
             kernel_size,
         ),
-        tol=3e-2 if ortho_params.startswith("cholesky") else 1e-3,
+        tol=5e-2 if ortho_params.startswith("cholesky") else 1e-3,
         sigma_min_requirement=0.75 if ortho_params.startswith("cholesky") else 0.95,
     )
-
-    # try:
-    #     orthoconvtranspose = AdaptiveOrthoConvTranspose2d(
-    #         kernel_size=kernel_size,
-    #         in_channels=input_channels,
-    #         out_channels=output_channels,
-    #         stride=stride,
-    #         groups=groups,
-    #         bias=False,
-    #         padding=(kernel_size // 2, kernel_size // 2),
-    #         # padding_mode="circular",
-    #         ortho_params=ortho_params_dict[ortho_params],
-    #     )
-    # except Exception as e:
-    #     if kernel_size < stride:
-    #         # we expect this configuration to raise a RuntimeError
-    #         # pytest.skip(f"BCOP instantiation failed with: {e}")
-    #         return
-    #     else:
-    #         pytest.fail(f"BCOP instantiation failed with: {e}")
-    # check_orthogonal_layer(
-    #     orthoconvtranspose,
-    #     groups,
-    #     input_channels,
-    #     kernel_size,
-    #     output_channels,
-    #     (
-    #         output_channels,
-    #         input_channels // groups,
-    #         kernel_size,
-    #         kernel_size,
-    #     ),
-    #     tol=3e-2 if ortho_params.startswith("cholesky") else 1e-4,
-    # )

tests/test_rko.py

@@ -150,8 +150,8 @@ def test_standard_configs(kernel_size, input_channels, output_channels, stride,
 
 
 @pytest.mark.parametrize("kernel_size", [3, 4, 5])
-@pytest.mark.parametrize("input_channels", [2, 4, 8, 16, 32])
-@pytest.mark.parametrize("output_channels", [2, 4, 8, 16, 32])
+@pytest.mark.parametrize("input_channels", [2, 4, 16])
+@pytest.mark.parametrize("output_channels", [2, 4, 16])
 @pytest.mark.parametrize("stride", [2, 4])
 @pytest.mark.parametrize("groups", [1])
 def test_strided(kernel_size, input_channels, output_channels, stride, groups):
@@ -244,8 +244,8 @@ def test_even_kernels(kernel_size, input_channels, output_channels, stride, grou
 
 
 @pytest.mark.parametrize("kernel_size", [1, 2])
-@pytest.mark.parametrize("input_channels", [4, 8, 16, 32, 64])
-@pytest.mark.parametrize("output_channels", [4, 8, 16, 32, 64])
+@pytest.mark.parametrize("input_channels", [4, 8, 32])
+@pytest.mark.parametrize("output_channels", [4, 8, 32])
 @pytest.mark.parametrize("groups", [1, 2])
 def test_rko(kernel_size, input_channels, output_channels, groups):
     """