From 056b5d9dc6a87dc220792b7fe5ddea33692cc471 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Tue, 13 Feb 2018 18:50:55 +0000 Subject: COMPMID-765: Switch 1x1 DeconvolutionLayer to use the ConvolutionLayer -Swithes the 1x1 DeconvolutionLayer to use the ConvolutionLayer instead of the DirectConvolutionLayer. Change-Id: I3ffe152c42c3b1c7ea572f264cd3215df01aedc2 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/120292 Reviewed-by: Anthony Barbier Tested-by: Jenkins --- src/runtime/NEON/functions/NEDeconvolutionLayer.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/runtime/NEON/functions/NEDeconvolutionLayer.cpp') diff --git a/src/runtime/NEON/functions/NEDeconvolutionLayer.cpp b/src/runtime/NEON/functions/NEDeconvolutionLayer.cpp index b293fa080a..193e8c3fca 100644 --- a/src/runtime/NEON/functions/NEDeconvolutionLayer.cpp +++ b/src/runtime/NEON/functions/NEDeconvolutionLayer.cpp @@ -33,13 +33,11 @@ using namespace arm_compute::misc::shape_calculator; NEDeconvolutionLayer::NEDeconvolutionLayer(std::shared_ptr memory_manager) // NOLINT : _memory_group(std::move(memory_manager)), - _direct_conv_f(), _conv_f(), _scaled_output(), _input(nullptr), _info(), - _inner_border(), - _run_direct_convolution(false) + _inner_border() { } @@ -53,8 +51,6 @@ void NEDeconvolutionLayer::configure(ITensor *input, const ITensor *weights, con _input = input; _info = info; _inner_border = std::make_pair(inner_border_right, inner_border_top); - // FIXME: ConvolutionLayer Segfaults in GEMM assembly code for 1x1 convolutions - _run_direct_convolution = (weights->info()->dimension(0) == weights->info()->dimension(1)) && (weights->info()->dimension(0) == 1); const unsigned int stride_x = info.stride().first; const unsigned int stride_y = info.stride().second; @@ -78,7 +74,7 @@ void NEDeconvolutionLayer::configure(ITensor *input, const ITensor *weights, con // setup the function to convolve the upscaled output const PadStrideInfo conv_info(1, 1, 0, 0, 0, 0, DimensionRoundingType::CEIL); - (_run_direct_convolution) ? _direct_conv_f.configure(&_scaled_output, weights, bias, output, conv_info) : _conv_f.configure(&_scaled_output, weights, bias, output, conv_info); + _conv_f.configure(&_scaled_output, weights, bias, output, conv_info); // Allocate auxiliary tensors _scaled_output.allocator()->allocate(); @@ -119,7 +115,7 @@ void NEDeconvolutionLayer::run() } // Run convolution layer - (_run_direct_convolution) ? _direct_conv_f.run() : _conv_f.run(); + _conv_f.run(); _memory_group.release(); } -- cgit v1.2.1