From 6f669f039fb74675b858bc3703295609a6a3e122 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Tue, 26 Sep 2017 12:32:57 +0100 Subject: 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 Reviewed-by: Anthony Barbier --- src/graph/SubTensor.cpp | 105 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 src/graph/SubTensor.cpp (limited to 'src/graph/SubTensor.cpp') diff --git a/src/graph/SubTensor.cpp b/src/graph/SubTensor.cpp new file mode 100644 index 0000000000..a70f32927b --- /dev/null +++ b/src/graph/SubTensor.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/SubTensor.h" + +#include "arm_compute/core/Error.h" +#include "arm_compute/core/Helpers.h" +#include "arm_compute/core/Validate.h" +#include "arm_compute/runtime/CL/CLSubTensor.h" +#include "arm_compute/runtime/SubTensor.h" +#include "utils/TypePrinter.h" + +using namespace arm_compute::graph; + +namespace +{ +template +std::unique_ptr initialise_subtensor(ITensor *parent, TensorShape shape, Coordinates coords) +{ + auto ptensor = dynamic_cast(parent); + auto subtensor = arm_compute::support::cpp14::make_unique(ptensor, shape, coords); + return std::move(subtensor); +} +} // namespace + +SubTensor::SubTensor() + : _target(Hint::DONT_CARE), _coords(), _info(), _parent(nullptr), _subtensor(nullptr) +{ +} + +SubTensor::SubTensor(Tensor &parent, TensorShape tensor_shape, Coordinates coords) + : _target(Hint::DONT_CARE), _coords(coords), _info(), _parent(nullptr), _subtensor(nullptr) +{ + ARM_COMPUTE_ERROR_ON(parent.tensor() == nullptr); + _parent = parent.tensor(); + _info = SubTensorInfo(parent.tensor()->info(), tensor_shape, coords); + _target = parent.target(); + + instantiate_subtensor(); +} + +SubTensor::SubTensor(ITensor *parent, TensorShape tensor_shape, Coordinates coords, Hint target) + : _target(target), _coords(coords), _info(), _parent(parent), _subtensor(nullptr) +{ + ARM_COMPUTE_ERROR_ON(parent == nullptr); + _info = SubTensorInfo(parent->info(), tensor_shape, coords); + + instantiate_subtensor(); +} + +void SubTensor::set_info(SubTensorInfo &&info) +{ + _info = info; +} + +const SubTensorInfo &SubTensor::info() const +{ + return _info; +} + +ITensor *SubTensor::tensor() +{ + return _subtensor.get(); +} + +Hint SubTensor::target() const +{ + return _target; +} + +void SubTensor::instantiate_subtensor() +{ + switch(_target) + { + case Hint::OPENCL: + _subtensor = initialise_subtensor(_parent, _info.tensor_shape(), _coords); + break; + case Hint::NEON: + _subtensor = initialise_subtensor(_parent, _info.tensor_shape(), _coords); + break; + default: + ARM_COMPUTE_ERROR("Invalid Hint"); + } +} -- cgit v1.2.1