diff options
Diffstat (limited to 'src/runtime/NEON/functions/NEGEMMConvolutionLayer.cpp')
| -rw-r--r-- | src/runtime/NEON/functions/NEGEMMConvolutionLayer.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/runtime/NEON/functions/NEGEMMConvolutionLayer.cpp b/src/runtime/NEON/functions/NEGEMMConvolutionLayer.cpp index c32584ec0d..47ab16816a 100644 --- a/src/runtime/NEON/functions/NEGEMMConvolutionLayer.cpp +++ b/src/runtime/NEON/functions/NEGEMMConvolutionLayer.cpp @@ -28,7 +28,7 @@ #include "arm_compute/core/Validate.h" #include "arm_compute/runtime/Tensor.h" #include "src/core/helpers/MemoryHelpers.h" -#include "src/runtime/cpu/operators/CpuGemmConvolution.h" +#include "src/runtime/cpu/operators/CpuGemmConv2d.h" using namespace arm_compute::experimental; @@ -36,14 +36,14 @@ namespace arm_compute { struct NEGEMMConvolutionLayer::Impl { - const ITensor *weights{ nullptr }; - std::unique_ptr<cpu::CpuGemmConvolution> op{ nullptr }; - ITensorPack run_pack{}; - MemoryGroup memory_group{}; - IWeightsManager *weights_manager{ nullptr }; - MemoryRequirements aux_mem_req{}; - WorkspaceData<Tensor> workspace_tensors{}; - bool is_prepared{ false }; + const ITensor *weights{ nullptr }; + std::unique_ptr<cpu::CpuGemmConv2d> op{ nullptr }; + ITensorPack run_pack{}; + MemoryGroup memory_group{}; + IWeightsManager *weights_manager{ nullptr }; + MemoryRequirements aux_mem_req{}; + WorkspaceData<Tensor> workspace_tensors{}; + bool is_prepared{ false }; }; NEGEMMConvolutionLayer::NEGEMMConvolutionLayer(const std::shared_ptr<IMemoryManager> &memory_manager, IWeightsManager *weights_manager) @@ -59,7 +59,7 @@ void NEGEMMConvolutionLayer::configure(const ITensor *input, const ITensor *weig { ARM_COMPUTE_ERROR_ON_NULLPTR(input, weights, output); _impl->weights = weights; - _impl->op = std::make_unique<cpu::CpuGemmConvolution>(); + _impl->op = std::make_unique<cpu::CpuGemmConv2d>(); _impl->op->configure(input->info(), weights->info(), (biases != nullptr ? biases->info() : nullptr), output->info(), conv_info, weights_info, dilation, act_info, enable_fast_math, num_groups); _impl->run_pack = @@ -76,7 +76,7 @@ void NEGEMMConvolutionLayer::configure(const ITensor *input, const ITensor *weig Status NEGEMMConvolutionLayer::validate(const ITensorInfo *input, const ITensorInfo *weights, const ITensorInfo *biases, const ITensorInfo *output, const PadStrideInfo &conv_info, const WeightsInfo &weights_info, const Size2D &dilation, const ActivationLayerInfo &act_info, bool enable_fast_math, unsigned int num_groups) { - return cpu::CpuGemmConvolution::validate(input, weights, biases, output, conv_info, weights_info, dilation, act_info, enable_fast_math, num_groups); + return cpu::CpuGemmConv2d::validate(input, weights, biases, output, conv_info, weights_info, dilation, act_info, enable_fast_math, num_groups); } void NEGEMMConvolutionLayer::run() |