Publishing 2019 R1 content

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

diff --git a/inference-engine/src/inference_engine/shape_infer/built-in/ie_pool_shape_infer.hpp b/inference-engine/src/inference_engine/shape_infer/built-in/ie_pool_shape_infer.hpp
index 4850c8a..4344a42 100644 (file)
--- a/inference-engine/src/inference_engine/shape_infer/built-in/ie_pool_shape_infer.hpp
+++ b/inference-engine/src/inference_engine/shape_infer/built-in/ie_pool_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 PoolingShapeProp : public BuiltInShapeInferImpl {
 public:
     explicit PoolingShapeProp(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,32 +30,27 @@ public:
         PoolingLayer poolLayer(lp);
         poolLayer.params = params;
         poolLayer.type = _type;
-        validate(&poolLayer, inShapes, params, blobs);
+        validate(&poolLayer, inBlobs, params, blobs);
 
-        float OHTemp = 1.f, OWTemp = 1.f;
         auto dims = inShapes[0];
-        int PR = -1, PB = -1;
+        auto dims_size = dims.size();
+        auto spacial_d_size = dims.size() - 2;
+        float* OD_temp = new float[spacial_d_size];
+        for (int i = 0; i < spacial_d_size; i++)
+            OD_temp[i] = 1.f;
         size_t inputN = dims[0];
         size_t IC = dims[1];
-        size_t IH = dims[2];
-        size_t IW = dims[3];
-        size_t KH = poolLayer._kernel[Y_AXIS];
-        size_t KW = poolLayer._kernel[X_AXIS];
-        size_t SH = poolLayer._stride[Y_AXIS];
-        size_t SW = poolLayer._stride[X_AXIS];
-        size_t PH = poolLayer._padding[Y_AXIS];
-        size_t PW = poolLayer._padding[X_AXIS];
 
         std::string padType = poolLayer._auto_pad;
         if (padType == "valid") {
-            OHTemp = std::ceil((IH - KH + 1.f) / SH);
-            OWTemp = std::ceil((IW - KW + 1.f) / SW);
+            for (int i = 0; i < spacial_d_size; i++)
+                OD_temp[i] = std::ceil((dims[dims_size - 1 - i] - poolLayer._kernel[i] + 1.f) / poolLayer._stride[i]);
         } else if (padType == "same_upper") {
-            OHTemp = std::ceil(1.f * IH / SH);
-            OWTemp = std::ceil(1.f * IW / SW);
+            for (int i = 0; i < spacial_d_size; i++)
+                OD_temp[i] = std::ceil(1.f * dims[dims_size - 1 - i] / poolLayer._stride[i]);
         } else if (padType == "same_lower") {
-            OHTemp = std::floor(1.f * IH / SH);
-            OWTemp = std::floor(1.f * IW / SW);
+            for (int i = 0; i < spacial_d_size; i++)
+                OD_temp[i] = std::floor(1.f * dims[dims_size - 1 - i] / poolLayer._stride[i]);
         } else {
             auto it = std::find_if(
                 poolLayer.params.begin(),
@@ -67,25 +62,31 @@ public:
             if (it != poolLayer.params.end()) {
                 if (it->second == "floor") isCeil = false;
             }
-            PR = poolLayer._pads_end[X_AXIS];
-            PB = poolLayer._pads_end[Y_AXIS];
-            OHTemp += 1.f * (IH + PH + PB - KH) / SH;
-            OWTemp += 1.f * (IW + PW + PR - KW) / SW;
+            for (int i = 0; i < spacial_d_size; i++)
+                OD_temp[i] += 1.f * (dims[dims_size - 1 - i] + poolLayer._padding[i] +
+                        poolLayer._pads_end[i] - poolLayer._kernel[i]) / poolLayer._stride[i];
             if (isCeil) {
-                OHTemp = std::ceil(OHTemp);
-                OWTemp = std::ceil(OWTemp);
+                for (int i = 0; i < spacial_d_size; i++)
+                    OD_temp[i] = std::ceil(OD_temp[i]);
             } else {
-                OHTemp = std::floor(OHTemp);
-                OWTemp = std::floor(OWTemp);
+                for (int i = 0; i < spacial_d_size; i++)
+                    OD_temp[i] = std::floor(OD_temp[i]);
             }
-            if ((OHTemp - 1) * SH >= IH + PH) --OHTemp;
-            if ((OWTemp - 1) * SW >= IW + PW) --OWTemp;
+            for (int i = 0; i < spacial_d_size; i++)
+                if ((OD_temp[i] - 1) * poolLayer._stride[i] >= dims[dims_size - 1 - i] +
+                        poolLayer._padding[i]) --OD_temp[i];
         }
-        if (OHTemp < 0 || OWTemp < 0)
-            THROW_IE_EXCEPTION << "New shapes " << details::dumpVec(dims) << " make output shape negative";
-        size_t OH = static_cast<size_t>(OHTemp);
-        size_t OW = static_cast<size_t>(OWTemp);
-        outShapes.emplace_back(std::initializer_list<size_t>{inputN, IC, OH, OW});
+        for (int i = 0; i < spacial_d_size; i++)
+            if (OD_temp[i] < 0)
+                THROW_IE_EXCEPTION << "New shapes " << details::dumpVec(dims) << " make output shape negative";
+
+        SizeVector outShape = {inputN, IC};
+        for (int i = spacial_d_size - 1; i >= 0; i--)
+            outShape.push_back(static_cast<size_t>(OD_temp[i]));
+
+        outShapes.emplace_back(outShape);
+
+        delete[] OD_temp;
     }
 };