diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2017-09-26 12:32:57 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
commit | 6f669f039fb74675b858bc3703295609a6a3e122 (patch) | |
tree | 704847bbebb2439f68309680bd4f4142b876c179 /src/graph/nodes/NormalizationLayer.cpp | |
parent | 1682430e220eb609752c650f85c0f96e375b6d6a (diff) | |
download | ComputeLibrary-6f669f039fb74675b858bc3703295609a6a3e122.tar.gz |
COMPMID-417: Add grouping in convolution layer
-Adds grouping support in convolution layer
-Adds Normalization layer node in graph
-Adds alexnet example
-Fixes FullyConnectedLayer output autoconfigure (works only for 1d batch
space)
Change-Id: I5bd75f9a8b08cfd68f7c34745150266c2bc4221f
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/89518
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 | 105 |
1 files changed, 105 insertions, 0 deletions
diff --git a/src/graph/nodes/NormalizationLayer.cpp b/src/graph/nodes/NormalizationLayer.cpp new file mode 100644 index 0000000000..55ef9bf243 --- /dev/null +++ b/src/graph/nodes/NormalizationLayer.cpp @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2017 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#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 "support/ToolchainSupport.h" +#include "utils/TypePrinter.h" + +using namespace arm_compute::graph; + +namespace +{ +template <typename NormalizationType, typename TensorType, Hint hint> +std::unique_ptr<arm_compute::IFunction> instantiate_function(ITensor *input, 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 <Hint hint> +std::unique_ptr<arm_compute::IFunction> instantiate(ITensor *input, ITensor *output, const NormalizationLayerInfo &norm_info); + +template <> +std::unique_ptr<arm_compute::IFunction> instantiate<Hint::OPENCL>(ITensor *input, ITensor *output, const NormalizationLayerInfo &norm_info) +{ + return instantiate_function<arm_compute::CLNormalizationLayer, arm_compute::CLTensor, Hint::OPENCL>(input, output, norm_info); +} + +template <> +std::unique_ptr<arm_compute::IFunction> instantiate<Hint::NEON>(ITensor *input, ITensor *output, const NormalizationLayerInfo &norm_info) +{ + return instantiate_function<arm_compute::NENormalizationLayer, arm_compute::Tensor, Hint::NEON>(input, output, norm_info); +} +} // namespace + +NormalizationLayer::NormalizationLayer(const NormalizationLayerInfo norm_info) + : _norm_info(norm_info) +{ +} + +std::unique_ptr<arm_compute::IFunction> NormalizationLayer::instantiate_node(Hint hint, ITensor *input, ITensor *output) +{ + std::unique_ptr<arm_compute::IFunction> func; + _hint = hint; + _input = input; + _output = output; + + if(_hint == Hint::OPENCL) + { + func = instantiate<Hint::OPENCL>(input, output, _norm_info); + } + else + { + func = instantiate<Hint::NEON>(input, output, _norm_info); + } + + return func; +} + +void NormalizationLayer::print_info() +{ + if(_hint == Hint::OPENCL) + { + std::cout << "Instantiating CLNormalizationLayer"; + } + else + { + std::cout << "Instantiating NENormalizationLayer"; + } + + std::cout << " Data Type: " << _input->info()->data_type() + << " Input shape: " << _input->info()->tensor_shape() + << " Output shape: " << _output->info()->tensor_shape() + << " Normalization info: " << _norm_info + << std::endl; +} |