From f1aa6f03882ab58e3e783d65dc8520bec6095e0f Mon Sep 17 00:00:00 2001 From: vfdev-5 Date: Thu, 23 Feb 2023 22:10:50 +0100 Subject: [PATCH 1/6] Fixed broken test_random_choice --- test/test_transforms_v2_consistency.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_transforms_v2_consistency.py b/test/test_transforms_v2_consistency.py index 43f17c9b15a..021c9636b42 100644 --- a/test/test_transforms_v2_consistency.py +++ b/test/test_transforms_v2_consistency.py @@ -822,7 +822,7 @@ def test_random_choice(self, probabilities): v2_transforms.Resize(256), legacy_transforms.CenterCrop(224), ], - probabilities=probabilities, + p=probabilities, ) legacy_transform = legacy_transforms.RandomChoice( [ From e7b59971ee1218fece6e8a749440f6c74e6c918d Mon Sep 17 00:00:00 2001 From: vfdev-5 Date: Thu, 23 Feb 2023 22:13:41 +0100 Subject: [PATCH 2/6] xfailed test_functional_deprecation_warning --- test/test_transforms.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_transforms.py b/test/test_transforms.py index 03b385e9edd..3799157ecfb 100644 --- a/test/test_transforms.py +++ b/test/test_transforms.py @@ -2278,6 +2278,7 @@ def test_random_grayscale_with_grayscale_input(): ), ) @pytest.mark.parametrize("from_private", (True, False)) +@pytest.mark.xfail def test_functional_deprecation_warning(import_statement, from_private): if from_private: import_statement = import_statement.replace("functional", "_functional") From 067fb41a2b1029a47c7775833db191797978c564 Mon Sep 17 00:00:00 2001 From: vfdev-5 Date: Fri, 24 Feb 2023 09:49:04 +0100 Subject: [PATCH 3/6] Fixed another failure in TestRandomChoice --- test/test_transforms_v2.py | 2 +- torchvision/transforms/v2/_container.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_transforms_v2.py b/test/test_transforms_v2.py index 9173ec14f2c..f55b97ce861 100644 --- a/test/test_transforms_v2.py +++ b/test/test_transforms_v2.py @@ -1359,7 +1359,7 @@ def test_ctor(self, transform_cls, trfms): class TestRandomChoice: def test_assertions(self): - with pytest.raises(ValueError, match="The number of probabilities doesn't match the number of transforms"): + with pytest.raises(ValueError, match="Length of p doesn't match the number of transforms"): transforms.RandomChoice([transforms.Pad(2), transforms.RandomCrop(28)], p=[1]) diff --git a/torchvision/transforms/v2/_container.py b/torchvision/transforms/v2/_container.py index 27affc7100b..7f9df337352 100644 --- a/torchvision/transforms/v2/_container.py +++ b/torchvision/transforms/v2/_container.py @@ -139,7 +139,7 @@ def __init__( p = [1] * len(transforms) elif len(p) != len(transforms): raise ValueError( - f"The number of p doesn't match the number of transforms: " f"{len(p)} != {len(transforms)}" + f"Length of p doesn't match the number of transforms: " f"{len(p)} != {len(transforms)}" ) super().__init__() From 544de888d381ea939cca6aab697b2b79cdace377 Mon Sep 17 00:00:00 2001 From: vfdev-5 Date: Fri, 24 Feb 2023 09:50:55 +0100 Subject: [PATCH 4/6] More xfail --- test/test_transforms_v2.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/test_transforms_v2.py b/test/test_transforms_v2.py index f55b97ce861..1a4fbc5149c 100644 --- a/test/test_transforms_v2.py +++ b/test/test_transforms_v2.py @@ -2088,6 +2088,7 @@ def test_sanitize_bounding_boxes_errors(): ), ) @pytest.mark.parametrize("call_disable_warning", (True, False)) +@pytest.mark.xfail def test_warnings_v2_namespaces(import_statement, call_disable_warning): if call_disable_warning: source = f""" @@ -2107,6 +2108,7 @@ def test_warnings_v2_namespaces(import_statement, call_disable_warning): assert_run_python_script(textwrap.dedent(source)) +@pytest.mark.xfail def test_no_warnings_v1_namespace(): source = """ import warnings From 83f82ba5f5ae329c820e434b7994e626d1d48482 Mon Sep 17 00:00:00 2001 From: vfdev-5 Date: Fri, 24 Feb 2023 11:17:31 +0100 Subject: [PATCH 5/6] Removed xfail --- test/test_transforms.py | 1 - test/test_transforms_v2.py | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/test/test_transforms.py b/test/test_transforms.py index 3799157ecfb..03b385e9edd 100644 --- a/test/test_transforms.py +++ b/test/test_transforms.py @@ -2278,7 +2278,6 @@ def test_random_grayscale_with_grayscale_input(): ), ) @pytest.mark.parametrize("from_private", (True, False)) -@pytest.mark.xfail def test_functional_deprecation_warning(import_statement, from_private): if from_private: import_statement = import_statement.replace("functional", "_functional") diff --git a/test/test_transforms_v2.py b/test/test_transforms_v2.py index 1a4fbc5149c..1271f84535d 100644 --- a/test/test_transforms_v2.py +++ b/test/test_transforms_v2.py @@ -2,6 +2,7 @@ import pathlib import random import re +import sys import textwrap import warnings from collections import defaultdict @@ -2088,7 +2089,6 @@ def test_sanitize_bounding_boxes_errors(): ), ) @pytest.mark.parametrize("call_disable_warning", (True, False)) -@pytest.mark.xfail def test_warnings_v2_namespaces(import_statement, call_disable_warning): if call_disable_warning: source = f""" @@ -2108,7 +2108,6 @@ def test_warnings_v2_namespaces(import_statement, call_disable_warning): assert_run_python_script(textwrap.dedent(source)) -@pytest.mark.xfail def test_no_warnings_v1_namespace(): source = """ import warnings From 844b54f55e1a88b56d45e8588bc8782c4ae4f527 Mon Sep 17 00:00:00 2001 From: vfdev-5 Date: Fri, 24 Feb 2023 11:24:16 +0100 Subject: [PATCH 6/6] Removed unused import sys --- test/test_transforms_v2.py | 1 - 1 file changed, 1 deletion(-) diff --git a/test/test_transforms_v2.py b/test/test_transforms_v2.py index 1271f84535d..f55b97ce861 100644 --- a/test/test_transforms_v2.py +++ b/test/test_transforms_v2.py @@ -2,7 +2,6 @@ import pathlib import random import re -import sys import textwrap import warnings from collections import defaultdict