Publishing 2019 R1 content

[platform/upstream/dldt.git] / inference-engine / src / inference_engine / builders / ie_pooling_layer.cpp

diff --git a/inference-engine/src/inference_engine/builders/ie_pooling_layer.cpp b/inference-engine/src/inference_engine/builders/ie_pooling_layer.cpp
index 41db6c8..67bbcc5 100644 (file)
--- a/inference-engine/src/inference_engine/builders/ie_pooling_layer.cpp
+++ b/inference-engine/src/inference_engine/builders/ie_pooling_layer.cpp
@@ -1,42 +1,63 @@
-// Copyright (C) 2018 Intel Corporation
+// Copyright (C) 2018-2019 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 //
 
 #include <builders/ie_pooling_layer.hpp>
-#include <details/caseless.hpp>
+#include <ie_cnn_layer_builder.h>
 
 #include <vector>
 #include <string>
 
 using namespace InferenceEngine;
 
-Builder::PoolingLayer::PoolingLayer(const std::string& name): LayerFragment("Pooling", name) {
-    getLayer().getInputPorts().resize(1);
-    getLayer().getOutputPorts().resize(1);
+Builder::PoolingLayer::PoolingLayer(const std::string& name): LayerDecorator("Pooling", name) {
+    getLayer()->getInputPorts().resize(1);
+    getLayer()->getOutputPorts().resize(1);
+    setKernel({});
+    setStrides({});
+    setPaddingsEnd({});
+    setPaddingsBegin({});
     setExcludePad(false);
     setPoolingType(PoolingType::MAX);
     setRoundingType(RoundingType::CEIL);
 }
 
-Builder::PoolingLayer::PoolingLayer(Layer& genLayer): LayerFragment(genLayer) {
-    if (!details::CaselessEq<std::string>()(getLayer().getType(), "Pooling"))
-        THROW_IE_EXCEPTION << "Cannot create PoolingLayer decorator for layer " << getLayer().getType();
+Builder::PoolingLayer::PoolingLayer(const Layer::Ptr& layer): LayerDecorator(layer) {
+    checkType("Pooling");
 
-    std::string typeStr = getLayer().getParameters()["pool-method"].asString("max");
+    std::string typeStr = getLayer()->getParameters()["pool-method"];
     if (typeStr == "max")
         type = MAX;
     else if (typeStr == "avg")
         type = AVG;
 
-    typeStr = getLayer().getParameters()["rounding_type"].asString("ceil");
-    if (typeStr == "ceil")
+    std::string roundTypeStr = getLayer()->getParameters()["rounding_type"];
+    if (roundTypeStr == "ceil")
         roundingType = CEIL;
+    else if (roundTypeStr == "avg")
+        roundingType = FLOOR;
+}
+
+Builder::PoolingLayer::PoolingLayer(const Layer::CPtr& layer): LayerDecorator(layer) {
+    checkType("Pooling");
+
+    const auto cLayer = static_cast<const PoolingLayer*>(this)->getLayer();
+
+    std::string typeStr = cLayer->getParameters().at("pool-method");
+    if (typeStr == "max")
+        type = MAX;
     else if (typeStr == "avg")
+        type = AVG;
+
+    std::string roundTypeStr = cLayer->getParameters().at("rounding_type");
+    if (roundTypeStr == "ceil")
+        roundingType = CEIL;
+    else if (roundTypeStr == "avg")
         roundingType = FLOOR;
 }
 
 Builder::PoolingLayer::operator Builder::Layer() const {
-    Layer genLayer(getLayer());
+    Layer genLayer(*getLayer());
 
     std::vector<size_t> l_kernel = getKernel();
     std::vector<size_t> l_paddingBegin = getPaddingsBegin();
@@ -61,57 +82,57 @@ Builder::PoolingLayer::operator Builder::Layer() const {
 }
 
 Builder::PoolingLayer &Builder::PoolingLayer::setName(const std::string &name) {
-    getLayer().getName() = name;
+    getLayer()->setName(name);
     return *this;
 }
 
 const Port& Builder::PoolingLayer::getInputPort() const {
-    return getLayer().getInputPorts()[0];
+    return getLayer()->getInputPorts()[0];
 }
 
 Builder::PoolingLayer& Builder::PoolingLayer::setInputPort(const Port& port) {
-    getLayer().getInputPorts()[0] = port;
+    getLayer()->getInputPorts()[0] = port;
     return *this;
 }
 
 const Port& Builder::PoolingLayer::getOutputPort() const {
-    return getLayer().getOutputPorts()[0];
+    return getLayer()->getOutputPorts()[0];
 }
 
 Builder::PoolingLayer& Builder::PoolingLayer::setOutputPort(const Port& port) {
-    getLayer().getOutputPorts()[0] = port;
+    getLayer()->getOutputPorts()[0] = port;
     return *this;
 }
 
 const std::vector<size_t> Builder::PoolingLayer::getKernel() const {
-    return uInts2size_t(getLayer().getParameters()["kernel"].asUInts({}));
+    return getLayer()->getParameters().at("kernel");
 }
 Builder::PoolingLayer& Builder::PoolingLayer::setKernel(const std::vector<size_t>& kernel) {
-    getLayer().getParameters()["kernel"] = kernel;
+    getLayer()->getParameters()["kernel"] = kernel;
     return *this;
 }
 
 const std::vector<size_t> Builder::PoolingLayer::getStrides() const {
-    return uInts2size_t(getLayer().getParameters()["strides"].asUInts({}));
+    return getLayer()->getParameters().at("strides");
 }
 Builder::PoolingLayer& Builder::PoolingLayer::setStrides(const std::vector<size_t>& strides) {
-    getLayer().getParameters()["strides"] = strides;
+    getLayer()->getParameters()["strides"] = strides;
     return *this;
 }
 
 const std::vector<size_t> Builder::PoolingLayer::getPaddingsBegin() const {
-    return uInts2size_t(getLayer().getParameters()["pads_begin"].asUInts({}));
+    return getLayer()->getParameters().at("pads_begin");
 }
 Builder::PoolingLayer& Builder::PoolingLayer::setPaddingsBegin(const std::vector<size_t>& paddings) {
-    getLayer().getParameters()["pads_begin"] = paddings;
+    getLayer()->getParameters()["pads_begin"] = paddings;
     return *this;
 }
 
 const std::vector<size_t> Builder::PoolingLayer::getPaddingsEnd() const {
-    return uInts2size_t(getLayer().getParameters()["pads_end"].asUInts({}));
+    return getLayer()->getParameters().at("pads_end");
 }
 Builder::PoolingLayer& Builder::PoolingLayer::setPaddingsEnd(const std::vector<size_t>& paddings) {
-    getLayer().getParameters()["pads_end"] = paddings;
+    getLayer()->getParameters()["pads_end"] = paddings;
     return *this;
 }
 
@@ -119,7 +140,6 @@ Builder::PoolingLayer::PoolingType Builder::PoolingLayer::getPoolingType() const
     return type;
 }
 Builder::PoolingLayer& Builder::PoolingLayer::setPoolingType(Builder::PoolingLayer::PoolingType type) {
-    this->type = type;
     std::string typeStr;
     switch (type) {
         case MAX:
@@ -129,7 +149,8 @@ Builder::PoolingLayer& Builder::PoolingLayer::setPoolingType(Builder::PoolingLay
             typeStr = "avg";
             break;
     }
-    getLayer().getParameters()["pool-method"] = typeStr;
+    getLayer()->getParameters()["pool-method"] = typeStr;
+    this->type = type;
     return *this;
 }
 
@@ -147,28 +168,27 @@ Builder::PoolingLayer& Builder::PoolingLayer::setRoundingType(Builder::PoolingLa
             typeStr = "floor";
             break;
     }
-    getLayer().getParameters()["rounding_type"] = typeStr;
+    getLayer()->getParameters()["rounding_type"] = typeStr;
     return *this;
 }
 
 bool Builder::PoolingLayer::getExcludePad() const {
-    return getLayer().getParameters()["exclude-pad"].asBool();
+    return getLayer()->getParameters().at("exclude-pad");
 }
 
 Builder::PoolingLayer& Builder::PoolingLayer::setExcludePad(bool exclude) {
-    getLayer().getParameters()["exclude-pad"] = exclude;
+    getLayer()->getParameters()["exclude-pad"] = exclude;
     return *this;
 }
 
-
-void Builder::PoolingLayer::validate(const Layer& layer) {
-    Layer poolLayer = layer;
-    Builder::PoolingLayer poolBuilder(poolLayer);
-    std::vector<size_t> l_kernel = poolBuilder.getKernel();
+REG_VALIDATOR_FOR(Pooling, [](const Builder::Layer::CPtr& layer, bool partial) {
     // WA for old IRs
-    if (l_kernel.empty() && layer.getParameters().find("kernel-x") != layer.getParameters().end() &&
-        layer.getParameters().find("kernel-y") != layer.getParameters().end())
+    if (layer->getParameters().find("kernel") == layer->getParameters().end() && layer->getParameters().find("kernel-x") != layer->getParameters().end() &&
+        layer->getParameters().find("kernel-y") != layer->getParameters().end())
         return;
+
+    Builder::PoolingLayer poolBuilder(layer);
+    std::vector<size_t> l_kernel = poolBuilder.getKernel();
     std::vector<size_t> l_paddingBegin = poolBuilder.getPaddingsBegin();
     std::vector<size_t> l_paddingEnd = poolBuilder.getPaddingsEnd();
     std::vector<size_t> l_strides = poolBuilder.getStrides();
@@ -181,7 +201,39 @@ void Builder::PoolingLayer::validate(const Layer& layer) {
         l_strides.resize(l_kernel.size(), 1);
 
     if (l_kernel.empty() || l_kernel.size() != l_paddingBegin.size() || l_kernel.size() != l_paddingEnd.size() || l_kernel.size() != l_strides.size())
-        THROW_IE_EXCEPTION << layer.getType() << " node " << layer.getName() << " contains incorrect parameters!";
-}
+        THROW_IE_EXCEPTION << layer->getType() << " node " << layer->getName() << " contains incorrect parameters!";
+});
+
+REG_CONVERTER_FOR(Pooling, [](const CNNLayerPtr& cnnLayer, Builder::Layer& layer) {
+    if (cnnLayer->params.find("kernel") == cnnLayer->params.end() &&
+        cnnLayer->params.find("kernel-x") != cnnLayer->params.end() &&
+        cnnLayer->params.find("kernel-y") != cnnLayer->params.end())
+        return;
+    std::vector<unsigned int> tmp = cnnLayer->GetParamAsUInts("kernel");
+    layer.getParameters()["kernel"] = std::vector<size_t>(tmp.size());
+    for (size_t i = 0; i < tmp.size(); ++i) {
+        layer.getParameters()["kernel"].as<std::vector<size_t>>()[i] = static_cast<size_t>(tmp[i]);
+    }
+
+    tmp = cnnLayer->GetParamAsUInts("strides");
+    layer.getParameters()["strides"] = std::vector<size_t>(tmp.size());
+    for (size_t i = 0; i < tmp.size(); ++i) {
+        layer.getParameters()["strides"].as<std::vector<size_t>>()[i] = static_cast<size_t>(tmp[i]);
+    }
+
+    tmp = cnnLayer->GetParamAsUInts("pads_begin");
+    layer.getParameters()["pads_begin"] = std::vector<size_t>(tmp.size());
+    for (size_t i = 0; i < tmp.size(); ++i) {
+        layer.getParameters()["pads_begin"].as<std::vector<size_t>>()[i] = static_cast<size_t>(tmp[i]);
+    }
+
+    tmp = cnnLayer->GetParamAsUInts("pads_end");
+    layer.getParameters()["pads_end"] = std::vector<size_t>(tmp.size());
+    for (size_t i = 0; i < tmp.size(); ++i) {
+        layer.getParameters()["pads_end"].as<std::vector<size_t>>()[i] = static_cast<size_t>(tmp[i]);
+    }
 
-REG_VALIDATOR_FOR(Pooling, Builder::PoolingLayer::validate);
+    layer.getParameters()["exclude-pad"] = cnnLayer->GetParamAsBool("exclude-pad", false);
+    layer.getParameters()["rounding_type"] = cnnLayer->GetParamAsString("rounding_type", "ceil");
+    layer.getParameters()["pool-method"] = cnnLayer->GetParamAsString("pool-method", "max");
+});