From 02ee4291795f64fb510a71c6c754671438635186 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Thu, 15 Feb 2018 17:22:36 +0000 Subject: COMPMID-765: Fix CPPPermute error when permuting the strides. Change-Id: I4ea57579d997dd6a2e248634e3b7cb58bb3e2838 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/120693 Reviewed-by: Pablo Tello Tested-by: Jenkins --- src/runtime/NEON/functions/NEWinogradLayer.cpp | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'src/runtime') diff --git a/src/runtime/NEON/functions/NEWinogradLayer.cpp b/src/runtime/NEON/functions/NEWinogradLayer.cpp index d2d40dfcb0..215f1bfddf 100644 --- a/src/runtime/NEON/functions/NEWinogradLayer.cpp +++ b/src/runtime/NEON/functions/NEWinogradLayer.cpp @@ -109,34 +109,14 @@ void NEWinogradLayer::configure(const ITensor *input, const ITensor *weights, co _output->info()->dimension(1), _output->info()->dimension(3)), 1, _output->info()->data_type()); _output_nhwc.allocator()->init(info); - _output_nhwc.allocator()->allocate(); // Re-order a weight tensor from [Output feature map x Input feature map x Height x Width] to [Height x Width x Input feature map x Output feature map] - switch(weights->info()->num_dimensions()) - { - case 3: - { - _permute_weights.configure(weights, &_weights_hwio, PermutationVector(2U, 0U, 1U)); - break; - } - case 4: - { - _permute_weights.configure(weights, &_weights_hwio, PermutationVector(3U, 2U, 0U, 1U)); - break; - } - default: - { - ARM_COMPUTE_ERROR("Not supported."); - break; - } - } - + _permute_weights.configure(weights, &_weights_hwio, PermutationVector(3U, 2U, 0U, 1U)); _weights_hwio.allocator()->allocate(); // configure the kernel to transform the input tensor from NCHW -> NHWC _permute_input.configure(input, &_input_nhwc, PermutationVector(2U, 0U, 1U)); - _input_nhwc.allocator()->allocate(); using T = winograd::WinogradGEMM<2, 2, 3, 3>::Convolution; -- cgit v1.2.1