From 19884630c37ae9de2f65a88ea2cda5630a551bad Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Mon, 16 Aug 2021 12:38:54 +0100 Subject: Rename [Cl|Cpu]GemmConvolution to [Cl|Gpu]GemmConv2d Renaming the gemm-based convolution operators to accomodate for new operators with higher convolution dimensonality Signed-off-by: Georgios Pinitas Change-Id: Id2f2cf11404221f0e87baa0e5d08ad5d63eaf78e Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/6113 Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins --- src/runtime/cpu/operators/CpuConv2d.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/runtime/cpu/operators/CpuConv2d.cpp') diff --git a/src/runtime/cpu/operators/CpuConv2d.cpp b/src/runtime/cpu/operators/CpuConv2d.cpp index 809663a918..cff9238308 100644 --- a/src/runtime/cpu/operators/CpuConv2d.cpp +++ b/src/runtime/cpu/operators/CpuConv2d.cpp @@ -26,7 +26,7 @@ #include "arm_compute/runtime/NEON/functions/NEFFTConvolutionLayer.h" #include "src/runtime/cpu/operators/CpuDirectConv2d.h" #include "src/runtime/cpu/operators/CpuGemm.h" -#include "src/runtime/cpu/operators/CpuGemmConvolution.h" +#include "src/runtime/cpu/operators/CpuGemmConv2d.h" #include "src/runtime/cpu/operators/CpuGemmDirectConv2d.h" #include "src/runtime/cpu/operators/CpuWinogradConv2d.h" @@ -62,7 +62,7 @@ void CpuConv2d::configure(ITensorInfo *input, ITensorInfo *weights, const ITenso } case ConvolutionMethod::GEMM: { - auto f = std::make_unique(); + auto f = std::make_unique(); f->configure(input, weights, biases, output, conv_info, weights_info, dilation, act_info, enable_fast_math); _function = std::move(f); break; @@ -101,7 +101,7 @@ Status CpuConv2d::validate(const ITensorInfo *input, const ITensorInfo *weights, ARM_COMPUTE_RETURN_ON_ERROR(CpuWinogradConv2d::validate(input, weights, biases, output, conv_info, act_info, enable_fast_math)); break; case ConvolutionMethod::GEMM: - ARM_COMPUTE_RETURN_ON_ERROR(CpuGemmConvolution::validate(input, weights, biases, output, conv_info, weights_info, dilation, act_info, enable_fast_math)); + ARM_COMPUTE_RETURN_ON_ERROR(CpuGemmConv2d::validate(input, weights, biases, output, conv_info, weights_info, dilation, act_info, enable_fast_math)); break; case ConvolutionMethod::GEMM_CONV2D: ARM_COMPUTE_RETURN_ON_ERROR(CpuGemmDirectConv2d::validate(input, weights, biases, output, info)); -- cgit v1.2.1