Publishing 2019 R1 content

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

diff --git a/inference-engine/src/inference_engine/builders/ie_clamp_layer.cpp b/inference-engine/src/inference_engine/builders/ie_clamp_layer.cpp
index 0bc1fb9..587b442 100644 (file)
--- a/inference-engine/src/inference_engine/builders/ie_clamp_layer.cpp
+++ b/inference-engine/src/inference_engine/builders/ie_clamp_layer.cpp
@@ -1,56 +1,77 @@
-// Copyright (C) 2018 Intel Corporation
+// Copyright (C) 2018-2019 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 //
 
 #include <builders/ie_clamp_layer.hpp>
-#include <details/caseless.hpp>
+#include <ie_cnn_layer_builder.h>
 
 #include <string>
 
 using namespace InferenceEngine;
 
-Builder::ClampLayer::ClampLayer(const std::string& name): LayerFragment("Clamp", name) {
-    getLayer().getOutputPorts().resize(1);
-    getLayer().getInputPorts().resize(1);
+Builder::ClampLayer::ClampLayer(const std::string& name): LayerDecorator("Clamp", name) {
+    getLayer()->getOutputPorts().resize(1);
+    getLayer()->getInputPorts().resize(1);
     setMinValue(0.0f);
     setMaxValue(1.0f);
 }
 
-Builder::ClampLayer::ClampLayer(Layer& genLayer): LayerFragment(genLayer) {
-    if (!details::CaselessEq<std::string>()(getLayer().getType(), "Clamp"))
-        THROW_IE_EXCEPTION << "Cannot create ClampLayer decorator for layer " << getLayer().getType();
+Builder::ClampLayer::ClampLayer(const Layer::Ptr& layer): LayerDecorator(layer) {
+    checkType("Clamp");
+}
+
+Builder::ClampLayer::ClampLayer(const Layer::CPtr& layer): LayerDecorator(layer) {
+    checkType("Clamp");
 }
 
 Builder::ClampLayer& Builder::ClampLayer::setName(const std::string& name) {
-    getLayer().getName() = name;
+    getLayer()->setName(name);
     return *this;
 }
 
 const Port& Builder::ClampLayer::getPort() const {
-    return getLayer().getOutputPorts()[0];
+    return getLayer()->getOutputPorts()[0];
 }
 
 Builder::ClampLayer& Builder::ClampLayer::setPort(const Port &port) {
-    getLayer().getOutputPorts()[0] = port;
-    getLayer().getInputPorts()[0] = port;
+    getLayer()->getOutputPorts()[0] = port;
+    getLayer()->getInputPorts()[0] = port;
     return *this;
 }
 
 float Builder::ClampLayer::getMaxValue() const {
-    return getLayer().getParameters()["max"].asFloat();
+    return getLayer()->getParameters().at("max");
 }
 
 Builder::ClampLayer& Builder::ClampLayer::setMaxValue(float maxValue) {
-    getLayer().getParameters()["max"] = maxValue;
+    getLayer()->getParameters()["max"] = maxValue;
     return *this;
 }
 
 float Builder::ClampLayer::getMinValue() const {
-    return getLayer().getParameters()["min"].asFloat();
+    return getLayer()->getParameters().at("min");
 }
 
 Builder::ClampLayer& Builder::ClampLayer::setMinValue(float minValue) {
-    getLayer().getParameters()["min"] = minValue;
+    getLayer()->getParameters()["min"] = minValue;
     return *this;
 }
 
+REG_VALIDATOR_FOR(Clamp, [](const InferenceEngine::Builder::Layer::CPtr& input_layer, bool partial) {
+    Builder::ClampLayer layer(input_layer);
+    if (layer.getMinValue() > layer.getMaxValue()) {
+        THROW_IE_EXCEPTION << "MinValue should be less or equal MaxValue";
+    }
+    if (!input_layer->getInputPorts().empty() &&
+        !input_layer->getOutputPorts().empty() &&
+        !input_layer->getInputPorts()[0].shape().empty() &&
+        !input_layer->getOutputPorts()[0].shape().empty() &&
+        input_layer->getInputPorts()[0].shape() != input_layer->getOutputPorts()[0].shape()) {
+        THROW_IE_EXCEPTION << "Input and output ports should be equal";
+    }
+});
+
+REG_CONVERTER_FOR(Clamp, [](const CNNLayerPtr& cnnLayer, Builder::Layer& layer) {
+    layer.getParameters()["max"] = cnnLayer->GetParamAsFloat("max", 0);
+    layer.getParameters()["min"] = cnnLayer->GetParamAsFloat("min", 0);
+});