Skip to content

GitLab

Unverified Commit 7278abec authored by Philip Meier's avatar Philip Meier Committed by GitHub
Browse files

test scalars for mean and std in normalize (#6824)

parent 1878e868
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 64 deletions
test/prototype_transforms_dispatcher_infos.py
View file @ 7278abec
......@@ -73,24 +73,24 @@ class DispatcherInfo(InfoBase):
yield args_kwargs
def xfail_jit_python_scalar_arg(name, *, reason=None):
reason = reason or f"Python scalar int or float for `{name}` is not supported when scripting"
def xfail_jit(reason, *, condition=None):
return TestMark(
("TestDispatchers", "test_scripted_smoke"),
pytest.mark.xfail(reason=reason),
condition=lambda args_kwargs: isinstance(args_kwargs.kwargs.get(name), (int, float)),
condition=condition,
)
def xfail_jit_integer_size(name="size"):
return xfail_jit_python_scalar_arg(name, reason=f"Integer `{name}` is not supported when scripting.")
def xfail_jit_python_scalar_arg(name, *, reason=None):
return xfail_jit(
reason or f"Python scalar int or float for `{name}` is not supported when scripting",
condition=lambda args_kwargs: isinstance(args_kwargs.kwargs.get(name), (int, float)),
)
def xfail_jit_tuple_instead_of_list(name, *, reason=None):
reason = reason or f"Passing a tuple instead of a list for `{name}` is not supported when scripting"
return TestMark(
("TestDispatchers", "test_scripted_smoke"),
pytest.mark.xfail(reason=reason),
return xfail_jit(
reason or f"Passing a tuple instead of a list for `{name}` is not supported when scripting",
condition=lambda args_kwargs: isinstance(args_kwargs.kwargs.get(name), tuple),
)
......@@ -101,10 +101,8 @@ def is_list_of_ints(args_kwargs):
def xfail_jit_list_of_ints(name, *, reason=None):
reason = reason or f"Passing a list of integers for `{name}` is not supported when scripting"
return TestMark(
("TestDispatchers", "test_scripted_smoke"),
pytest.mark.xfail(reason=reason),
return xfail_jit(
reason or f"Passing a list of integers for `{name}` is not supported when scripting",
condition=is_list_of_ints,
)
......@@ -137,17 +135,6 @@ xfail_dispatch_pil_if_fill_sequence_needs_broadcast = TestMark(
)
def xfail_all_tests(*, reason, condition):
return [
TestMark(("TestDispatchers", test_name), pytest.mark.xfail(reason=reason), condition=condition)
for test_name in [
"test_scripted_smoke",
"test_dispatch_simple_tensor",
"test_dispatch_feature",
]
]
DISPATCHER_INFOS = [
DispatcherInfo(
F.horizontal_flip,
......@@ -167,7 +154,7 @@ DISPATCHER_INFOS = [
},
pil_kernel_info=PILKernelInfo(F.resize_image_pil),
test_marks=[
xfail_jit_integer_size(),
xfail_jit_python_scalar_arg("size"),
],
),
DispatcherInfo(
......@@ -284,7 +271,7 @@ DISPATCHER_INFOS = [
},
pil_kernel_info=PILKernelInfo(F.center_crop_image_pil),
test_marks=[
xfail_jit_integer_size("output_size"),
xfail_jit_python_scalar_arg("output_size"),
],
),
DispatcherInfo(
......@@ -392,7 +379,7 @@ DISPATCHER_INFOS = [
},
pil_kernel_info=PILKernelInfo(F.five_crop_image_pil),
test_marks=[
xfail_jit_integer_size(),
xfail_jit_python_scalar_arg("size"),
skip_dispatch_feature,
],
),
......@@ -402,7 +389,7 @@ DISPATCHER_INFOS = [
features.Image: F.ten_crop_image_tensor,
},
test_marks=[
xfail_jit_integer_size(),
xfail_jit_python_scalar_arg("size"),
skip_dispatch_feature,
],
pil_kernel_info=PILKernelInfo(F.ten_crop_image_pil),
......@@ -414,6 +401,8 @@ DISPATCHER_INFOS = [
},
test_marks=[
skip_dispatch_feature,
xfail_jit_python_scalar_arg("mean"),
xfail_jit_python_scalar_arg("std"),
],
),
DispatcherInfo(
......
test/prototype_transforms_kernel_infos.py
View file @ 7278abec
......@@ -83,24 +83,21 @@ def pil_reference_wrapper(pil_kernel):
return wrapper
def xfail_jit(reason, *, condition=None):
return TestMark(("TestKernels", "test_scripted_vs_eager"), pytest.mark.xfail(reason=reason), condition=condition)
def xfail_jit_python_scalar_arg(name, *, reason=None):
reason = reason or f"Python scalar int or float for `{name}` is not supported when scripting"
return TestMark(
("TestKernels", "test_scripted_vs_eager"),
pytest.mark.xfail(reason=reason),
return xfail_jit(
reason or f"Python scalar int or float for `{name}` is not supported when scripting",
condition=lambda args_kwargs: isinstance(args_kwargs.kwargs.get(name), (int, float)),
)
def xfail_jit_integer_size(name="size"):
return xfail_jit_python_scalar_arg(name, reason=f"Integer `{name}` is not supported when scripting.")
def xfail_jit_tuple_instead_of_list(name, *, reason=None):
reason = reason or f"Passing a tuple instead of a list for `{name}` is not supported when scripting"
return TestMark(
("TestKernels", "test_scripted_vs_eager"),
pytest.mark.xfail(reason=reason),
return xfail_jit(
reason or f"Passing a tuple instead of a list for `{name}` is not supported when scripting",
condition=lambda args_kwargs: isinstance(args_kwargs.kwargs.get(name), tuple),
)
......@@ -111,27 +108,12 @@ def is_list_of_ints(args_kwargs):
def xfail_jit_list_of_ints(name, *, reason=None):
reason = reason or f"Passing a list of integers for `{name}` is not supported when scripting"
return TestMark(
("TestKernels", "test_scripted_vs_eager"),
pytest.mark.xfail(reason=reason),
return xfail_jit(
reason or f"Passing a list of integers for `{name}` is not supported when scripting",
condition=is_list_of_ints,
)
def xfail_all_tests(*, reason, condition):
return [
TestMark(("TestKernels", test_name), pytest.mark.xfail(reason=reason), condition=condition)
for test_name in [
"test_scripted_vs_eager",
"test_batched_vs_single",
"test_no_inplace",
"test_cuda_vs_cpu",
"test_dtype_and_device_consistency",
]
]
KERNEL_INFOS = []
......@@ -297,14 +279,14 @@ KERNEL_INFOS.extend(
reference_inputs_fn=reference_inputs_resize_image_tensor,
closeness_kwargs=DEFAULT_IMAGE_CLOSENESS_KWARGS,
test_marks=[
xfail_jit_integer_size(),
xfail_jit_python_scalar_arg("size"),
],
),
KernelInfo(
F.resize_bounding_box,
sample_inputs_fn=sample_inputs_resize_bounding_box,
test_marks=[
xfail_jit_integer_size(),
xfail_jit_python_scalar_arg("size"),
],
),
KernelInfo(
......@@ -314,7 +296,7 @@ KERNEL_INFOS.extend(
reference_inputs_fn=reference_inputs_resize_mask,
closeness_kwargs=DEFAULT_IMAGE_CLOSENESS_KWARGS,
test_marks=[
xfail_jit_integer_size(),
xfail_jit_python_scalar_arg("size"),
],
),
KernelInfo(
......@@ -1279,14 +1261,14 @@ KERNEL_INFOS.extend(
reference_inputs_fn=reference_inputs_center_crop_image_tensor,
closeness_kwargs=DEFAULT_IMAGE_CLOSENESS_KWARGS,
test_marks=[
xfail_jit_integer_size("output_size"),
xfail_jit_python_scalar_arg("output_size"),
],
),
KernelInfo(
F.center_crop_bounding_box,
sample_inputs_fn=sample_inputs_center_crop_bounding_box,
test_marks=[
xfail_jit_integer_size("output_size"),
xfail_jit_python_scalar_arg("output_size"),
],
),
KernelInfo(
......@@ -1296,7 +1278,7 @@ KERNEL_INFOS.extend(
reference_inputs_fn=reference_inputs_center_crop_mask,
closeness_kwargs=DEFAULT_IMAGE_CLOSENESS_KWARGS,
test_marks=[
xfail_jit_integer_size("output_size"),
xfail_jit_python_scalar_arg("output_size"),
],
),
KernelInfo(
......@@ -1923,7 +1905,7 @@ KERNEL_INFOS.extend(
reference_fn=pil_reference_wrapper(F.five_crop_image_pil),
reference_inputs_fn=reference_inputs_five_crop_image_tensor,
test_marks=[
xfail_jit_integer_size(),
xfail_jit_python_scalar_arg("size"),
mark_framework_limitation(("TestKernels", "test_batched_vs_single"), "Custom batching needed."),
],
closeness_kwargs=DEFAULT_IMAGE_CLOSENESS_KWARGS,
......@@ -1934,7 +1916,7 @@ KERNEL_INFOS.extend(
reference_fn=pil_reference_wrapper(F.ten_crop_image_pil),
reference_inputs_fn=reference_inputs_ten_crop_image_tensor,
test_marks=[
xfail_jit_integer_size(),
xfail_jit_python_scalar_arg("size"),
mark_framework_limitation(("TestKernels", "test_batched_vs_single"), "Custom batching needed."),
],
closeness_kwargs=DEFAULT_IMAGE_CLOSENESS_KWARGS,
......@@ -1945,6 +1927,7 @@ KERNEL_INFOS.extend(
_NORMALIZE_MEANS_STDS = [
((0.485, 0.456, 0.406), (0.229, 0.224, 0.225)),
([0.0, 0.0, 0.0], [1.0, 1.0, 1.0]),
(0.5, 2.0),
]
......@@ -1970,6 +1953,10 @@ KERNEL_INFOS.extend(
F.normalize_image_tensor,
kernel_name="normalize_image_tensor",
sample_inputs_fn=sample_inputs_normalize_image_tensor,
test_marks=[
xfail_jit_python_scalar_arg("mean"),
xfail_jit_python_scalar_arg("std"),
],
),
KernelInfo(
F.normalize_video,
......
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