diff options
Diffstat (limited to 'src/runtime/NEON/functions/NEConcatenateLayer.cpp')
| -rw-r--r-- | src/runtime/NEON/functions/NEConcatenateLayer.cpp | 131 |
1 files changed, 90 insertions, 41 deletions
diff --git a/src/runtime/NEON/functions/NEConcatenateLayer.cpp b/src/runtime/NEON/functions/NEConcatenateLayer.cpp index 9c480a0d50..37cdd15529 100644 --- a/src/runtime/NEON/functions/NEConcatenateLayer.cpp +++ b/src/runtime/NEON/functions/NEConcatenateLayer.cpp @@ -39,58 +39,31 @@ namespace arm_compute { -NEConcatenateLayer::NEConcatenateLayer() - : _concat_kernels(), - _num_inputs(0), - _axis(Window::DimX) -{ -} - -void NEConcatenateLayer::configure(std::vector<ITensor *> inputs_vector, ITensor *output, size_t axis) -{ - configure_internal(std::move(inputs_vector), output, axis); -} - -void NEConcatenateLayer::configure(std::vector<const ITensor *> inputs_vector, ITensor *output, size_t axis) +namespace experimental { - configure_internal(std::move(inputs_vector), output, axis); -} - -Status NEConcatenateLayer::validate(const std::vector<ITensorInfo *> &inputs_vector, const ITensorInfo *output, size_t axis) -{ - return validate_internal(inputs_vector, output, axis); -} - -Status NEConcatenateLayer::validate(const std::vector<const ITensorInfo *> &inputs_vector, const ITensorInfo *output, size_t axis) +NEConcatenateLayer::NEConcatenateLayer() + : _concat_kernels(), _num_inputs(0), _axis(0) { - return validate_internal(inputs_vector, output, axis); } -template <typename TensorType, typename> -void NEConcatenateLayer::configure_internal(std::vector<TensorType *> &&inputs_vector, ITensor *output, size_t axis) +void NEConcatenateLayer::configure(const std::vector<const ITensorInfo *> &inputs_vector, ITensorInfo *output, size_t axis) { ARM_COMPUTE_ERROR_ON(output == nullptr); + _axis = axis; _num_inputs = inputs_vector.size(); - std::vector<ITensorInfo *> inputs_vector_info; - inputs_vector_info.reserve(_num_inputs); - for(unsigned int i = 0; i < _num_inputs; ++i) - { - ARM_COMPUTE_ERROR_ON_NULLPTR(inputs_vector.at(i)); - inputs_vector_info.emplace_back(inputs_vector.at(i)->info()); - } - TensorShape output_shape = arm_compute::misc::shape_calculator::calculate_concatenate_shape(inputs_vector, _axis); + TensorShape output_shape = arm_compute::misc::shape_calculator::calculate_concatenate_shape(inputs_vector, axis); // Output auto inizialitation if not yet initialized - auto_init_if_empty(*output->info(), output_shape, 1, inputs_vector[0]->info()->data_type()); - ARM_COMPUTE_ERROR_THROW_ON(NEConcatenateLayer::validate(inputs_vector_info, output->info(), axis)); + auto_init_if_empty(*output, output_shape, 1, inputs_vector[0]->data_type()); + ARM_COMPUTE_ERROR_THROW_ON(NEConcatenateLayer::validate(inputs_vector, output, axis)); unsigned int offset = 0; for(unsigned int i = 0; i < _num_inputs; ++i) { - switch(_axis) + switch(axis) { case Window::DimX: { @@ -123,12 +96,11 @@ void NEConcatenateLayer::configure_internal(std::vector<TensorType *> &&inputs_v default: ARM_COMPUTE_ERROR("Axis not supported"); } - offset += inputs_vector.at(i)->info()->dimension(_axis); + offset += inputs_vector.at(i)->dimension(axis); } } -template <typename TensorInfoType, typename> -Status NEConcatenateLayer::validate_internal(const std::vector<TensorInfoType *> &inputs_vector, const ITensorInfo *output, size_t axis) +Status NEConcatenateLayer::validate(const std::vector<const ITensorInfo *> &inputs_vector, const ITensorInfo *output, size_t axis) { ARM_COMPUTE_RETURN_ERROR_ON_NULLPTR(output); ARM_COMPUTE_RETURN_ERROR_ON(inputs_vector.size() < 2); @@ -174,11 +146,88 @@ Status NEConcatenateLayer::validate_internal(const std::vector<TensorInfoType *> return Status{}; } +MemoryRequirements NEConcatenateLayer::workspace() const +{ + return MemoryRequirements{}; +} + +void NEConcatenateLayer::run(InputTensorMap inputs, OutputTensorMap outputs, OperatorTensorMap workspace) +{ + ARM_COMPUTE_UNUSED(workspace); + + if(inputs.empty() || outputs.empty()) + { + ARM_COMPUTE_ERROR("No inputs provided"); + } + + if(inputs.size() != _num_inputs) + { + ARM_COMPUTE_ERROR("Configured with different number of inputs"); + } + + int i = 0; + for(auto &k : _concat_kernels) + { + const InputTensorMap input = { { TensorType::ACL_SRC, inputs.at(ACL_SRC_VEC + i) } }; + NEScheduler::get().schedule_op(k.get(), Window::DimY, input, outputs); + ++i; + } +} +} // namespace experimental + +struct NEConcatenateLayer::Impl +{ + std::vector<const ITensor *> srcs{}; + ITensor *dst{ nullptr }; + unsigned int num_inputs{ 0 }; + unsigned int axis{ 0 }; + std::unique_ptr<experimental::NEConcatenateLayer> op{ nullptr }; +}; + +NEConcatenateLayer::NEConcatenateLayer() + : _impl(support::cpp14::make_unique<Impl>()) +{ +} + +NEConcatenateLayer::NEConcatenateLayer(NEConcatenateLayer &&) = default; + +NEConcatenateLayer &NEConcatenateLayer::operator=(NEConcatenateLayer &&) = default; + +NEConcatenateLayer::~NEConcatenateLayer() = default; + +void NEConcatenateLayer::configure(std::vector<const ITensor *> inputs_vector, ITensor *output, size_t axis) +{ + ARM_COMPUTE_ERROR_ON(output == nullptr); + + _impl->srcs = inputs_vector; + _impl->dst = output; + _impl->axis = axis; + _impl->num_inputs = inputs_vector.size(); + _impl->op = arm_compute::support::cpp14::make_unique<experimental::NEConcatenateLayer>(); + + std::vector<const ITensorInfo *> inputs_vector_info; + for(unsigned int i = 0; i < inputs_vector.size(); ++i) + { + ARM_COMPUTE_ERROR_ON_NULLPTR(inputs_vector.at(i)); + inputs_vector_info.emplace_back(inputs_vector.at(i)->info()); + } + _impl->op->configure(inputs_vector_info, _impl->dst->info(), axis); +} + +Status NEConcatenateLayer::validate(const std::vector<const ITensorInfo *> &inputs_vector, const ITensorInfo *output, size_t axis) +{ + return experimental::NEConcatenateLayer::validate(inputs_vector, output, axis); +} + void NEConcatenateLayer::run() { - for(auto &kernel : _concat_kernels) + InputTensorMap srcs; + for(unsigned i = 0; i < _impl->num_inputs; ++i) { - NEScheduler::get().schedule(kernel.get(), Window::DimY); + srcs.insert(std::make_pair(TensorType::ACL_SRC_VEC + i, _impl->srcs.at(i))); } + const OutputTensorMap dst{ { TensorType::ACL_DST, _impl->dst } }; + + _impl->op->run(srcs, dst, {}); } } // namespace arm_compute |