diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-02-20 17:09:28 +0000 |
---|---|---|
committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-02-26 13:35:36 +0000 |
commit | 0b192e84510c006d87cee3c29f95511ad088b704 (patch) | |
tree | 80abef10e2afde5dcab6715b207ebca4d7dc0755 /src/runtime | |
parent | 582163206bbfb03b3af0009d6ec2d9bab747780d (diff) | |
download | ComputeLibrary-0b192e84510c006d87cee3c29f95511ad088b704.tar.gz |
COMPMID-3067: Address gcc9 failures
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: I048d1d7dda7edf587d37ce83a93b557d8a95754a
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/2771
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/runtime')
-rw-r--r-- | src/runtime/CL/functions/CLFFT2D.cpp | 10 | ||||
-rw-r--r-- | src/runtime/NEON/functions/NEFFT2D.cpp | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/runtime/CL/functions/CLFFT2D.cpp b/src/runtime/CL/functions/CLFFT2D.cpp index 165e784786..f5776cbd88 100644 --- a/src/runtime/CL/functions/CLFFT2D.cpp +++ b/src/runtime/CL/functions/CLFFT2D.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -41,14 +41,14 @@ void CLFFT2D::configure(const ICLTensor *input, ICLTensor *output, const FFT2DIn // Setup first pass FFT1DInfo first_pass_config; - first_pass_config.axis = config.axes.first; + first_pass_config.axis = config.axis0; first_pass_config.direction = config.direction; _memory_group.manage(&_first_pass_tensor); _first_pass_func.configure(input, &_first_pass_tensor, first_pass_config); // Setup second pass FFT1DInfo second_pass_config; - second_pass_config.axis = config.axes.second; + second_pass_config.axis = config.axis1; second_pass_config.direction = config.direction; _second_pass_func.configure(&_first_pass_tensor, output, second_pass_config); _first_pass_tensor.allocator()->allocate(); @@ -63,13 +63,13 @@ Status CLFFT2D::validate(const ITensorInfo *input, const ITensorInfo *output, co // Validate first pass FFT1DInfo first_pass_config; - first_pass_config.axis = config.axes.first; + first_pass_config.axis = config.axis0; first_pass_config.direction = config.direction; ARM_COMPUTE_RETURN_ON_ERROR(CLFFT1D::validate(input, &first_pass_tensor, first_pass_config)); // Validate second pass FFT1DInfo second_pass_config; - second_pass_config.axis = config.axes.second; + second_pass_config.axis = config.axis1; second_pass_config.direction = config.direction; ARM_COMPUTE_RETURN_ON_ERROR(CLFFT1D::validate(&first_pass_tensor, output, second_pass_config)); diff --git a/src/runtime/NEON/functions/NEFFT2D.cpp b/src/runtime/NEON/functions/NEFFT2D.cpp index 9210ecfa2e..2fea017781 100644 --- a/src/runtime/NEON/functions/NEFFT2D.cpp +++ b/src/runtime/NEON/functions/NEFFT2D.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -41,14 +41,14 @@ void NEFFT2D::configure(const ITensor *input, ITensor *output, const FFT2DInfo & // Setup first pass FFT1DInfo first_pass_config; - first_pass_config.axis = config.axes.first; + first_pass_config.axis = config.axis0; first_pass_config.direction = config.direction; _memory_group.manage(&_first_pass_tensor); _first_pass_func.configure(input, &_first_pass_tensor, first_pass_config); // Setup second pass FFT1DInfo second_pass_config; - second_pass_config.axis = config.axes.second; + second_pass_config.axis = config.axis1; second_pass_config.direction = config.direction; _second_pass_func.configure(&_first_pass_tensor, output, second_pass_config); _first_pass_tensor.allocator()->allocate(); @@ -63,13 +63,13 @@ Status NEFFT2D::validate(const ITensorInfo *input, const ITensorInfo *output, co // Validate first pass FFT1DInfo first_pass_config; - first_pass_config.axis = config.axes.first; + first_pass_config.axis = config.axis0; first_pass_config.direction = config.direction; ARM_COMPUTE_RETURN_ON_ERROR(NEFFT1D::validate(input, &first_pass_tensor, first_pass_config)); // Validate second pass FFT1DInfo second_pass_config; - second_pass_config.axis = config.axes.second; + second_pass_config.axis = config.axis1; second_pass_config.direction = config.direction; ARM_COMPUTE_RETURN_ON_ERROR(NEFFT1D::validate(&first_pass_tensor, output, second_pass_config)); |