Publishing 2019 R1 content

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

diff --git a/inference-engine/src/inference_engine/builders/ie_simpler_nms_layer.cpp b/inference-engine/src/inference_engine/builders/ie_simpler_nms_layer.cpp
index 1fc3e07..5e33313 100644 (file)
--- a/inference-engine/src/inference_engine/builders/ie_simpler_nms_layer.cpp
+++ b/inference-engine/src/inference_engine/builders/ie_simpler_nms_layer.cpp
@@ -1,89 +1,102 @@
-// Copyright (C) 2018 Intel Corporation
+// Copyright (C) 2018-2019 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 //
 
 #include <builders/ie_simpler_nms_layer.hpp>
-#include <details/caseless.hpp>
+#include <ie_cnn_layer_builder.h>
 #include <vector>
 #include <string>
 
 using namespace InferenceEngine;
 
-Builder::SimplerNMSLayer::SimplerNMSLayer(const std::string& name): LayerFragment("SimplerNMS", name) {
-    getLayer().getOutputPorts().resize(1);
+Builder::SimplerNMSLayer::SimplerNMSLayer(const std::string& name): LayerDecorator("SimplerNMS", name) {
+    getLayer()->getOutputPorts().resize(1);
 }
 
-Builder::SimplerNMSLayer::SimplerNMSLayer(Layer& genLayer): LayerFragment(genLayer) {
-    if (!details::CaselessEq<std::string>()(getLayer().getType(), "SimplerNMS"))
-        THROW_IE_EXCEPTION << "Cannot create SimplerNMSLayer decorator for layer " << getLayer().getType();
+Builder::SimplerNMSLayer::SimplerNMSLayer(const Layer::Ptr& layer): LayerDecorator(layer) {
+    checkType("SimplerNMS");
+}
+
+Builder::SimplerNMSLayer::SimplerNMSLayer(const Layer::CPtr& layer): LayerDecorator(layer) {
+    checkType("SimplerNMS");
 }
 
 Builder::SimplerNMSLayer& Builder::SimplerNMSLayer::setName(const std::string& name) {
-    getLayer().getName() = name;
+    getLayer()->setName(name);
     return *this;
 }
 const std::vector<Port>& Builder::SimplerNMSLayer::getInputPorts() const {
-    return getLayer().getInputPorts();
+    return getLayer()->getInputPorts();
 }
 Builder::SimplerNMSLayer& Builder::SimplerNMSLayer::setInputPorts(const std::vector<Port>& ports) {
-    getLayer().getInputPorts() = ports;
+    getLayer()->getInputPorts() = ports;
     return *this;
 }
 const Port& Builder::SimplerNMSLayer::getOutputPort() const {
-    return getLayer().getOutputPorts()[0];
+    return getLayer()->getOutputPorts()[0];
 }
 Builder::SimplerNMSLayer& Builder::SimplerNMSLayer::setOutputPort(const Port& port) {
-    getLayer().getOutputPorts()[0] = port;
+    getLayer()->getOutputPorts()[0] = port;
     return *this;
 }
 
 size_t Builder::SimplerNMSLayer::getPreNMSTopN() const {
-    return getLayer().getParameters()["pre_nms_topn"].asUInt();
+    return getLayer()->getParameters().at("pre_nms_topn");
 }
 Builder::SimplerNMSLayer& Builder::SimplerNMSLayer::setPreNMSTopN(size_t topN) {
-    getLayer().getParameters()["pre_nms_topn"] = topN;
+    getLayer()->getParameters()["pre_nms_topn"] = topN;
     return *this;
 }
 size_t Builder::SimplerNMSLayer::getPostNMSTopN() const {
-    return getLayer().getParameters()["post_nms_topn"].asUInt();
+    return getLayer()->getParameters().at("post_nms_topn");
 }
 Builder::SimplerNMSLayer& Builder::SimplerNMSLayer::setPostNMSTopN(size_t topN) {
-    getLayer().getParameters()["post_nms_topn"] = topN;
+    getLayer()->getParameters()["post_nms_topn"] = topN;
     return *this;
 }
 size_t Builder::SimplerNMSLayer::getFeatStride() const {
-    return getLayer().getParameters()["feat_stride"].asUInt();
+    return getLayer()->getParameters().at("feat_stride");
 }
 Builder::SimplerNMSLayer& Builder::SimplerNMSLayer::setFeatStride(size_t featStride) {
-    getLayer().getParameters()["feat_stride"] = featStride;
+    getLayer()->getParameters()["feat_stride"] = featStride;
     return *this;
 }
 size_t Builder::SimplerNMSLayer::getMinBoxSize() const {
-    return getLayer().getParameters()["min_bbox_size"].asUInt();
+    return getLayer()->getParameters().at("min_bbox_size");
 }
 Builder::SimplerNMSLayer& Builder::SimplerNMSLayer::setMinBoxSize(size_t minSize) {
-    getLayer().getParameters()["min_bbox_size"] = minSize;
+    getLayer()->getParameters()["min_bbox_size"] = minSize;
     return *this;
 }
 size_t Builder::SimplerNMSLayer::getScale() const {
-    return getLayer().getParameters()["scale"].asUInt();
+    return getLayer()->getParameters().at("scale");
 }
 Builder::SimplerNMSLayer& Builder::SimplerNMSLayer::setScale(size_t scale) {
-    getLayer().getParameters()["scale"] = scale;
+    getLayer()->getParameters()["scale"] = scale;
     return *this;
 }
 
 float Builder::SimplerNMSLayer::getCLSThreshold() const {
-    return getLayer().getParameters()["cls_threshold"].asFloat();
+    return getLayer()->getParameters().at("cls_threshold");
 }
 Builder::SimplerNMSLayer& Builder::SimplerNMSLayer::setCLSThreshold(float threshold) {
-    getLayer().getParameters()["cls_threshold"] = threshold;
+    getLayer()->getParameters()["cls_threshold"] = threshold;
     return *this;
 }
 float Builder::SimplerNMSLayer::getIOUThreshold() const {
-    return getLayer().getParameters()["iou_threshold"].asFloat();
+    return getLayer()->getParameters().at("iou_threshold");
 }
 Builder::SimplerNMSLayer& Builder::SimplerNMSLayer::setIOUThreshold(float threshold) {
-    getLayer().getParameters()["iou_threshold"] = threshold;
+    getLayer()->getParameters()["iou_threshold"] = threshold;
     return *this;
 }
+
+REG_CONVERTER_FOR(SimplerNMS, [](const CNNLayerPtr& cnnLayer, Builder::Layer& layer) {
+    layer.getParameters()["iou_threshold"] = cnnLayer->GetParamAsFloat("iou_threshold");
+    layer.getParameters()["cls_threshold"] = cnnLayer->GetParamAsFloat("cls_threshold");
+    layer.getParameters()["scale"] = static_cast<size_t>(cnnLayer->GetParamAsUInt("scale"));
+    layer.getParameters()["min_bbox_size"] = static_cast<size_t>(cnnLayer->GetParamAsUInt("min_bbox_size"));
+    layer.getParameters()["feat_stride"] = static_cast<size_t>(cnnLayer->GetParamAsUInt("feat_stride"));
+    layer.getParameters()["pre_nms_topn"] = static_cast<size_t>(cnnLayer->GetParamAsUInt("pre_nms_topn"));
+    layer.getParameters()["post_nms_topn"] = static_cast<size_t>(cnnLayer->GetParamAsUInt("post_nms_topn"));
+});
\ No newline at end of file