diff --git a/testdata/dnn/onnx/data/input_average_pooling_1d.npy b/testdata/dnn/onnx/data/input_average_pooling_1d.npy new file mode 100644 index 000000000..31f76536c Binary files /dev/null and b/testdata/dnn/onnx/data/input_average_pooling_1d.npy differ diff --git a/testdata/dnn/onnx/data/input_conv_resize_pool_1d.npy b/testdata/dnn/onnx/data/input_conv_resize_pool_1d.npy new file mode 100644 index 000000000..3d3242d98 Binary files /dev/null and b/testdata/dnn/onnx/data/input_conv_resize_pool_1d.npy differ diff --git a/testdata/dnn/onnx/data/input_maxpooling_1d.npy b/testdata/dnn/onnx/data/input_maxpooling_1d.npy new file mode 100644 index 000000000..9152d42a9 Binary files /dev/null and b/testdata/dnn/onnx/data/input_maxpooling_1d.npy differ diff --git a/testdata/dnn/onnx/data/input_maxpooling_sigmoid_1d.npy b/testdata/dnn/onnx/data/input_maxpooling_sigmoid_1d.npy new file mode 100644 index 000000000..e19f04c59 Binary files /dev/null and b/testdata/dnn/onnx/data/input_maxpooling_sigmoid_1d.npy differ diff --git a/testdata/dnn/onnx/data/input_pool_conv_1d.npy b/testdata/dnn/onnx/data/input_pool_conv_1d.npy new file mode 100644 index 000000000..8ae7021f1 Binary files /dev/null and b/testdata/dnn/onnx/data/input_pool_conv_1d.npy differ diff --git a/testdata/dnn/onnx/data/input_two_maxpooling_1d.npy b/testdata/dnn/onnx/data/input_two_maxpooling_1d.npy new file mode 100644 index 000000000..eb012ced6 Binary files /dev/null and b/testdata/dnn/onnx/data/input_two_maxpooling_1d.npy differ diff --git a/testdata/dnn/onnx/data/output_average_pooling_1d.npy b/testdata/dnn/onnx/data/output_average_pooling_1d.npy new file mode 100644 index 000000000..66d0377d1 Binary files /dev/null and b/testdata/dnn/onnx/data/output_average_pooling_1d.npy differ diff --git a/testdata/dnn/onnx/data/output_conv_resize_pool_1d.npy b/testdata/dnn/onnx/data/output_conv_resize_pool_1d.npy new file mode 100644 index 000000000..73005190b Binary files /dev/null and b/testdata/dnn/onnx/data/output_conv_resize_pool_1d.npy differ diff --git a/testdata/dnn/onnx/data/output_maxpooling_1d.npy b/testdata/dnn/onnx/data/output_maxpooling_1d.npy new file mode 100644 index 000000000..2cc2a9113 Binary files /dev/null and b/testdata/dnn/onnx/data/output_maxpooling_1d.npy differ diff --git a/testdata/dnn/onnx/data/output_maxpooling_sigmoid_1d.npy b/testdata/dnn/onnx/data/output_maxpooling_sigmoid_1d.npy new file mode 100644 index 000000000..4cf281639 Binary files /dev/null and b/testdata/dnn/onnx/data/output_maxpooling_sigmoid_1d.npy differ diff --git a/testdata/dnn/onnx/data/output_pool_conv_1d.npy b/testdata/dnn/onnx/data/output_pool_conv_1d.npy new file mode 100644 index 000000000..4982db08f Binary files /dev/null and b/testdata/dnn/onnx/data/output_pool_conv_1d.npy differ diff --git a/testdata/dnn/onnx/data/output_two_maxpooling_1d.npy b/testdata/dnn/onnx/data/output_two_maxpooling_1d.npy new file mode 100644 index 000000000..a4ce7a37b Binary files /dev/null and b/testdata/dnn/onnx/data/output_two_maxpooling_1d.npy differ diff --git a/testdata/dnn/onnx/generate_onnx_models.py b/testdata/dnn/onnx/generate_onnx_models.py index 522e88953..f5f52fc12 100644 --- a/testdata/dnn/onnx/generate_onnx_models.py +++ b/testdata/dnn/onnx/generate_onnx_models.py @@ -1155,3 +1155,59 @@ def forward(self, x): input = Variable(torch.randn(1, 3, 7, 5)) save_data_and_model("average_pooling_dynamic_axes", input, ave_pool) postprocess_model("models/average_pooling_dynamic_axes.onnx", [[1, 3, 'height', 'width']]) + +x = Variable(torch.randn(1, 3, 10)) +max_pool = nn.MaxPool1d(kernel_size=(5), stride=1, padding=2, dilation=1) +save_data_and_model("maxpooling_1d", x, max_pool) + +x = Variable(torch.randn(2, 3, 12)) +maxpooling_sigmoid = nn.Sequential( + nn.MaxPool1d(kernel_size=4, stride=2, padding=(2), dilation=1), + nn.Sigmoid() + ) +save_data_and_model("maxpooling_sigmoid_1d", x, maxpooling_sigmoid) + +x = Variable(torch.randn(2, 3, 12)) +maxpool2 = nn.Sequential( + nn.MaxPool1d(kernel_size=5, stride=1, padding=0, dilation=1), + nn.MaxPool1d(kernel_size=3, stride=1, padding=0, dilation=1) + ) +save_data_and_model("two_maxpooling_1d", x, maxpool2) + +x = Variable(torch.randn(1, 3, 7)) +ave_pool = nn.AvgPool1d(kernel_size=3, stride=2, padding=1) +save_data_and_model("average_pooling_1d", x, ave_pool) + +class PoolConv1d(nn.Module): + + def __init__(self): + super(PoolConv1d, self).__init__() + self.pool = nn.MaxPool1d(3, stride=2, padding=1) + self.conv = nn.Conv1d(2, 2, kernel_size=3, stride=1, padding=1) + + def forward(self, x): + x = self.pool(x) + y = self.conv(x) + return y + +x = Variable(torch.randn(1, 2, 4)) +model = PoolConv1d() +save_data_and_model("pool_conv_1d", x, model) + +class Conv1ResizePoold(nn.Module): + def __init__(self): + super(Conv1ResizePoold, self).__init__() + self.pool = nn.MaxPool1d(3, stride=2, padding=1) + self.conv = nn.Conv2d(2, 2, kernel_size=3, stride=1, padding=1) + + def forward(self, x): + batch_size = x.size(0) + channels = x.size(1) + x = self.conv(x) + x = x.view(batch_size, channels, -1) + y = self.pool(x) + return y + +x = Variable(torch.randn(1, 2, 20, 20)) +model = Conv1ResizePoold() +save_data_and_model("conv_resize_pool_1d", x, model) \ No newline at end of file diff --git a/testdata/dnn/onnx/models/average_pooling_1d.onnx b/testdata/dnn/onnx/models/average_pooling_1d.onnx new file mode 100644 index 000000000..b9e119f79 Binary files /dev/null and b/testdata/dnn/onnx/models/average_pooling_1d.onnx differ diff --git a/testdata/dnn/onnx/models/conv_resize_pool_1d.onnx b/testdata/dnn/onnx/models/conv_resize_pool_1d.onnx new file mode 100644 index 000000000..54f74a2c6 Binary files /dev/null and b/testdata/dnn/onnx/models/conv_resize_pool_1d.onnx differ diff --git a/testdata/dnn/onnx/models/maxpooling_1d.onnx b/testdata/dnn/onnx/models/maxpooling_1d.onnx new file mode 100644 index 000000000..99c17b3a0 --- /dev/null +++ b/testdata/dnn/onnx/models/maxpooling_1d.onnx @@ -0,0 +1,18 @@ +pytorch1.6:� +N +01 MaxPool_0"MaxPool* + kernel_shape@�* +pads@@�* +strides@�torch-jit-exportZ +0 + + + + +b +1 + + + + +B \ No newline at end of file diff --git a/testdata/dnn/onnx/models/maxpooling_sigmoid_1d.onnx b/testdata/dnn/onnx/models/maxpooling_sigmoid_1d.onnx new file mode 100644 index 000000000..19372d6f0 --- /dev/null +++ b/testdata/dnn/onnx/models/maxpooling_sigmoid_1d.onnx @@ -0,0 +1,18 @@ +pytorch1.6:� +N +01 MaxPool_0"MaxPool* + kernel_shape@�* +pads@@�* +strides@� + +12 Sigmoid_1"Sigmoidtorch-jit-exportZ +0 + + + + b +2 + + + +B \ No newline at end of file diff --git a/testdata/dnn/onnx/models/pool_conv_1d.onnx b/testdata/dnn/onnx/models/pool_conv_1d.onnx new file mode 100644 index 000000000..56c12a6a4 --- /dev/null +++ b/testdata/dnn/onnx/models/pool_conv_1d.onnx @@ -0,0 +1,25 @@ +pytorch1.6:� +N +03 MaxPool_0"MaxPool* + kernel_shape@�* +pads@@�* +strides@� +� +3 + conv.weight + conv.bias4Conv_1"Conv* + dilations@�* +group�* + kernel_shape@�* +pads@@�* +strides@�torch-jit-export*B conv.biasJ�F�=�1��*GB conv.weightJ0'\���I�>񽇾�:>����=�U<٥��;���ћ�>�%�=%i�>f% �Z +0 + + + +b +4 + + + +B \ No newline at end of file diff --git a/testdata/dnn/onnx/models/two_maxpooling_1d.onnx b/testdata/dnn/onnx/models/two_maxpooling_1d.onnx new file mode 100644 index 000000000..72b40ccf8 Binary files /dev/null and b/testdata/dnn/onnx/models/two_maxpooling_1d.onnx differ