Skip to content

[ONNX][TOPI][Relay]Support dilations in pooling operators #7928

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

Merged
merged 11 commits into from
May 4, 2021
Merged

[ONNX][TOPI][Relay]Support dilations in pooling operators #7928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1fff4b2
change more pooling operators
AndrewZhaoLuo Apr 21, 2021
eaa50cb
spooky, there are two implementations! Change to 1 topi
AndrewZhaoLuo Apr 22, 2021
58515e4
rename pool --> pool2d in topi
AndrewZhaoLuo Apr 22, 2021
33e9643
add poolnd baseline implementation
AndrewZhaoLuo Apr 26, 2021
33de2fa
fix subtle implementation detail between topi and baseline python poo…
AndrewZhaoLuo Apr 27, 2021
971f271
rewrite tests to be more generic for relay pooling ops
AndrewZhaoLuo Apr 27, 2021
3a62f34
fix pattern utils out of place args
AndrewZhaoLuo Apr 28, 2021
c300c01
properly forward more tests to use dilations in pooling
AndrewZhaoLuo Apr 28, 2021
7e9c1d3
fix padding bug with ceil mode
AndrewZhaoLuo Apr 29, 2021
856a23c
add dilations field to onnx importer
AndrewZhaoLuo Apr 29, 2021
3d87f4f
address matthew's comments
AndrewZhaoLuo Apr 30, 2021
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
24 changes: 24 additions & 0 deletions include/tvm/relay/attrs/nn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,6 +686,7 @@ struct MaxPool2DAttrs : public tvm::AttrsNode<MaxPool2DAttrs> {
Array<IndexExpr> pool_size;
Array<IndexExpr> strides;
Array<IndexExpr> padding;
Array<IndexExpr> dilation;
tvm::String layout;
bool ceil_mode;

Expand All @@ -694,6 +695,9 @@ struct MaxPool2DAttrs : public tvm::AttrsNode<MaxPool2DAttrs> {
TVM_ATTR_FIELD(strides)
.set_default(Array<IndexExpr>({1, 1}))
.describe("Specifies the strides of the convolution.");
TVM_ATTR_FIELD(dilation)
.set_default(Array<IndexExpr>({1, 1}))
.describe("Specifies the dilation of the convolution.");
TVM_ATTR_FIELD(padding)
.set_default(Array<IndexExpr>({0, 0}))
.describe(
Expand All @@ -717,6 +721,7 @@ struct AvgPool2DAttrs : public tvm::AttrsNode<AvgPool2DAttrs> {
Array<IndexExpr> pool_size;
Array<IndexExpr> strides;
Array<IndexExpr> padding;
Array<IndexExpr> dilation;
tvm::String layout;
bool ceil_mode;
bool count_include_pad;
Expand All @@ -726,6 +731,9 @@ struct AvgPool2DAttrs : public tvm::AttrsNode<AvgPool2DAttrs> {
TVM_ATTR_FIELD(strides)
.set_default(Array<IndexExpr>({1, 1}))
.describe("Specifies the strides of the convolution.");
TVM_ATTR_FIELD(dilation)
.set_default(Array<IndexExpr>({1, 1}))
.describe("Specifies the dilation of the convolution.");
TVM_ATTR_FIELD(padding)
.set_default(Array<IndexExpr>({0, 0}))
.describe(
Expand Down Expand Up @@ -813,6 +821,7 @@ struct AdaptivePool3DAttrs : public tvm::AttrsNode<AdaptivePool3DAttrs> {
struct MaxPool1DAttrs : public tvm::AttrsNode<MaxPool1DAttrs> {
Array<IndexExpr> pool_size;
Array<IndexExpr> strides;
Array<IndexExpr> dilation;
Array<IndexExpr> padding;
std::string layout;
bool ceil_mode;
Expand All @@ -822,6 +831,9 @@ struct MaxPool1DAttrs : public tvm::AttrsNode<MaxPool1DAttrs> {
TVM_ATTR_FIELD(strides)
.set_default(Array<IndexExpr>({1}))
.describe("Specifies the strides of the convolution.");
TVM_ATTR_FIELD(dilation)
.set_default(Array<IndexExpr>({1}))
.describe("Specifies the dilation of the convolution.");
TVM_ATTR_FIELD(padding)
.set_default(Array<IndexExpr>({0}))
.describe(
Expand All @@ -843,6 +855,7 @@ struct MaxPool1DAttrs : public tvm::AttrsNode<MaxPool1DAttrs> {
struct AvgPool1DAttrs : public tvm::AttrsNode<AvgPool1DAttrs> {
Array<IndexExpr> pool_size;
Array<IndexExpr> strides;
Array<IndexExpr> dilation;
Array<IndexExpr> padding;
std::string layout;
bool ceil_mode;
Expand All @@ -853,6 +866,9 @@ struct AvgPool1DAttrs : public tvm::AttrsNode<AvgPool1DAttrs> {
TVM_ATTR_FIELD(strides)
.set_default(Array<IndexExpr>({1}))
.describe("Specifies the strides of the convolution.");
TVM_ATTR_FIELD(dilation)
.set_default(Array<IndexExpr>({1}))
.describe("Specifies the dilation of the convolution.");
TVM_ATTR_FIELD(padding)
.set_default(Array<IndexExpr>({0}))
.describe(
Expand All @@ -877,6 +893,7 @@ struct AvgPool1DAttrs : public tvm::AttrsNode<AvgPool1DAttrs> {
struct MaxPool3DAttrs : public tvm::AttrsNode<MaxPool3DAttrs> {
Array<IndexExpr> pool_size;
Array<IndexExpr> strides;
Array<IndexExpr> dilation;
Array<IndexExpr> padding;
std::string layout;
bool ceil_mode;
Expand All @@ -886,6 +903,9 @@ struct MaxPool3DAttrs : public tvm::AttrsNode<MaxPool3DAttrs> {
TVM_ATTR_FIELD(strides)
.set_default(Array<IndexExpr>({1, 1, 1}))
.describe("Specifies the strides of the convolution.");
TVM_ATTR_FIELD(dilation)
.set_default(Array<IndexExpr>({1, 1, 1}))
.describe("Specifies the dilation of the convolution.");
TVM_ATTR_FIELD(padding)
.set_default(Array<IndexExpr>({0, 0, 0}))
.describe(
Expand All @@ -908,6 +928,7 @@ struct MaxPool3DAttrs : public tvm::AttrsNode<MaxPool3DAttrs> {
struct AvgPool3DAttrs : public tvm::AttrsNode<AvgPool3DAttrs> {
Array<IndexExpr> pool_size;
Array<IndexExpr> strides;
Array<IndexExpr> dilation;
Array<IndexExpr> padding;
std::string layout;
bool ceil_mode;
Expand All @@ -918,6 +939,9 @@ struct AvgPool3DAttrs : public tvm::AttrsNode<AvgPool3DAttrs> {
TVM_ATTR_FIELD(strides)
.set_default(Array<IndexExpr>({1, 1, 1}))
.describe("Specifies the strides of the convolution.");
TVM_ATTR_FIELD(dilation)
.set_default(Array<IndexExpr>({1, 1, 1}))
.describe("Specifies the dilation of the convolution.");
TVM_ATTR_FIELD(padding)
.set_default(Array<IndexExpr>({0, 0, 0}))
.describe(
Expand Down
Loading