diff --git a/tools/mxnet/mxnet2ncnn.cpp b/tools/mxnet/mxnet2ncnn.cpp index ac8defbc6..027147dff 100644 --- a/tools/mxnet/mxnet2ncnn.cpp +++ b/tools/mxnet/mxnet2ncnn.cpp @@ -2136,12 +2136,28 @@ int main(int argc, char** argv) } fprintf(pp, " 0=%d", pool); - if (!kernel.empty()) + + if (kernel.size() == 1) { fprintf(pp, " 1=%d", kernel[0]); - if (!stride.empty()) + } else if (kernel.size() == 2) { + fprintf(pp, " 1=%d", kernel[1]); + fprintf(pp, " 11=%d", kernel[0]); + } + + if (stride.size() == 1) { fprintf(pp, " 2=%d", stride[0]); - if (!pad.empty()) + } else if (stride.size() == 2) { + fprintf(pp, " 2=%d", stride[1]); + fprintf(pp, " 12=%d", stride[0]); + } + + if (pad.size() == 1) { fprintf(pp, " 3=%d", pad[0]); + } else if (pad.size() == 2) { + fprintf(pp, " 3=%d", pad[1]); + fprintf(pp, " 13=%d", pad[0]); + } + fprintf(pp, " 4=%d", global_pool); fprintf(pp, " 5=%d", pad_mode); diff --git a/tools/onnx/onnx2ncnn.cpp b/tools/onnx/onnx2ncnn.cpp index dd3589288..ab3fbf23b 100644 --- a/tools/onnx/onnx2ncnn.cpp +++ b/tools/onnx/onnx2ncnn.cpp @@ -1429,7 +1429,8 @@ int main(int argc, char** argv) } else if (pads.size() == 4) { fprintf(pp, " 4=%d", pads[1]); fprintf(pp, " 14=%d", pads[0]); - // TODO hpad2=pads[2] wpad2=pads[3] + fprintf(pp, " 15=%d", pads[3]); + fprintf(pp, " 16=%d", pads[2]); } } @@ -1508,7 +1509,8 @@ int main(int argc, char** argv) } else if (pads.size() == 4) { fprintf(pp, " 4=%d", pads[1]); fprintf(pp, " 14=%d", pads[0]); - // TODO hpad2=pads[2] wpad2=pads[3] + fprintf(pp, " 15=%d", pads[3]); + fprintf(pp, " 16=%d", pads[2]); } }