Browse Source

Merge pull request #408 from syyxsxx/develop

fix yolov3 output bug
Jason 5 years ago
parent
commit
e1b6130dcd
2 changed files with 5 additions and 5 deletions
  1. 4 4
      deploy/openvino/python/deploy.py
  2. 1 1
      deploy/openvino/src/paddlex.cpp

+ 4 - 4
deploy/openvino/python/deploy.py

@@ -173,9 +173,9 @@ class Predictor:
         score_name = next(it)
         score_map = np.squeeze(preds[score_name])
         score_map = np.transpose(score_map, (1, 2, 0))
-        
+
         im_info = preprocessed_inputs['im_info']
-        
+
         for info in im_info[0][::-1]:
             if info[0] == 'resize':
                 w, h = info[1][1], info[1][0]
@@ -192,8 +192,8 @@ class Predictor:
         """
         outputs = self.net.outputs
         for name in outputs:
-            if (len(outputs[name].shape) == 3):
-                output = preds[name][0]
+            if (len(outputs[name].shape) == 2):
+                output = preds[name]
         result = []
         for out in output:
             if (out[0] >= 0):

+ 1 - 1
deploy/openvino/src/paddlex.cpp

@@ -164,7 +164,7 @@ bool Model::predict(const cv::Mat& im, DetResult* result) {
   InferenceEngine::OutputsDataMap out_maps = network_.getOutputsInfo();
   std::string outputName;
   for (const auto & output_map : out_maps) {
-    if (output_map.second->getTensorDesc().getDims().size() == 3) {
+    if (output_map.second->getTensorDesc().getDims().size() == 2) {
       outputName = output_map.first;
     }
   }