From 036d1e7f56238cf6c98dad40152b76a82c993827 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Mon, 27 Feb 2023 16:12:15 +0100 Subject: [PATCH 1/3] Revert "skip flaky adjust_contrast kernel tests (#7347)" This reverts commit 547dd1d05a83e1f9d04da891c73aff146b6c0316. --- test/transforms_v2_kernel_infos.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/test/transforms_v2_kernel_infos.py b/test/transforms_v2_kernel_infos.py index 3c3611cb8cc..a29e0429d1a 100644 --- a/test/transforms_v2_kernel_infos.py +++ b/test/transforms_v2_kernel_infos.py @@ -1925,9 +1925,6 @@ def sample_inputs_adjust_contrast_video(): yield ArgsKwargs(video_loader, contrast_factor=_ADJUST_CONTRAST_FACTORS[0]) -# TODO: this is just temporary to make CI green for release. We should add proper tolerances after -skip_adjust_contrast_jit = TestMark(("TestKernels", "test_scripted_vs_eager"), pytest.mark.skip(reason="Test is flaky")) - KERNEL_INFOS.extend( [ KernelInfo( @@ -1942,13 +1939,11 @@ def sample_inputs_adjust_contrast_video(): **float32_vs_uint8_pixel_difference(2), **cuda_vs_cpu_pixel_difference(), }, - test_marks=[skip_adjust_contrast_jit], ), KernelInfo( F.adjust_contrast_video, sample_inputs_fn=sample_inputs_adjust_contrast_video, closeness_kwargs=cuda_vs_cpu_pixel_difference(), - test_marks=[skip_adjust_contrast_jit], ), ] ) From 045c5e03cfa4cac6cefcf1b3e39591665b15ea97 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Mon, 27 Feb 2023 16:28:25 +0100 Subject: [PATCH 2/3] Revert "skip flaky adjust_saturation kernel tests (#7348)" This reverts commit cd3324639372c6a10b50703dc8262418f8a83144. --- test/transforms_v2_kernel_infos.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/test/transforms_v2_kernel_infos.py b/test/transforms_v2_kernel_infos.py index a29e0429d1a..a14ce27d38e 100644 --- a/test/transforms_v2_kernel_infos.py +++ b/test/transforms_v2_kernel_infos.py @@ -2059,9 +2059,6 @@ def sample_inputs_adjust_saturation_video(): yield ArgsKwargs(video_loader, saturation_factor=_ADJUST_SATURATION_FACTORS[0]) -# TODO: this is just temporary to make CI green for release. We should add proper tolerances after -skip_adjust_saturation_cuda = TestMark(("TestKernels", "test_cuda_vs_cpu"), pytest.mark.skip(reason="Test is flaky")) - KERNEL_INFOS.extend( [ KernelInfo( @@ -2075,12 +2072,10 @@ def sample_inputs_adjust_saturation_video(): **pil_reference_pixel_difference(), **float32_vs_uint8_pixel_difference(2), }, - test_marks=[skip_adjust_saturation_cuda], ), KernelInfo( F.adjust_saturation_video, sample_inputs_fn=sample_inputs_adjust_saturation_video, - test_marks=[skip_adjust_saturation_cuda], ), ] ) From b1f13b4780d19a23b668eebbf89eec42b58f764e Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Mon, 27 Feb 2023 16:58:57 +0100 Subject: [PATCH 3/3] remove temporary skips in favor of increased tolerances Conflicts: test/transforms_v2_kernel_infos.py --- test/transforms_v2_kernel_infos.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/test/transforms_v2_kernel_infos.py b/test/transforms_v2_kernel_infos.py index a14ce27d38e..7fd628abadd 100644 --- a/test/transforms_v2_kernel_infos.py +++ b/test/transforms_v2_kernel_infos.py @@ -79,20 +79,20 @@ def __init__( self.logs_usage = logs_usage -def _pixel_difference_closeness_kwargs(uint8_atol, *, dtype=torch.uint8, mae=False): +def pixel_difference_closeness_kwargs(uint8_atol, *, dtype=torch.uint8, mae=False): return dict(atol=uint8_atol / 255 * get_max_value(dtype), rtol=0, mae=mae) def cuda_vs_cpu_pixel_difference(atol=1): return { - (("TestKernels", "test_cuda_vs_cpu"), dtype, "cuda"): _pixel_difference_closeness_kwargs(atol, dtype=dtype) + (("TestKernels", "test_cuda_vs_cpu"), dtype, "cuda"): pixel_difference_closeness_kwargs(atol, dtype=dtype) for dtype in [torch.uint8, torch.float32] } def pil_reference_pixel_difference(atol=1, mae=False): return { - (("TestKernels", "test_against_reference"), torch.uint8, "cpu"): _pixel_difference_closeness_kwargs( + (("TestKernels", "test_against_reference"), torch.uint8, "cpu"): pixel_difference_closeness_kwargs( atol, mae=mae ) } @@ -104,7 +104,7 @@ def float32_vs_uint8_pixel_difference(atol=1, mae=False): ("TestKernels", "test_float32_vs_uint8"), torch.float32, "cpu", - ): _pixel_difference_closeness_kwargs(atol, dtype=torch.float32, mae=mae) + ): pixel_difference_closeness_kwargs(atol, dtype=torch.float32, mae=mae) } @@ -1938,12 +1938,16 @@ def sample_inputs_adjust_contrast_video(): **pil_reference_pixel_difference(), **float32_vs_uint8_pixel_difference(2), **cuda_vs_cpu_pixel_difference(), + (("TestKernels", "test_against_reference"), torch.uint8, "cpu"): pixel_difference_closeness_kwargs(1), }, ), KernelInfo( F.adjust_contrast_video, sample_inputs_fn=sample_inputs_adjust_contrast_video, - closeness_kwargs=cuda_vs_cpu_pixel_difference(), + closeness_kwargs={ + **cuda_vs_cpu_pixel_difference(), + (("TestKernels", "test_against_reference"), torch.uint8, "cpu"): pixel_difference_closeness_kwargs(1), + }, ), ] ) @@ -2071,11 +2075,13 @@ def sample_inputs_adjust_saturation_video(): closeness_kwargs={ **pil_reference_pixel_difference(), **float32_vs_uint8_pixel_difference(2), + **cuda_vs_cpu_pixel_difference(), }, ), KernelInfo( F.adjust_saturation_video, sample_inputs_fn=sample_inputs_adjust_saturation_video, + closeness_kwargs=cuda_vs_cpu_pixel_difference(), ), ] )