Publishing 2019 R1 content

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

diff --git a/inference-engine/src/inference_engine/shape_infer/built-in/ie_deconv_shape_infer.hpp b/inference-engine/src/inference_engine/shape_infer/built-in/ie_deconv_shape_infer.hpp
index c4f130a..2ddf5bd 100644 (file)
--- a/inference-engine/src/inference_engine/shape_infer/built-in/ie_deconv_shape_infer.hpp
+++ b/inference-engine/src/inference_engine/shape_infer/built-in/ie_deconv_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 DeconvShapeProp : public BuiltInShapeInferImpl {
 public:
     explicit DeconvShapeProp(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,45 +30,45 @@ public:
         DeconvolutionLayer deconvLayer(lp);
         deconvLayer.params = params;
         deconvLayer.type = _type;
-        validate(&deconvLayer, inShapes, params, blobs);
+        validate(&deconvLayer, inBlobs, params, blobs);
 
         auto dims = inShapes[0];
+        auto dims_size = dims.size();
+        auto spacial_d_size = dims.size() - 2;
+        float* OD_temp = new float[spacial_d_size];
+        size_t*  KDims = new size_t[spacial_d_size];
         size_t inputN = dims[0];
-        size_t IH = dims[2];
-        size_t IW = dims[3];
-        int PR = -1, PB = -1;
-        float OHTemp, OWTemp, KH, KW;
-        if (deconvLayer._dilation[Y_AXIS])
-            KH = (deconvLayer._kernel[Y_AXIS] - 1) * deconvLayer._dilation[Y_AXIS] + 1;
-        else
-            KH = deconvLayer._kernel[Y_AXIS];
-        if (deconvLayer._dilation[X_AXIS])
-            KW = (deconvLayer._kernel[X_AXIS] - 1) * deconvLayer._dilation[X_AXIS] + 1;
-        else
-            KW = deconvLayer._kernel[X_AXIS];
-        size_t SH = deconvLayer._stride[Y_AXIS];
-        size_t SW = deconvLayer._stride[X_AXIS];
-        size_t PH = deconvLayer._padding[Y_AXIS];
-        size_t PW = deconvLayer._padding[X_AXIS];
+        for (int i = 0; i < spacial_d_size; i++) {
+            if (deconvLayer._dilation[i])
+                KDims[i] = (deconvLayer._kernel[i] - 1) * deconvLayer._dilation[i] + 1;
+            else
+                KDims[i] = deconvLayer._kernel[i];
+        }
         size_t OC = deconvLayer._out_depth;
         std::string padType = deconvLayer._auto_pad;
         if (padType == "valid") {
-            OHTemp = IH * SH + KH - 1;
-            OWTemp = IW * SW + KW - 1;
+            for (int i = 0; i < spacial_d_size; i++)
+                OD_temp[i] = dims[dims_size - 1 - i] * deconvLayer._stride[i] + KDims[i] - 1;
         } else if ((padType == "same_upper") || (padType == "same_lower")) {
-            OHTemp = IH * SH;
-            OWTemp = IW * SW;
+            for (int i = 0; i < spacial_d_size; i++)
+                OD_temp[i] = dims[dims_size - 1 - i] * deconvLayer._stride[i];
         } else {
-            PR = deconvLayer._pads_end[X_AXIS];
-            PB = deconvLayer._pads_end[Y_AXIS];
-            OHTemp = SH * (IH - 1) + KH - PH - PB;
-            OWTemp = SW * (IW - 1) + KW - PW - PR;
+            for (int i = 0; i < spacial_d_size; i++)
+                OD_temp[i] = deconvLayer._stride[i] * (dims[dims_size - 1 - i] - 1) +
+                        KDims[i] - deconvLayer._padding[i] - deconvLayer._pads_end[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, OC, 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, OC};
+        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;
+        delete[] KDims;
     }
 };