diff options
author | Teresa Charlin <teresa.charlinreyes@arm.com> | 2021-04-13 17:44:15 +0100 |
---|---|---|
committer | TeresaARM <teresa.charlinreyes@arm.com> | 2021-04-20 13:20:59 +0000 |
commit | 562bee584f3633167725af7915f50d07b0597f10 (patch) | |
tree | cc0a5658cfd82f3d1552103472253734e1f437cd /src/runtime/NEON/functions/NEConvertFullyConnectedWeights.cpp | |
parent | ada6cbc057ff725e57d301a99a1816ce602485b9 (diff) | |
download | ComputeLibrary-562bee584f3633167725af7915f50d07b0597f10.tar.gz |
Port CpuConvertFullyConnectedWeights to new API
* Remove includes of NEConvertFullyConnectedWeightsKernel.h
Resolves partially: COMPMID-4187
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: I1bf246546d3ef53edb4c5a8bc05a0db92d2d3bff
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5418
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/runtime/NEON/functions/NEConvertFullyConnectedWeights.cpp')
-rw-r--r-- | src/runtime/NEON/functions/NEConvertFullyConnectedWeights.cpp | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/src/runtime/NEON/functions/NEConvertFullyConnectedWeights.cpp b/src/runtime/NEON/functions/NEConvertFullyConnectedWeights.cpp index a6a7746830..f2253d8be4 100644 --- a/src/runtime/NEON/functions/NEConvertFullyConnectedWeights.cpp +++ b/src/runtime/NEON/functions/NEConvertFullyConnectedWeights.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020 Arm Limited. + * Copyright (c) 2018-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -22,32 +22,45 @@ * SOFTWARE. */ #include "arm_compute/runtime/NEON/functions/NEConvertFullyConnectedWeights.h" -#include "src/core/NEON/kernels/NEConvertFullyConnectedWeightsKernel.h" + +#include "src/runtime/cpu/operators/CpuConvertFullyConnectedWeights.h" namespace arm_compute { -NEConvertFullyConnectedWeights::~NEConvertFullyConnectedWeights() = default; - +struct NEConvertFullyConnectedWeights::Impl +{ + const ITensor *src{ nullptr }; + ITensor *dst{ nullptr }; + std::unique_ptr<cpu::CpuConvertFullyConnectedWeights> op{ nullptr }; +}; NEConvertFullyConnectedWeights::NEConvertFullyConnectedWeights() - : _kernel() + : _impl(std::make_unique<Impl>()) { } +NEConvertFullyConnectedWeights::~NEConvertFullyConnectedWeights() = default; void NEConvertFullyConnectedWeights::configure(const ITensor *input, ITensor *output, const TensorShape &original_input_shape, DataLayout data_layout) { - _kernel = std::make_unique<NEConvertFullyConnectedWeightsKernel>(); - _kernel->configure(input, output, original_input_shape, data_layout); + ARM_COMPUTE_ERROR_ON_NULLPTR(input, output); + + _impl->src = input; + _impl->dst = output; + _impl->op = std::make_unique<cpu::CpuConvertFullyConnectedWeights>(); + _impl->op->configure(_impl->src->info(), _impl->dst->info(), original_input_shape, data_layout); } Status NEConvertFullyConnectedWeights::validate(const ITensorInfo *input, const ITensorInfo *output, const TensorShape &original_input_shape, DataLayout data_layout) { - return NEConvertFullyConnectedWeightsKernel::validate(input, output, original_input_shape, data_layout); + return cpu::CpuConvertFullyConnectedWeights::validate(input, output, original_input_shape, data_layout); } void NEConvertFullyConnectedWeights::run() { - NEScheduler::get().schedule(_kernel.get(), Window::DimZ); + ITensorPack pack; + pack.add_tensor(TensorType::ACL_SRC, _impl->src); + pack.add_tensor(TensorType::ACL_DST, _impl->dst); + _impl->op->run(pack); } } // namespace arm_compute
\ No newline at end of file |