Merge branch 'fix-bm-bug' into 'master'

Fix bug: the output shape is not right in benchmark.

See merge request !747

docs/user_guide/op_lists.rst

@@ -37,7 +37,7 @@ Operator lists
     "RELU1","Y",""
     "RELU6","Y",""
     "RELUX","Y",""
-    "RESHAPE","Y","Limited support: GPU is full supported, for CPU only supports softmax-like usage."
+    "RESHAPE","Y","Limited support: GPU only supports softmax-like usage, CPU only supports the usage which not change the storage format."
     "RESIZE_BILINEAR","Y",""
     "RNN","",""
     "RPN_PROPOSAL_LAYER","Y",""

mace/core/net.cc

@@ -114,9 +114,8 @@ MaceStatus SerialNet::Run(RunMetadata *run_metadata) {
       }
 
       std::vector<std::vector<int64_t>> output_shapes;
-      for (auto output_shape : op->debug_def().output_shape()) {
-        output_shapes.push_back({output_shape.dims().begin(),
-                                 output_shape.dims().end()});
+      for (auto output : op->Outputs()) {
+        output_shapes.push_back(output->shape());
       }
       OperatorStats op_stats = {op->debug_def().name(), op->debug_def().type(),
                                 output_shapes,