Publishing 2019 R1 content

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

diff --git a/inference-engine/src/inference_engine/shape_infer/built-in/ie_reshape_shape_infer.hpp b/inference-engine/src/inference_engine/shape_infer/built-in/ie_reshape_shape_infer.hpp
index 97b6571..d586f3c 100644 (file)
--- a/inference-engine/src/inference_engine/shape_infer/built-in/ie_reshape_shape_infer.hpp
+++ b/inference-engine/src/inference_engine/shape_infer/built-in/ie_reshape_shape_infer.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Intel Corporation
+// Copyright (C) 2018-2019 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 //
 
@@ -6,6 +6,7 @@
 
 #include <description_buffer.hpp>
 #include "ie_built_in_impl.hpp"
+#include "precision_utils.h"
 #include <ie_layers.h>
 #include <map>
 #include <memory>
@@ -22,22 +23,48 @@ namespace ShapeInfer {
  */
 class ReshapeShapeProp : public BuiltInShapeInferImpl {
 public:
-    explicit ReshapeShapeProp(const std::string &type) : BuiltInShapeInferImpl(type) {}
+    explicit ReshapeShapeProp(const std::string& type) : BuiltInShapeInferImpl(type) {}
 
-    void inferShapesImpl(const std::vector<SizeVector> &inShapes,
-                         const std::map<std::string, std::string> &params,
-                         const std::map<std::string, Blob::Ptr> &blobs,
-                         std::vector<SizeVector> &outShapes) override {
+    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 {
         LayerParams lp{};
         ReshapeLayer reshapeLayer(lp);
         reshapeLayer.params = params;
         reshapeLayer.type = _type;
-        validate(&reshapeLayer, inShapes, params, blobs);
+        validate(&reshapeLayer, inBlobs, params, blobs);
 
-        auto inputShape = inShapes[0];
-        size_t inputShapeTotal = std::accumulate(inputShape.begin(), inputShape.end(), 1lu, std::multiplies<size_t>());
         SizeVector outShape;
-        std::vector<int> reshapeMask = reshapeLayer.shape;
+        std::vector<int> reshapeMask;
+        if (inBlobs.size() == 2) {
+            if (inBlobs[1]->precision() == Precision::FP32) {
+                auto* buffer = inBlobs[1]->cbuffer().as<float*>();
+                if (buffer != nullptr) {
+                    for (int i = 0; i < inBlobs[1]->size(); i++) {
+                        reshapeMask.push_back(static_cast<int>(buffer[i]));
+                    }
+                } else {
+                    THROW_IE_EXCEPTION << "Second input must have allocated data";
+                }
+            } else if (inBlobs[1]->precision() == Precision::FP16) {
+                auto* buffer = inBlobs[1]->cbuffer().as<uint16_t*>();
+                if (buffer != nullptr) {
+                    for (int i = 0; i < inBlobs[1]->size(); i++) {
+                        reshapeMask.push_back(static_cast<int>(PrecisionUtils::f16tof32(buffer[i])));
+                    }
+                } else {
+                    THROW_IE_EXCEPTION << "Second input must have allocated data";
+                }
+            } else {
+                THROW_IE_EXCEPTION << "Second input has unsupported precision";
+            }
+        } else {
+            reshapeMask = reshapeLayer.shape;
+        }
+        auto inputShape = inShapes[0];
+        size_t inputShapeTotal = std::accumulate(inputShape.begin(), inputShape.end(), 1lu,
+                                                 std::multiplies<size_t>());
 
         if (reshapeMask.empty()) {
             outShape = {inputShapeTotal};
@@ -60,7 +87,8 @@ public:
                     outShape.push_back(reshapeMask[i]);
                 }
             }
-            size_t outputShapeTotal = std::accumulate(outShape.begin(), outShape.end(), 1lu, std::multiplies<size_t>());
+            size_t outputShapeTotal = std::accumulate(outShape.begin(), outShape.end(), 1lu,
+                                                      std::multiplies<size_t>());
             if (inputShapeTotal != outputShapeTotal)
                 THROW_IE_EXCEPTION << "Invalid reshape mask (dim attribute): number of elements in input: "
                                    << details::dumpVec(inputShape) << " and output: " << details::dumpVec(outShape)