diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2017-10-25 18:26:46 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
commit | 407c3e6e383affa7ebe72ce5f50fcf163ff037a3 (patch) | |
tree | c516e583fe0a2e5ee9dfc218fe10880000edcf91 /src/graph/nodes/NormalizationLayer.cpp | |
parent | e500747b5c1d27aeffae316c8190f6d169bb2fbd (diff) | |
download | ComputeLibrary-407c3e6e383affa7ebe72ce5f50fcf163ff037a3.tar.gz |
COMPMID-630: Rework nodes
Reworked node:
-BatchNormalization
-Floor
-FullyConncted
-L2Normalize
-Normalization
-Pooling
-Softmax
Change-Id: I4c71cfffb1f59aac3326ba8b1f831339c5244394
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/93134
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'src/graph/nodes/NormalizationLayer.cpp')
-rw-r--r-- | src/graph/nodes/NormalizationLayer.cpp | 66 |
1 files changed, 11 insertions, 55 deletions
diff --git a/src/graph/nodes/NormalizationLayer.cpp b/src/graph/nodes/NormalizationLayer.cpp index 680925a2b9..5036231a36 100644 --- a/src/graph/nodes/NormalizationLayer.cpp +++ b/src/graph/nodes/NormalizationLayer.cpp @@ -23,45 +23,12 @@ */ #include "arm_compute/graph/nodes/NormalizationLayer.h" -#include "arm_compute/runtime/CL/CLTensor.h" -#include "arm_compute/runtime/CL/functions/CLNormalizationLayer.h" -#include "arm_compute/runtime/NEON/functions/NENormalizationLayer.h" -#include "arm_compute/runtime/Tensor.h" +#include "arm_compute/graph/NodeContext.h" +#include "arm_compute/graph/OperationRegistry.h" #include "support/ToolchainSupport.h" -#include "utils/TypePrinter.h" using namespace arm_compute::graph; -namespace -{ -template <typename NormalizationType, typename TensorType, TargetHint target_hint> -std::unique_ptr<arm_compute::IFunction> instantiate_function(arm_compute::ITensor *input, arm_compute::ITensor *output, const NormalizationLayerInfo &norm_info) -{ - auto norm = arm_compute::support::cpp14::make_unique<NormalizationType>(); - norm->configure( - dynamic_cast<TensorType *>(input), - dynamic_cast<TensorType *>(output), - norm_info); - - return std::move(norm); -} - -template <TargetHint target_hint> -std::unique_ptr<arm_compute::IFunction> instantiate(arm_compute::ITensor *input, arm_compute::ITensor *output, const NormalizationLayerInfo &norm_info); - -template <> -std::unique_ptr<arm_compute::IFunction> instantiate<TargetHint::OPENCL>(arm_compute::ITensor *input, arm_compute::ITensor *output, const NormalizationLayerInfo &norm_info) -{ - return instantiate_function<arm_compute::CLNormalizationLayer, arm_compute::ICLTensor, TargetHint::OPENCL>(input, output, norm_info); -} - -template <> -std::unique_ptr<arm_compute::IFunction> instantiate<TargetHint::NEON>(arm_compute::ITensor *input, arm_compute::ITensor *output, const NormalizationLayerInfo &norm_info) -{ - return instantiate_function<arm_compute::NENormalizationLayer, arm_compute::ITensor, TargetHint::NEON>(input, output, norm_info); -} -} // namespace - NormalizationLayer::NormalizationLayer(const NormalizationLayerInfo norm_info) : _norm_info(norm_info) { @@ -72,28 +39,17 @@ std::unique_ptr<arm_compute::IFunction> NormalizationLayer::instantiate_node(Gra ARM_COMPUTE_ERROR_ON(input == nullptr || input->tensor() == nullptr); ARM_COMPUTE_ERROR_ON(output == nullptr || output->tensor() == nullptr); - std::unique_ptr<arm_compute::IFunction> func; - _target_hint = ctx.hints().target_hint(); - arm_compute::ITensor *in = input->tensor(); arm_compute::ITensor *out = output->tensor(); + _target_hint = ctx.hints().target_hint(); - if(_target_hint == TargetHint::OPENCL) - { - func = instantiate<TargetHint::OPENCL>(in, out, _norm_info); - ARM_COMPUTE_LOG_GRAPH_INFO("Instantiating CLNormalizationLayer"); - } - else - { - func = instantiate<TargetHint::NEON>(in, out, _norm_info); - ARM_COMPUTE_LOG_GRAPH_INFO("Instantiating NENormalizationLayer"); - } - - ARM_COMPUTE_LOG_GRAPH_INFO(" Data Type: " << in->info()->data_type() - << " Input shape: " << in->info()->tensor_shape() - << " Output shape: " << out->info()->tensor_shape() - << " Normalization info: " << _norm_info - << std::endl); + // Create node context + NodeContext node_ctx(OperationType::NormalizationLayer); + node_ctx.set_target(_target_hint); + node_ctx.add_input(in); + node_ctx.add_output(out); + node_ctx.add_parameter<NormalizationLayerInfo>("NormalizationLayerInfo", _norm_info); - return func; + // Get function + return OperationRegistry::get().find_operation(OperationType::NormalizationLayer, _target_hint)->configure(node_ctx); } |