diff options
author | Adnan AlSinan <adnan.alsinan@arm.com> | 2022-03-15 18:46:42 +0000 |
---|---|---|
committer | ramelg01 <ramy.elgammal@arm.com> | 2022-04-01 16:00:07 +0100 |
commit | 171fc3d160736e10f859c6f2a24d1c7a59bcd9e3 (patch) | |
tree | 8dcfee70ac949cbbc555bc7d42b38e53aa49ca99 /src/cpu/operators | |
parent | 892b70a8bb338f0c10c06112c41f6c8e8c3495f9 (diff) | |
download | ComputeLibrary-171fc3d160736e10f859c6f2a24d1c7a59bcd9e3.tar.gz |
Add CPU Pool3d FP16/32 implementation
- Add implementation for the CPU pooling 3d layer.
- NDHWC data layout support
- Support FP32/FP16.
- Add Pool3d to the operator list.
- Fix CL Pool3d kernel comments to generate the operator list.
Resolves: COMPMID-4671
Signed-off-by: Adnan AlSinan <adnan.alsinan@arm.com>
Change-Id: I92478a154beb12541525b648ed3dd5a58c8f27fa
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/7311
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>
Reviewed-by: Gunes Bayir <gunes.bayir@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
(cherry picked from commit 572659a0e5dd1086b1c7d16fe331ff73d2acd93a)
Diffstat (limited to 'src/cpu/operators')
-rw-r--r-- | src/cpu/operators/CpuPool3d.cpp | 73 | ||||
-rw-r--r-- | src/cpu/operators/CpuPool3d.h | 72 |
2 files changed, 145 insertions, 0 deletions
diff --git a/src/cpu/operators/CpuPool3d.cpp b/src/cpu/operators/CpuPool3d.cpp new file mode 100644 index 0000000000..14e4ac6c97 --- /dev/null +++ b/src/cpu/operators/CpuPool3d.cpp @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2022 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 "src/cpu/operators/CpuPool3d.h" + +#include "arm_compute/core/ITensor.h" +#include "arm_compute/core/TensorInfo.h" +#include "arm_compute/runtime/Scheduler.h" +#include "src/common/utils/Log.h" +#include "src/cpu/kernels/CpuPool3dKernel.h" + +using namespace arm_compute::experimental; + +namespace arm_compute +{ +namespace cpu +{ +CpuPool3d::CpuPool3d() + : _aux_mem(1) +{ +} + +CpuPool3d::~CpuPool3d() = default; + +void CpuPool3d::configure(const ITensorInfo *src, ITensorInfo *dst, const Pooling3dLayerInfo &pool_info) +{ + ARM_COMPUTE_LOG_PARAMS(src, dst, pool_info); + + // Configure pooling kernel + auto k = std::make_unique<kernels::CpuPool3dKernel>(); + k->configure(src, dst, pool_info); + _kernel = std::move(k); +} + +Status CpuPool3d::validate(const ITensorInfo *src, const ITensorInfo *dst, const Pooling3dLayerInfo &pool_info) +{ + return kernels::CpuPool3dKernel::validate(src, dst, pool_info); +} + +void CpuPool3d::run(ITensorPack &tensors) +{ + ARM_COMPUTE_ERROR_ON_MSG(tensors.empty(), "No tensors provided"); + + Scheduler::get().schedule_op(_kernel.get(), Window::DimY, _kernel->window(), tensors); +} + +experimental::MemoryRequirements CpuPool3d::workspace() const +{ + return _aux_mem; +} + +} // namespace cpu +} // namespace arm_compute
\ No newline at end of file diff --git a/src/cpu/operators/CpuPool3d.h b/src/cpu/operators/CpuPool3d.h new file mode 100644 index 0000000000..fc73cf0e0e --- /dev/null +++ b/src/cpu/operators/CpuPool3d.h @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2022 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. + */ +#ifndef ARM_COMPUTE_CPU_POOL3D_H +#define ARM_COMPUTE_CPU_POOL3D_H + +#include "arm_compute/core/experimental/Types.h" +#include "src/core/common/Macros.h" +#include "src/cpu/ICpuOperator.h" + +#include <memory> + +namespace arm_compute +{ +namespace cpu +{ +/** Basic function to simulate a pooling layer with the specified pooling operation. This function calls the following kernels: + * + * -# @ref kernels::CpuPool3dKernel + */ +class CpuPool3d : public ICpuOperator +{ +public: + CpuPool3d(); + ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuPool3d); + ~CpuPool3d(); + /** Set the src and dst tensors. + * + * + * @param[in] src Source tensor info. Data types supported: F16/F32. + * @param[out] dst Destination tensor info. Data types supported: same as @p src. + * @param[in] pool_info Contains pooling operation information described in @ref Pooling3dLayerInfo. + */ + void configure(const ITensorInfo *src, ITensorInfo *dst, const Pooling3dLayerInfo &pool_info); + /** Static function to check if given info will lead to a valid configuration + * + * Similar to CpuPool3d::configure() + * + * @return a status + */ + static Status validate(const ITensorInfo *src, const ITensorInfo *dst, const Pooling3dLayerInfo &pool_info); + + // Inherited methods overridden: + void run(ITensorPack &tensors) override; + experimental::MemoryRequirements workspace() const override; + +private: + experimental::MemoryRequirements _aux_mem{}; +}; +} // namespace cpu +} // namespace arm_compute +#endif /* ARM_COMPUTE_CPU_POOL3D_H */ |