diff options
author | Anitha Raj <anitha.raj@arm.com> | 2023-08-22 15:46:27 +0100 |
---|---|---|
committer | Anitha Raj <Anitha.Raj@arm.com> | 2023-08-23 08:44:11 +0000 |
commit | 082630ba4e2de697b6d372dd35ffc1be6a42c346 (patch) | |
tree | 8d08824bf8d30d8bc3ade4493ed43bfbcae97bae /src/cpu/operators/CpuGemmConv2d.h | |
parent | 1b2ee3eb6991efcbd09cde84ab0c383f15648738 (diff) | |
download | ComputeLibrary-082630ba4e2de697b6d372dd35ffc1be6a42c346.tar.gz |
Update CpuGemmConv2d and CpuFlatten to use CpuReshape operator
- Following CpuReshapeKernel Optimizations, update the CpuGemmConv2D and CpuFlatten
to use CpuReshape operator instead of CpuReshapeKernel
- Minor changes to comment in NEReorgLayerKernel.h
Resolves COMPMID-6504
Signed-off-by: Anitha Raj <anitha.raj@arm.com>
Change-Id: Ib6ee1fdc313d91249f9fe41c81e73324031c1ff4
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/10186
Reviewed-by: Jakub Sujak <jakub.sujak@arm.com>
Reviewed-by: Gunes Bayir <gunes.bayir@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Benchmark: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/cpu/operators/CpuGemmConv2d.h')
-rw-r--r-- | src/cpu/operators/CpuGemmConv2d.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/cpu/operators/CpuGemmConv2d.h b/src/cpu/operators/CpuGemmConv2d.h index 81d34ae93d..61fe63a79f 100644 --- a/src/cpu/operators/CpuGemmConv2d.h +++ b/src/cpu/operators/CpuGemmConv2d.h @@ -21,8 +21,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef ARM_COMPUTE_CPU_GEMM_CONV2D_H -#define ARM_COMPUTE_CPU_GEMM_CONV2D_H +#ifndef ACL_SRC_CPU_OPERATORS_CPUGEMMCONV2D_H +#define ACL_SRC_CPU_OPERATORS_CPUGEMMCONV2D_H #include "arm_compute/core/TensorInfo.h" #include "arm_compute/core/Types.h" @@ -38,12 +38,12 @@ namespace cpu class CpuGemm; class CpuGemmLowpMatrixMultiplyCore; class CpuGemmLowpOutputStage; +class CpuReshape; namespace kernels { class CpuWeightsReshapeKernel; class CpuIm2ColKernel; class CpuCol2ImKernel; -class CpuReshapeKernel; } // namespace kernels /** Basic function to compute the convolution layer. This function calls the following kernels/functions: @@ -130,8 +130,8 @@ public: const bool enable_fast_math = false); // Inherited methods overridden: - void run(ITensorPack &tensors) override; - void prepare(ITensorPack &tensors) override; + void run(ITensorPack &tensors) override; + void prepare(ITensorPack &tensors) override; experimental::MemoryRequirements workspace() const override; private: @@ -222,7 +222,7 @@ private: std::unique_ptr<CpuGemm> _mm_gemm; std::unique_ptr<CpuGemmLowpMatrixMultiplyCore> _mm_gemmlowp; std::unique_ptr<kernels::CpuCol2ImKernel> _col2im_kernel; - std::unique_ptr<kernels::CpuReshapeKernel> _reshape_kernel; + std::unique_ptr<CpuReshape> _reshape; TensorInfo _im2col_output; TensorInfo _weights_reshaped; @@ -240,4 +240,4 @@ private: }; } // namespace cpu } // namespace arm_compute -#endif /* ARM_COMPUTE_CPU_GEMM_CONV2D_H */ +#endif // ACL_SRC_CPU_OPERATORS_CPUGEMMCONV2D_H |