Publishing 2019 R1 content

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

diff --git a/inference-engine/src/inference_engine/builders/ie_argmax_layer.cpp b/inference-engine/src/inference_engine/builders/ie_argmax_layer.cpp
index 265913f..b666bc9 100644 (file)
--- a/inference-engine/src/inference_engine/builders/ie_argmax_layer.cpp
+++ b/inference-engine/src/inference_engine/builders/ie_argmax_layer.cpp
@@ -1,61 +1,86 @@
-// Copyright (C) 2018 Intel Corporation
+// Copyright (C) 2018-2019 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 //
 
 #include <builders/ie_argmax_layer.hpp>
-#include <details/caseless.hpp>
+#include <ie_cnn_layer_builder.h>
 
 #include <vector>
 #include <string>
 
 using namespace InferenceEngine;
 
-Builder::ArgMaxLayer::ArgMaxLayer(const std::string& name): LayerFragment("ArgMax", name) {
-    getLayer().getOutputPorts().resize(1);
-    getLayer().getInputPorts().resize(1);
+Builder::ArgMaxLayer::ArgMaxLayer(const std::string& name): LayerDecorator("ArgMax", name) {
+    getLayer()->getOutputPorts().resize(1);
+    getLayer()->getInputPorts().resize(1);
 }
 
-Builder::ArgMaxLayer::ArgMaxLayer(Layer& genLayer): LayerFragment(genLayer) {
-    if (!details::CaselessEq<std::string>()(getLayer().getType(), "ArgMax"))
-        THROW_IE_EXCEPTION << "Cannot create ArgMaxLayer decorator for layer " << getLayer().getType();
+Builder::ArgMaxLayer::ArgMaxLayer(const Layer::Ptr& layer): LayerDecorator(layer) {
+    checkType("ArgMax");
+}
+
+Builder::ArgMaxLayer::ArgMaxLayer(const Layer::CPtr& layer): LayerDecorator(layer) {
+    checkType("ArgMax");
 }
 
 Builder::ArgMaxLayer& Builder::ArgMaxLayer::setName(const std::string& name) {
-    getLayer().getName() = name;
+    getLayer()->setName(name);
     return *this;
 }
 
 const Port& Builder::ArgMaxLayer::getPort() const {
-    return getLayer().getInputPorts()[0];
+    return getLayer()->getInputPorts()[0];
 }
 
 Builder::ArgMaxLayer& Builder::ArgMaxLayer::setPort(const Port &port) {
-    getLayer().getInputPorts()[0] = port;
-    getLayer().getOutputPorts()[0] = port;
+    getLayer()->getInputPorts()[0] = port;
+    getLayer()->getOutputPorts()[0] = port;
     return *this;
 }
 
 int Builder::ArgMaxLayer::getAxis() const {
-    return getLayer().getParameters()["axis"].asInt();
+    return getLayer()->getParameters().at("axis");
 }
 Builder::ArgMaxLayer& Builder::ArgMaxLayer::setAxis(int axis) {
-    getLayer().getParameters()["axis"] = axis;
+    getLayer()->getParameters()["axis"] = axis;
     return *this;
 }
 size_t Builder::ArgMaxLayer::getTopK() const {
-    return getLayer().getParameters()["top_k"].asUInt();
+    return getLayer()->getParameters().at("top_k");
 }
 Builder::ArgMaxLayer& Builder::ArgMaxLayer::setTopK(size_t topK) {
-    getLayer().getParameters()["top_k"] = topK;
+    getLayer()->getParameters()["top_k"] = topK;
     return *this;
 }
 size_t Builder::ArgMaxLayer::getOutMaxVal() const {
-    return getLayer().getParameters()["out_max_val"].asUInt();
+    return getLayer()->getParameters().at("out_max_val");
 }
 Builder::ArgMaxLayer& Builder::ArgMaxLayer::setOutMaxVal(size_t outMaxVal) {
-    if (outMaxVal > 1)
-        THROW_IE_EXCEPTION << "OutMaxVal supports only 0 and 1 values.";
-    getLayer().getParameters()["out_max_val"] = outMaxVal;
+    getLayer()->getParameters()["out_max_val"] = outMaxVal;
     return *this;
 }
 
+REG_VALIDATOR_FOR(ArgMax, [] (const InferenceEngine::Builder::Layer::CPtr& input_layer, bool partial) {
+    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";
+    }
+    Builder::ArgMaxLayer layer(input_layer);
+    if (layer.getAxis() > 1) {
+        THROW_IE_EXCEPTION << "axis supports only 0 and 1 values.";
+    }
+    if (layer.getOutMaxVal() > 1) {
+        THROW_IE_EXCEPTION << "OutMaxVal supports only 0 and 1 values.";
+    }
+});
+
+REG_CONVERTER_FOR(ArgMax, [](const CNNLayerPtr& cnnLayer, Builder::Layer& layer) {
+    layer.getParameters()["axis"] = cnnLayer->GetParamAsInt("axis");
+    layer.getParameters()["top_k"] = static_cast<size_t>(cnnLayer->GetParamAsUInt("top_k"));
+    layer.getParameters()["out_max_val"] = static_cast<size_t>(cnnLayer->GetParamAsUInt("out_max_val"));
+});
+
+