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

Jump to bottom

[CMSIS-NN] Support for asymmetric padding in Convolutions #9886

Merged
merged 2 commits into from Jan 11, 2022
Merged

[CMSIS-NN] Support for asymmetric padding in Convolutions #9886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ece073a
[CMSIS-NN] Support for asymmetric padding in Convolutions
ashutosh-arm Jan 5, 2022
dd699d6
Fixed lint error in the CMSIS-NN unit tests
ashutosh-arm Jan 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions python/tvm/relay/op/contrib/cmsisnn.py
View file
Open in desktop
Expand Up @@ -135,8 +135,6 @@ def check_qnn_conv2d(pattern):

return (
conv2d.attrs.out_dtype == "int32"
and int(conv2d.attrs.padding[0]) == int(conv2d.attrs.padding[2])
and int(conv2d.attrs.padding[1]) == int(conv2d.attrs.padding[3])
and conv2d_input.checked_type.dtype == "int8"
and conv2d_weight.checked_type.dtype == "int8"
and pattern.checked_type.dtype == "int8"
Expand Down
21 changes: 7 additions & 14 deletions tests/python/contrib/test_cmsisnn/test_conv2d.py
View file
Open in desktop
Expand Up @@ -69,8 +69,6 @@ def make_model(
kernel_w = kernel_shape[w_index]
invar = relay.var("input", shape=shape, dtype=dtype)
p = (0, 0, 0, 0)
if padding == "INVALID":
p = [1, 2, 2, 1]
if padding == "SAME":
p = get_same_padding((shape[1], shape[2]), (kernel_h, kernel_w), dilation, strides)
invar = relay.nn.pad(
Expand Down Expand Up @@ -126,10 +124,10 @@ def make_model(


@tvm.testing.requires_cmsisnn
@pytest.mark.parametrize("ifm_shape", [(1, 28, 28, 12), (1, 64, 100, 4)])
@pytest.mark.parametrize("kernel_size", [(3, 3)])
@pytest.mark.parametrize("ifm_shape", [(1, 25, 25, 12), (1, 64, 100, 4)])
@pytest.mark.parametrize("kernel_size", [(5, 5)])
@pytest.mark.parametrize("padding", ["SAME", "VALID"])
@pytest.mark.parametrize("strides, dilation", [((1, 1), (1, 1))])
@pytest.mark.parametrize("strides, dilation", [((2, 2), (1, 1))])
@pytest.mark.parametrize("relu_type", ["RELU"])
@pytest.mark.parametrize("enable_bias", [True, False])
@pytest.mark.parametrize(
Expand Down Expand Up @@ -353,19 +351,15 @@ def parameterize_for_invalid_model(test):
in_dtype = ["uint8", "int8"]
kernel_dtype = ["uint8", "int8"]
kernel_zero_point = [-33, 10, 0]
padding = ["SAME", "INVALID"]
all_combinations = itertools.product(in_dtype, kernel_dtype, kernel_zero_point, padding)
all_combinations = itertools.product(in_dtype, kernel_dtype, kernel_zero_point)
all_combinations = filter(
lambda parameters: not (
parameters[0] == "int8"
and parameters[1] == "int8"
and parameters[2] == 0
and parameters[3] == "SAME"
parameters[0] == "int8" and parameters[1] == "int8" and parameters[2] == 0
),
all_combinations,
)
return pytest.mark.parametrize(
["in_dtype", "kernel_dtype", "kernel_zero_point", "padding"],
["in_dtype", "kernel_dtype", "kernel_zero_point"],
all_combinations,
)(test)

Expand All @@ -376,7 +370,6 @@ def test_invalid_parameters(
in_dtype,
kernel_dtype,
kernel_zero_point,
padding,
):
ifm_shape = (1, 28, 28, 12)
out_channels = 2
Expand Down Expand Up @@ -407,7 +400,7 @@ def test_invalid_parameters(
kernel_scale=kernel_scale,
output_zero_point=output_zero_point,
output_scale=output_scale,
padding=padding,
padding="SAME",
strides=(1, 1),
dilation=(1, 1),
groups=1,
Expand Down