Publishing 2019 R1 content

[platform/upstream/dldt.git] / inference-engine / src / inference_engine / shape_infer / built-in / ie_roi_pooling_shape_infer.hpp

diff --git a/inference-engine/src/inference_engine/shape_infer/built-in/ie_roi_pooling_shape_infer.hpp b/inference-engine/src/inference_engine/shape_infer/built-in/ie_roi_pooling_shape_infer.hpp
index b5f6c85..c128469 100644 (file)
--- a/inference-engine/src/inference_engine/shape_infer/built-in/ie_roi_pooling_shape_infer.hpp
+++ b/inference-engine/src/inference_engine/shape_infer/built-in/ie_roi_pooling_shape_infer.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Intel Corporation
+// Copyright (C) 2018-2019 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 //
 
@@ -22,7 +22,7 @@ class RoiPoolingShapeProp : public BuiltInShapeInferImpl {
 public:
     explicit RoiPoolingShapeProp(const std::string& type) : BuiltInShapeInferImpl(type) {}
 
-    void inferShapesImpl(const std::vector<SizeVector>& inShapes,
+    void inferShapesImpl(const std::vector<Blob::CPtr>& inBlobs,
                          const std::map<std::string, std::string>& params,
                          const std::map<std::string, Blob::Ptr>& blobs,
                          std::vector<SizeVector>& outShapes) override {
@@ -30,12 +30,16 @@ public:
         CNNLayer cnnLayer(lp);
         cnnLayer.params = params;
         cnnLayer.type = _type;
-        validate(&cnnLayer, inShapes, params, blobs);
+        validate(&cnnLayer, inBlobs, params, blobs);
 
-        int pooled_h = cnnLayer.GetParamAsInt("pooled_h");
-        int pooled_w = cnnLayer.GetParamAsInt("pooled_w");
-        outShapes.push_back(
-                {inShapes[1][0], inShapes[0][1], static_cast<size_t>(pooled_h), static_cast<size_t>(pooled_w)});
+        SizeVector out_shapes = {inShapes[1][0], inShapes[0][1]};
+        for (auto attr : {"pooled_d", "pooled_h", "pooled_w"}) {  // desired IR format: pooled="...,d,h,w"
+            int pooled = cnnLayer.GetParamAsInt(attr, -1);
+            if (pooled >= 0) {
+                out_shapes.push_back(static_cast<size_t>(pooled));
+            }
+        }
+        outShapes.push_back(out_shapes);
     }
 };