diff options
| author | Viet-Hoa Do <viet-hoa.do@arm.com> | 2022-10-18 15:23:46 +0100 |
|---|---|---|
| committer | Viet-Hoa Do <viet-hoa.do@arm.com> | 2022-10-19 09:13:12 +0000 |
| commit | 0a36f58e711a19040b1b65ef0afa83cce0c9dc4c (patch) | |
| tree | 4e9a55157bf2bf2d359a707e70b074a3a30e0204 /src/cpu/kernels/CpuActivationKernel.cpp | |
| parent | 299d3a1f51b68857a0742bf68cc2567dbdfaefe2 (diff) | |
| download | ComputeLibrary-0a36f58e711a19040b1b65ef0afa83cce0c9dc4c.tar.gz | |
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 <viet-hoa.do@arm.com>
Change-Id: I557f9bb84e5e456c28d6b423584887d7a3648ad4
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/8470
Benchmark: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Mohmun02 <MohammedSuhail.Munshi@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/cpu/kernels/CpuActivationKernel.cpp')
| -rw-r--r-- | src/cpu/kernels/CpuActivationKernel.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
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) |