convert LogisticRegressionOutput

nihui · nihui · commit 307a77f04be2 · 2018-05-18T19:40:40.000+08:00
diff --git a/tools/mxnet/mxnet2ncnn.cpp b/tools/mxnet/mxnet2ncnn.cpp
@@ -939,6 +939,10 @@ int main(int argc, char** argv)
         {
             fprintf(pp, "%-16s", "UnaryOp");
         }
+        else if (n.op == "LogisticRegressionOutput")
+        {
+            fprintf(pp, "%-16s", "Sigmoid");
+        }
         else if (n.op == "max")
         {
             fprintf(pp, "%-16s", "Reduction");
@@ -1040,7 +1044,7 @@ int main(int argc, char** argv)
             }
         }
 
-        if (n.op == "SoftmaxOutput")
+        if (n.op == "SoftmaxOutput" || n.op == "LogisticRegressionOutput")
         {
             // drop label
             input_size--;
@@ -1057,7 +1061,7 @@ int main(int argc, char** argv)
                 continue;
             }
 
-            if (n.op == "SoftmaxOutput")
+            if (n.op == "SoftmaxOutput" || n.op == "LogisticRegressionOutput")
             {
                 // drop label
                 if (j == 1)
@@ -1549,6 +1553,9 @@ int main(int argc, char** argv)
             int op_type = 8;
             fprintf(pp, " 0=%d", op_type);
         }
+        else if (n.op == "LogisticRegressionOutput")
+        {
+        }
         else if (n.op == "max")
         {
             int operation = 4;

Original file line number	Diff line number	Diff line change
`@@ -939,6 +939,10 @@ int main(int argc, char** argv)`
`939`	`939`	`{`
`940`	`940`	`fprintf(pp, "%-16s", "UnaryOp");`
`941`	`941`	`}`
	`942`	`+ else if (n.op == "LogisticRegressionOutput")`
	`943`	`+ {`
	`944`	`+ fprintf(pp, "%-16s", "Sigmoid");`
	`945`	`+ }`
`942`	`946`	`else if (n.op == "max")`
`943`	`947`	`{`
`944`	`948`	`fprintf(pp, "%-16s", "Reduction");`
`@@ -1040,7 +1044,7 @@ int main(int argc, char** argv)`
`1040`	`1044`	`}`
`1041`	`1045`	`}`
`1042`	`1046`
`1043`		`- if (n.op == "SoftmaxOutput")`
	`1047`	`+ if (n.op == "SoftmaxOutput" \|\| n.op == "LogisticRegressionOutput")`
`1044`	`1048`	`{`
`1045`	`1049`	`// drop label`
`1046`	`1050`	`input_size--;`
`@@ -1057,7 +1061,7 @@ int main(int argc, char** argv)`
`1057`	`1061`	`continue;`
`1058`	`1062`	`}`
`1059`	`1063`
`1060`		`- if (n.op == "SoftmaxOutput")`
	`1064`	`+ if (n.op == "SoftmaxOutput" \|\| n.op == "LogisticRegressionOutput")`
`1061`	`1065`	`{`
`1062`	`1066`	`// drop label`
`1063`	`1067`	`if (j == 1)`
`@@ -1549,6 +1553,9 @@ int main(int argc, char** argv)`
`1549`	`1553`	`int op_type = 8;`
`1550`	`1554`	`fprintf(pp, " 0=%d", op_type);`
`1551`	`1555`	`}`
	`1556`	`+ else if (n.op == "LogisticRegressionOutput")`
	`1557`	`+ {`
	`1558`	`+ }`
`1552`	`1559`	`else if (n.op == "max")`
`1553`	`1560`	`{`
`1554`	`1561`	`int operation = 4;`