From 0a36f58e711a19040b1b65ef0afa83cce0c9dc4c Mon Sep 17 00:00:00 2001 From: Viet-Hoa Do Date: Tue, 18 Oct 2022 15:23:46 +0100 Subject: Fix FFTConvolutionLayer test * Do not change the tensor info after configure stage. * By fixing this, the 1D optimization for activation layer can be applied to all data types and tensor layout. Resolves: COMPMID-5644 Signed-off-by: Viet-Hoa Do Change-Id: I557f9bb84e5e456c28d6b423584887d7a3648ad4 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/8470 Benchmark: Arm Jenkins Tested-by: Arm Jenkins Reviewed-by: Mohmun02 Comments-Addressed: Arm Jenkins --- src/cpu/kernels/CpuActivationKernel.cpp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'src/cpu') diff --git a/src/cpu/kernels/CpuActivationKernel.cpp b/src/cpu/kernels/CpuActivationKernel.cpp index f1e485883c..e8ece26f17 100644 --- a/src/cpu/kernels/CpuActivationKernel.cpp +++ b/src/cpu/kernels/CpuActivationKernel.cpp @@ -208,18 +208,9 @@ void CpuActivationKernel::configure(const ITensorInfo *src, ITensorInfo *dst, Ac Window win; - if(src->data_layout() != DataLayout::NHWC) - { - // Use squashed window - std::tie(win, _split_dimension) = calculate_squashed_or_max_window(*src); - ICPPKernel::configure(win); - } - else - { - // Configure kernel window - win = calculate_max_window(*src, Steps()); - ICPPKernel::configure(win); - } + // Use squashed window + std::tie(win, _split_dimension) = calculate_squashed_or_max_window(*src); + ICPPKernel::configure(win); } Status CpuActivationKernel::validate(const ITensorInfo *src, const ITensorInfo *dst, const ActivationLayerInfo &act_info) -- cgit v1.2.1