Unverified Commit 8811c915 authored by Philip Meier's avatar Philip Meier Committed by GitHub
Browse files

remove temporary skips in favor of increased tolerances (#7355)

parent 6e7cecd3
...@@ -79,20 +79,20 @@ class KernelInfo(InfoBase): ...@@ -79,20 +79,20 @@ class KernelInfo(InfoBase):
self.logs_usage = logs_usage 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) return dict(atol=uint8_atol / 255 * get_max_value(dtype), rtol=0, mae=mae)
def cuda_vs_cpu_pixel_difference(atol=1): def cuda_vs_cpu_pixel_difference(atol=1):
return { 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] for dtype in [torch.uint8, torch.float32]
} }
def pil_reference_pixel_difference(atol=1, mae=False): def pil_reference_pixel_difference(atol=1, mae=False):
return { 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 atol, mae=mae
) )
} }
...@@ -104,7 +104,7 @@ def float32_vs_uint8_pixel_difference(atol=1, mae=False): ...@@ -104,7 +104,7 @@ def float32_vs_uint8_pixel_difference(atol=1, mae=False):
("TestKernels", "test_float32_vs_uint8"), ("TestKernels", "test_float32_vs_uint8"),
torch.float32, torch.float32,
"cpu", "cpu",
): _pixel_difference_closeness_kwargs(atol, dtype=torch.float32, mae=mae) ): pixel_difference_closeness_kwargs(atol, dtype=torch.float32, mae=mae)
} }
...@@ -1925,9 +1925,6 @@ def sample_inputs_adjust_contrast_video(): ...@@ -1925,9 +1925,6 @@ def sample_inputs_adjust_contrast_video():
yield ArgsKwargs(video_loader, contrast_factor=_ADJUST_CONTRAST_FACTORS[0]) 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( KERNEL_INFOS.extend(
[ [
KernelInfo( KernelInfo(
...@@ -1941,14 +1938,16 @@ KERNEL_INFOS.extend( ...@@ -1941,14 +1938,16 @@ KERNEL_INFOS.extend(
**pil_reference_pixel_difference(), **pil_reference_pixel_difference(),
**float32_vs_uint8_pixel_difference(2), **float32_vs_uint8_pixel_difference(2),
**cuda_vs_cpu_pixel_difference(), **cuda_vs_cpu_pixel_difference(),
(("TestKernels", "test_against_reference"), torch.uint8, "cpu"): pixel_difference_closeness_kwargs(1),
}, },
test_marks=[skip_adjust_contrast_jit],
), ),
KernelInfo( KernelInfo(
F.adjust_contrast_video, F.adjust_contrast_video,
sample_inputs_fn=sample_inputs_adjust_contrast_video, sample_inputs_fn=sample_inputs_adjust_contrast_video,
closeness_kwargs=cuda_vs_cpu_pixel_difference(), closeness_kwargs={
test_marks=[skip_adjust_contrast_jit], **cuda_vs_cpu_pixel_difference(),
(("TestKernels", "test_against_reference"), torch.uint8, "cpu"): pixel_difference_closeness_kwargs(1),
},
), ),
] ]
) )
...@@ -2064,9 +2063,6 @@ def sample_inputs_adjust_saturation_video(): ...@@ -2064,9 +2063,6 @@ def sample_inputs_adjust_saturation_video():
yield ArgsKwargs(video_loader, saturation_factor=_ADJUST_SATURATION_FACTORS[0]) 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( KERNEL_INFOS.extend(
[ [
KernelInfo( KernelInfo(
...@@ -2079,13 +2075,13 @@ KERNEL_INFOS.extend( ...@@ -2079,13 +2075,13 @@ KERNEL_INFOS.extend(
closeness_kwargs={ closeness_kwargs={
**pil_reference_pixel_difference(), **pil_reference_pixel_difference(),
**float32_vs_uint8_pixel_difference(2), **float32_vs_uint8_pixel_difference(2),
**cuda_vs_cpu_pixel_difference(),
}, },
test_marks=[skip_adjust_saturation_cuda],
), ),
KernelInfo( KernelInfo(
F.adjust_saturation_video, F.adjust_saturation_video,
sample_inputs_fn=sample_inputs_adjust_saturation_video, sample_inputs_fn=sample_inputs_adjust_saturation_video,
test_marks=[skip_adjust_saturation_cuda], closeness_kwargs=cuda_vs_cpu_pixel_difference(),
), ),
] ]
) )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment