Publishing 2019 R1 content

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

diff --git a/inference-engine/src/inference_engine/builders/ie_batch_normalization_layer.cpp b/inference-engine/src/inference_engine/builders/ie_batch_normalization_layer.cpp
index 1c3d275..329d3f5 100644 (file)
--- a/inference-engine/src/inference_engine/builders/ie_batch_normalization_layer.cpp
+++ b/inference-engine/src/inference_engine/builders/ie_batch_normalization_layer.cpp
@@ -1,68 +1,63 @@
-// Copyright (C) 2018 Intel Corporation
+// Copyright (C) 2018-2019 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 //
 
 #include <builders/ie_batch_normalization_layer.hpp>
-#include <details/caseless.hpp>
+#include <ie_cnn_layer_builder.h>
 
 #include <string>
 
 using namespace InferenceEngine;
 
-Builder::BatchNormalizationLayer::BatchNormalizationLayer(const std::string& name): LayerFragment("BatchNormalization", name) {
-    getLayer().getOutputPorts().resize(1);
-    getLayer().getInputPorts().resize(1);
+Builder::BatchNormalizationLayer::BatchNormalizationLayer(const std::string& name): LayerDecorator("BatchNormalization", name) {
+    getLayer()->getInputPorts().resize(3);
+    getLayer()->getInputPorts()[1].setParameter("type", "weights");
+    getLayer()->getInputPorts()[2].setParameter("type", "biases");
+    getLayer()->getOutputPorts().resize(1);
     setEpsilon(0.00000001f);
 }
 
-Builder::BatchNormalizationLayer::BatchNormalizationLayer(Layer& genLayer): LayerFragment(genLayer) {
-    if (!details::CaselessEq<std::string>()(getLayer().getType(), "BatchNormalization"))
-        THROW_IE_EXCEPTION << "Cannot create BatchNormalizationLayer decorator for layer " << getLayer().getType();
+Builder::BatchNormalizationLayer::BatchNormalizationLayer(const Layer::Ptr& layer): LayerDecorator(layer) {
+    checkType("BatchNormalization");
+}
+
+Builder::BatchNormalizationLayer::BatchNormalizationLayer(const Layer::CPtr& layer): LayerDecorator(layer) {
+    checkType("BatchNormalization");
 }
 
 Builder::BatchNormalizationLayer& Builder::BatchNormalizationLayer::setName(const std::string& name) {
-    getLayer().getName() = name;
+    getLayer()->setName(name);
     return *this;
 }
 
 const Port& Builder::BatchNormalizationLayer::getPort() const {
-    return getLayer().getOutputPorts()[0];
+    return getLayer()->getOutputPorts()[0];
 }
 
 Builder::BatchNormalizationLayer& Builder::BatchNormalizationLayer::setPort(const Port &port) {
-    getLayer().getOutputPorts()[0] = port;
-    getLayer().getInputPorts()[0] = port;
-    return *this;
-}
-
-Builder::BatchNormalizationLayer& Builder::BatchNormalizationLayer::setWeights(const Blob::CPtr& weights) {
-    getLayer().addConstantData("weights", weights);
-    return *this;
-}
-Builder::BatchNormalizationLayer& Builder::BatchNormalizationLayer::setBiases(const Blob::CPtr& biases) {
-    getLayer().addConstantData("biases", biases);
+    getLayer()->getOutputPorts()[0] = port;
+    getLayer()->getInputPorts()[0] = port;
     return *this;
 }
 
 float Builder::BatchNormalizationLayer::getEpsilon() const {
-    return getLayer().getParameters()["epsilon"].asFloat();
+    return getLayer()->getParameters().at("epsilon");
 }
 Builder::BatchNormalizationLayer& Builder::BatchNormalizationLayer::setEpsilon(float eps) {
-    getLayer().getParameters()["epsilon"] = eps;
+    getLayer()->getParameters()["epsilon"] = eps;
     return *this;
 }
 
-void Builder::BatchNormalizationLayer::validate(const Layer& layer)  {
-    auto weightsIt = layer.getConstantData().find("weights");
-    auto biasesIt = layer.getConstantData().find("biases");
-    bool valid = weightsIt != layer.getConstantData().end() &&
-            biasesIt != layer.getConstantData().end() &&
-            weightsIt->second != nullptr &&
-            weightsIt->second->cbuffer() != nullptr &&
-            biasesIt->second != nullptr &&
-            biasesIt->second->cbuffer() != nullptr;
-    if (!valid)
-        THROW_IE_EXCEPTION << "Cannot create BatchNotmalization layer! Weights and biases are required!";
-}
+REG_VALIDATOR_FOR(BatchNormalization, [](const Builder::Layer::CPtr& layer, bool partial)  {
+    Builder::BatchNormalizationLayer batchNormBuilder(layer);
+    if (partial)
+        return;
+    auto weights = layer->getInputPorts()[1].getData()->getData();
+    auto biases = layer->getInputPorts()[2].getData()->getData();
+    if (!weights || weights->cbuffer() == nullptr || !biases || biases->cbuffer() == nullptr)
+        THROW_IE_EXCEPTION << "Cannot create BatchNormalization layer! Weights and biases are required!";
+});
 
-REG_VALIDATOR_FOR(BatchNormalization,  Builder::BatchNormalizationLayer::validate);
\ No newline at end of file
+REG_CONVERTER_FOR(BatchNormalization, [](const CNNLayerPtr& cnnLayer, Builder::Layer& layer) {
+    layer.getParameters()["epsilon"] = cnnLayer->GetParamAsFloat("epsilon");
+});
\ No newline at end of file