Publishing 2019 R1 content

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

diff --git a/inference-engine/src/inference_engine/builders/ie_proposal_layer.cpp b/inference-engine/src/inference_engine/builders/ie_proposal_layer.cpp
index 2437b7c..945f59e 100644 (file)
--- a/inference-engine/src/inference_engine/builders/ie_proposal_layer.cpp
+++ b/inference-engine/src/inference_engine/builders/ie_proposal_layer.cpp
@@ -1,103 +1,117 @@
-// Copyright (C) 2018 Intel Corporation
+// Copyright (C) 2018-2019 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 //
 
 #include <builders/ie_proposal_layer.hpp>
-#include <details/caseless.hpp>
+#include <ie_cnn_layer_builder.h>
 
 #include <vector>
 #include <string>
 
 using namespace InferenceEngine;
 
-Builder::ProposalLayer::ProposalLayer(const std::string& name): LayerFragment("Proposal", name) {
-    getLayer().getOutputPorts().resize(1);
-    getLayer().getInputPorts().resize(3);
+Builder::ProposalLayer::ProposalLayer(const std::string& name): LayerDecorator("Proposal", name) {
+    getLayer()->getOutputPorts().resize(1);
+    getLayer()->getInputPorts().resize(3);
 }
 
-Builder::ProposalLayer::ProposalLayer(Layer& genLayer): LayerFragment(genLayer) {
-    if (!details::CaselessEq<std::string>()(getLayer().getType(), "Proposal"))
-        THROW_IE_EXCEPTION << "Cannot create ProposalLayer decorator for layer " << getLayer().getType();
+Builder::ProposalLayer::ProposalLayer(const Layer::Ptr& layer): LayerDecorator(layer) {
+    checkType("Proposal");
+}
+
+Builder::ProposalLayer::ProposalLayer(const Layer::CPtr& layer): LayerDecorator(layer) {
+    checkType("Proposal");
 }
 
 Builder::ProposalLayer& Builder::ProposalLayer::setName(const std::string& name) {
-    getLayer().getName() = name;
+    getLayer()->setName(name);
     return *this;
 }
 
 const std::vector<Port>& Builder::ProposalLayer::getInputPorts() const {
-    return getLayer().getInputPorts();
+    return getLayer()->getInputPorts();
 }
 
 Builder::ProposalLayer& Builder::ProposalLayer::setInputPorts(const std::vector<Port> &ports) {
     if (ports.size() != 3)
-        THROW_IE_EXCEPTION << "Incorrect number of inputs for Proposal layer.";
-    getLayer().getInputPorts() = ports;
+        THROW_IE_EXCEPTION << "Incorrect number of inputs for Proposal getLayer().";
+    getLayer()->getInputPorts() = ports;
     return *this;
 }
 
 const Port& Builder::ProposalLayer::getOutputPort() const {
-    return getLayer().getOutputPorts()[0];
+    return getLayer()->getOutputPorts()[0];
 }
 
 Builder::ProposalLayer& Builder::ProposalLayer::setOutputPort(const Port &port) {
-    getLayer().getOutputPorts()[0] = port;
+    getLayer()->getOutputPorts()[0] = port;
     return *this;
 }
 
 size_t Builder::ProposalLayer::getPostNMSTopN() const {
-    return getLayer().getParameters()["post_nms_topn"].asUInt();
+    return getLayer()->getParameters().at("post_nms_topn");
 }
 Builder::ProposalLayer& Builder::ProposalLayer::setPostNMSTopN(size_t topN) {
-    getLayer().getParameters()["post_nms_topn"] = topN;
+    getLayer()->getParameters()["post_nms_topn"] = topN;
     return *this;
 }
 size_t Builder::ProposalLayer::getPreNMSTopN() const {
-    return getLayer().getParameters()["pre_nms_topn"].asUInt();
+    return getLayer()->getParameters().at("pre_nms_topn");
 }
 Builder::ProposalLayer& Builder::ProposalLayer::setPreNMSTopN(size_t topN) {
-    getLayer().getParameters()["pre_nms_topn"] = topN;
+    getLayer()->getParameters()["pre_nms_topn"] = topN;
     return *this;
 }
 float Builder::ProposalLayer::getNMSThresh() const {
-    return getLayer().getParameters()["nms_thresh"].asFloat();
+    return getLayer()->getParameters().at("nms_thresh");
 }
 Builder::ProposalLayer& Builder::ProposalLayer::setNMSThresh(float thresh) {
-    getLayer().getParameters()["nms_thresh"] = thresh;
+    getLayer()->getParameters()["nms_thresh"] = thresh;
     return *this;
 }
 size_t Builder::ProposalLayer::getBaseSize() const {
-    return getLayer().getParameters()["base_size"].asUInt();
+    return getLayer()->getParameters().at("base_size");
 }
 Builder::ProposalLayer& Builder::ProposalLayer::setBaseSize(size_t baseSize) {
-    getLayer().getParameters()["base_size"] = baseSize;
+    getLayer()->getParameters()["base_size"] = baseSize;
     return *this;
 }
 size_t Builder::ProposalLayer::getMinSize() const {
-    return getLayer().getParameters()["min_size"].asUInt();
+    return getLayer()->getParameters().at("min_size");
 }
 Builder::ProposalLayer& Builder::ProposalLayer::setMinSize(size_t minSize) {
-    getLayer().getParameters()["min_size"] = minSize;
+    getLayer()->getParameters()["min_size"] = minSize;
     return *this;
 }
 size_t Builder::ProposalLayer::getFeatStride() const {
-    return getLayer().getParameters()["feat_stride"].asUInt();
+    return getLayer()->getParameters().at("feat_stride");
 }
 Builder::ProposalLayer& Builder::ProposalLayer::setFeatStride(size_t featStride) {
-    getLayer().getParameters()["feat_stride"] = featStride;
+    getLayer()->getParameters()["feat_stride"] = featStride;
     return *this;
 }
 const std::vector<float> Builder::ProposalLayer::getScale() const {
-    return getLayer().getParameters()["scale"].asFloats();
+    return getLayer()->getParameters().at("scale");
 }
 Builder::ProposalLayer& Builder::ProposalLayer::setScale(const std::vector<float>& scales) {
-    getLayer().getParameters()["scale"] = scales;
+    getLayer()->getParameters()["scale"] = scales;
     return *this;
 }
 const std::vector<float> Builder::ProposalLayer::getRatio() const {
-    return getLayer().getParameters()["ratio"].asFloats();
+    return getLayer()->getParameters().at("ratio");
 }
 Builder::ProposalLayer& Builder::ProposalLayer::setRatio(const std::vector<float>& ratios) {
-    getLayer().getParameters()["ratio"] = ratios;
+    getLayer()->getParameters()["ratio"] = ratios;
     return *this;
 }
+
+REG_CONVERTER_FOR(Proposal, [](const CNNLayerPtr& cnnLayer, Builder::Layer& layer) {
+    layer.getParameters()["post_nms_topn"] = static_cast<size_t>(cnnLayer->GetParamAsUInt("post_nms_topn", 0));
+    layer.getParameters()["pre_nms_topn"] = static_cast<size_t>(cnnLayer->GetParamAsUInt("pre_nms_topn", 0));
+    layer.getParameters()["nms_thresh"] = cnnLayer->GetParamAsFloat("nms_thresh", 0);
+    layer.getParameters()["min_size"] = static_cast<size_t>(cnnLayer->GetParamAsUInt("base_size", 0));
+    layer.getParameters()["max_size"] = static_cast<size_t>(cnnLayer->GetParamAsUInt("max_size", 0));
+    layer.getParameters()["max_size"] = static_cast<size_t>(cnnLayer->GetParamAsUInt("feat_stride", 0));
+    layer.getParameters()["scale"] = cnnLayer->GetParamAsFloats("scale");
+    layer.getParameters()["ratio"] = cnnLayer->GetParamAsFloats("ratio");
+});
\ No newline at end of file