Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove temporary skips in favor of increased tolerances #7355

Merged
merged 6 commits into from
May 3, 2023
Merged

remove temporary skips in favor of increased tolerances #7355

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
036d1e7
Revert "skip flaky adjust_contrast kernel tests (#7347)"
pmeier Feb 27, 2023
045c5e0
Revert "skip flaky adjust_saturation kernel tests (#7348)"
pmeier Feb 27, 2023
b1f13b4
remove temporary skips in favor of increased tolerances
pmeier Feb 27, 2023
2c1ca6e
Merge branch 'main' into flaky-tol
pmeier Feb 27, 2023
625bd9f
Merge branch 'main' into flaky-tol
pmeier May 3, 2023
756924c
Merge branch 'main' into flaky-tol
pmeier May 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions test/transforms_v2_kernel_infos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
}
Expand All @@ -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)
}


Expand Down Expand Up @@ -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(
Expand All @@ -1941,14 +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),
},
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],
closeness_kwargs={
**cuda_vs_cpu_pixel_difference(),
(("TestKernels", "test_against_reference"), torch.uint8, "cpu"): pixel_difference_closeness_kwargs(1),
},
),
]
)
Expand Down Expand Up @@ -2064,9 +2063,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(
Expand All @@ -2079,13 +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(),
},
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],
closeness_kwargs=cuda_vs_cpu_pixel_difference(),
),
]
)
Expand Down