From 607339f8a83e5547049ffe79abfc88a9868c527c Mon Sep 17 00:00:00 2001 From: Gian Marco Iodice Date: Thu, 1 Aug 2019 15:53:23 +0100 Subject: COMPMID-2527: Remove activation function validation in CLWinogradConvolutionLayer Change-Id: I38c70b9e10e43d319a81ce9dbade771153e2446f Signed-off-by: Gian Marco Iodice Reviewed-on: https://review.mlplatform.org/c/1672 Reviewed-by: Michele Di Giorgio Reviewed-by: Georgios Pinitas Tested-by: Arm Jenkins --- arm_compute/runtime/CL/functions/CLWinogradConvolutionLayer.h | 1 - src/runtime/CL/functions/CLWinogradConvolutionLayer.cpp | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/arm_compute/runtime/CL/functions/CLWinogradConvolutionLayer.h b/arm_compute/runtime/CL/functions/CLWinogradConvolutionLayer.h index 4ae75a5ace..e2ce9d7ec2 100644 --- a/arm_compute/runtime/CL/functions/CLWinogradConvolutionLayer.h +++ b/arm_compute/runtime/CL/functions/CLWinogradConvolutionLayer.h @@ -27,7 +27,6 @@ #include "arm_compute/core/CL/kernels/CLWinogradFilterTransformKernel.h" #include "arm_compute/core/CL/kernels/CLWinogradOutputTransformKernel.h" #include "arm_compute/core/Types.h" -#include "arm_compute/runtime/CL/functions/CLActivationLayer.h" #include "arm_compute/runtime/CL/functions/CLGEMM.h" #include "arm_compute/runtime/CL/functions/CLWinogradInputTransform.h" #include "arm_compute/runtime/IFunction.h" diff --git a/src/runtime/CL/functions/CLWinogradConvolutionLayer.cpp b/src/runtime/CL/functions/CLWinogradConvolutionLayer.cpp index d3c3f9803e..3b44c22a27 100644 --- a/src/runtime/CL/functions/CLWinogradConvolutionLayer.cpp +++ b/src/runtime/CL/functions/CLWinogradConvolutionLayer.cpp @@ -189,13 +189,7 @@ Status CLWinogradConvolutionLayer::validate(const ITensorInfo *input, const ITen GEMMLowpOutputStageInfo(), (input->data_type() == DataType::F16)))); // Configure output transform - ARM_COMPUTE_RETURN_ON_ERROR(CLWinogradOutputTransformKernel::validate(&batched_mm_output, biases, output, winograd_info)); - - // Validate Activation Layer - if(act_info.enabled()) - { - ARM_COMPUTE_RETURN_ON_ERROR(CLActivationLayer::validate(output, nullptr, act_info)); - } + ARM_COMPUTE_RETURN_ON_ERROR(CLWinogradOutputTransformKernel::validate(&batched_mm_output, biases, output, winograd_info, act_info)); return Status{}; } -- cgit v1.2.1