From 8a5b35e47dde10ec39fe39be6521f33da64c2f12 Mon Sep 17 00:00:00 2001 From: nihui Date: Sat, 12 May 2018 12:53:50 +0800 Subject: [PATCH] convert more elemwise operator --- tools/mxnet/mxnet2ncnn.cpp | 52 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/tools/mxnet/mxnet2ncnn.cpp b/tools/mxnet/mxnet2ncnn.cpp index 7ae4fb188..4c3b05b79 100644 --- a/tools/mxnet/mxnet2ncnn.cpp +++ b/tools/mxnet/mxnet2ncnn.cpp @@ -745,6 +745,10 @@ int main(int argc, char** argv) fprintf(pp, "%-16s", "Input"); } + else if (n.op == "_div_scalar") + { + fprintf(pp, "%-16s", "BinaryOp"); + } else if (n.op == "_minus_scalar") { fprintf(pp, "%-16s", "BinaryOp"); @@ -753,6 +757,18 @@ int main(int argc, char** argv) { fprintf(pp, "%-16s", "BinaryOp"); } + else if (n.op == "_plus_scalar") + { + fprintf(pp, "%-16s", "BinaryOp"); + } + else if (n.op == "_rdiv_scalar") + { + fprintf(pp, "%-16s", "BinaryOp"); + } + else if (n.op == "_rminus_scalar") + { + fprintf(pp, "%-16s", "BinaryOp"); + } else if (n.op == "abs") { fprintf(pp, "%-16s", "UnaryOp"); @@ -1070,6 +1086,15 @@ int main(int argc, char** argv) // dummy input shape // fprintf(pp, " 0 0 0"); } + else if (n.op == "_div_scalar") + { + int op_type = 3; + int with_scalar = 1; + float scalar = n.attr("scalar"); + fprintf(pp, " 0=%d", op_type); + fprintf(pp, " 1=%d", with_scalar); + fprintf(pp, " 2=%f", scalar); + } else if (n.op == "_minus_scalar") { int op_type = 1; @@ -1088,6 +1113,33 @@ int main(int argc, char** argv) fprintf(pp, " 1=%d", with_scalar); fprintf(pp, " 2=%f", scalar); } + else if (n.op == "_plus_scalar") + { + int op_type = 0; + int with_scalar = 1; + float scalar = n.attr("scalar"); + fprintf(pp, " 0=%d", op_type); + fprintf(pp, " 1=%d", with_scalar); + fprintf(pp, " 2=%f", scalar); + } + else if (n.op == "_rdiv_scalar") + { + int op_type = 8; + int with_scalar = 1; + float scalar = n.attr("scalar"); + fprintf(pp, " 0=%d", op_type); + fprintf(pp, " 1=%d", with_scalar); + fprintf(pp, " 2=%f", scalar); + } + else if (n.op == "_rminus_scalar") + { + int op_type = 7; + int with_scalar = 1; + float scalar = n.attr("scalar"); + fprintf(pp, " 0=%d", op_type); + fprintf(pp, " 1=%d", with_scalar); + fprintf(pp, " 2=%f", scalar); + } else if (n.op == "abs") { int op_type = 0;