Publishing 2019 R1 content

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

diff --git a/inference-engine/src/inference_engine/builders/ie_roi_pooling_layer.cpp b/inference-engine/src/inference_engine/builders/ie_roi_pooling_layer.cpp
index bd1cf4f..ad0963c 100644 (file)
--- a/inference-engine/src/inference_engine/builders/ie_roi_pooling_layer.cpp
+++ b/inference-engine/src/inference_engine/builders/ie_roi_pooling_layer.cpp
@@ -1,58 +1,68 @@
-// Copyright (C) 2018 Intel Corporation
+// Copyright (C) 2018-2019 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 //
 
 #include <builders/ie_roi_pooling_layer.hpp>
-#include <details/caseless.hpp>
+#include <ie_cnn_layer_builder.h>
 #include <vector>
 #include <string>
 
 using namespace InferenceEngine;
 
-Builder::ROIPoolingLayer::ROIPoolingLayer(const std::string& name): LayerFragment("ROIPooling", name) {
-    getLayer().getOutputPorts().resize(1);
+Builder::ROIPoolingLayer::ROIPoolingLayer(const std::string& name): LayerDecorator("ROIPooling", name) {
+    getLayer()->getOutputPorts().resize(1);
     setPooled({0, 0});
 }
 
-Builder::ROIPoolingLayer::ROIPoolingLayer(Layer& genLayer): LayerFragment(genLayer) {
-    if (!details::CaselessEq<std::string>()(getLayer().getType(), "ROIPooling"))
-        THROW_IE_EXCEPTION << "Cannot create ROIPoolingLayer decorator for layer " << getLayer().getType();
+Builder::ROIPoolingLayer::ROIPoolingLayer(const Layer::Ptr& layer): LayerDecorator(layer) {
+    checkType("ROIPooling");
+}
+
+Builder::ROIPoolingLayer::ROIPoolingLayer(const Layer::CPtr& layer): LayerDecorator(layer) {
+    checkType("ROIPooling");
 }
 
 Builder::ROIPoolingLayer& Builder::ROIPoolingLayer::setName(const std::string& name) {
-    getLayer().getName() = name;
+    getLayer()->setName(name);
     return *this;
 }
 const std::vector<Port>& Builder::ROIPoolingLayer::getInputPorts() const {
-    return getLayer().getInputPorts();
+    return getLayer()->getInputPorts();
 }
 Builder::ROIPoolingLayer& Builder::ROIPoolingLayer::setInputPorts(const std::vector<Port>& ports) {
     if (ports.size() != 2)
         THROW_IE_EXCEPTION << "ROIPoolingLayer should have 2 inputs!";
-    getLayer().getInputPorts() = ports;
+    getLayer()->getInputPorts() = ports;
     return *this;
 }
 const Port& Builder::ROIPoolingLayer::getOutputPort() const {
-    return getLayer().getOutputPorts()[0];
+    return getLayer()->getOutputPorts()[0];
 }
 Builder::ROIPoolingLayer& Builder::ROIPoolingLayer::setOutputPort(const Port& port) {
-    getLayer().getOutputPorts()[0] = port;
+    getLayer()->getOutputPorts()[0] = port;
     return *this;
 }
 float Builder::ROIPoolingLayer::getSpatialScale() const {
-    return getLayer().getParameters()["spatial_scale"].asFloat();
+    return getLayer()->getParameters().at("spatial_scale");
 }
 Builder::ROIPoolingLayer& Builder::ROIPoolingLayer::setSpatialScale(float spatialScale) {
-    getLayer().getParameters()["spatial_scale"] = spatialScale;
+    getLayer()->getParameters()["spatial_scale"] = spatialScale;
     return *this;
 }
 const std::vector<int> Builder::ROIPoolingLayer::getPooled() const {
-    return {getLayer().getParameters()["pooled_h"].asInt(0), getLayer().getParameters()["pooled_w"].asInt(0)};
+    return {getLayer()->getParameters().at("pooled_h"),
+            getLayer()->getParameters().at("pooled_w")};
 }
 Builder::ROIPoolingLayer& Builder::ROIPoolingLayer::setPooled(const std::vector<int>& pooled) {
     if (pooled.size() != 2)
         THROW_IE_EXCEPTION << "ROIPoolingLayer supports only pooled for height and width dimensions";
-    getLayer().getParameters()["pooled_h"] = pooled[0];
-    getLayer().getParameters()["pooled_w"] = pooled[1];
+    getLayer()->getParameters()["pooled_h"] = pooled[0];
+    getLayer()->getParameters()["pooled_w"] = pooled[1];
     return *this;
 }
+
+REG_CONVERTER_FOR(ROIPooling, [](const CNNLayerPtr& cnnLayer, Builder::Layer& layer) {
+    layer.getParameters()["pooled_h"] = cnnLayer->GetParamAsInt("pooled_h", 0);
+    layer.getParameters()["pooled_w"] = cnnLayer->GetParamAsInt("pooled_w", 0);
+    layer.getParameters()["spatial_scale"] = cnnLayer->GetParamAsFloat("spatial_scale");
+});
\ No newline at end of file