From 4c268b97dff93eae3f71f2a6971f0d3f748b7b38 Mon Sep 17 00:00:00 2001 From: Michele Di Giorgio Date: Fri, 20 Sep 2019 14:01:48 +0100 Subject: COMPMID-2681: Use NE/CL/Pad in NE/CL/GenerateProposalsLayer Change-Id: Idf1c64224b0ddd4bdac1120cac4437eb2578bb2b Signed-off-by: Michele Di Giorgio Reviewed-on: https://review.mlplatform.org/c/1963 Comments-Addressed: Arm Jenkins Reviewed-by: Pablo Marquez Tested-by: Arm Jenkins --- arm_compute/runtime/CL/functions/CLGenerateProposalsLayer.h | 9 +++------ arm_compute/runtime/NEON/functions/NEGenerateProposalsLayer.h | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) (limited to 'arm_compute') diff --git a/arm_compute/runtime/CL/functions/CLGenerateProposalsLayer.h b/arm_compute/runtime/CL/functions/CLGenerateProposalsLayer.h index efbbe44c1b..8546261fef 100644 --- a/arm_compute/runtime/CL/functions/CLGenerateProposalsLayer.h +++ b/arm_compute/runtime/CL/functions/CLGenerateProposalsLayer.h @@ -24,9 +24,8 @@ #ifndef __ARM_COMPUTE_CLGENERATEPROPOSALSLAYER_H__ #define __ARM_COMPUTE_CLGENERATEPROPOSALSLAYER_H__ #include "arm_compute/core/CL/kernels/CLBoundingBoxTransformKernel.h" -#include "arm_compute/core/CL/kernels/CLCopyKernel.h" #include "arm_compute/core/CL/kernels/CLGenerateProposalsLayerKernel.h" -#include "arm_compute/core/CL/kernels/CLMemsetKernel.h" +#include "arm_compute/core/CL/kernels/CLPadLayerKernel.h" #include "arm_compute/core/CL/kernels/CLPermuteKernel.h" #include "arm_compute/core/CL/kernels/CLReshapeLayerKernel.h" #include "arm_compute/core/CL/kernels/CLStridedSliceKernel.h" @@ -50,8 +49,7 @@ class ICLTensor; * -# @ref CLReshapeLayer x 2 * -# @ref CLStridedSlice x 3 * -# @ref CLBoundingBoxTransform - * -# @ref CLCopyKernel - * -# @ref CLMemsetKernel + * -# @ref CLPadLayerKernel * And the following CPP kernels: * -# @ref CPPBoxWithNonMaximaSuppressionLimit */ @@ -118,8 +116,7 @@ private: CLReshapeLayerKernel _flatten_scores_kernel; CLComputeAllAnchorsKernel _compute_anchors_kernel; CLBoundingBoxTransformKernel _bounding_box_kernel; - CLMemsetKernel _memset_kernel; - CLCopyKernel _padded_copy_kernel; + CLPadLayerKernel _pad_kernel; // CPP kernels CPPBoxWithNonMaximaSuppressionLimitKernel _cpp_nms_kernel; diff --git a/arm_compute/runtime/NEON/functions/NEGenerateProposalsLayer.h b/arm_compute/runtime/NEON/functions/NEGenerateProposalsLayer.h index 0e6601e4f9..c6d3628e37 100644 --- a/arm_compute/runtime/NEON/functions/NEGenerateProposalsLayer.h +++ b/arm_compute/runtime/NEON/functions/NEGenerateProposalsLayer.h @@ -25,9 +25,8 @@ #define __ARM_COMPUTE_NEGENERATEPROPOSALSLAYER_H__ #include "arm_compute/core/CPP/kernels/CPPBoxWithNonMaximaSuppressionLimitKernel.h" #include "arm_compute/core/NEON/kernels/NEBoundingBoxTransformKernel.h" -#include "arm_compute/core/NEON/kernels/NECopyKernel.h" #include "arm_compute/core/NEON/kernels/NEGenerateProposalsLayerKernel.h" -#include "arm_compute/core/NEON/kernels/NEMemsetKernel.h" +#include "arm_compute/core/NEON/kernels/NEPadLayerKernel.h" #include "arm_compute/core/NEON/kernels/NEPermuteKernel.h" #include "arm_compute/core/NEON/kernels/NEReshapeLayerKernel.h" #include "arm_compute/core/NEON/kernels/NEStridedSliceKernel.h" @@ -49,8 +48,7 @@ class ITensor; * -# @ref NEReshapeLayer x 2 * -# @ref NEStridedSlice x 3 * -# @ref NEBoundingBoxTransform - * -# @ref NECopyKernel - * -# @ref NEMemsetKernel + * -# @ref NEPadLayerKernel * And the following CPP kernels: * -# @ref CPPBoxWithNonMaximaSuppressionLimit */ @@ -117,8 +115,7 @@ private: NEReshapeLayerKernel _flatten_scores_kernel; NEComputeAllAnchorsKernel _compute_anchors_kernel; NEBoundingBoxTransformKernel _bounding_box_kernel; - NEMemsetKernel _memset_kernel; - NECopyKernel _padded_copy_kernel; + NEPadLayerKernel _pad_kernel; // CPP kernels CPPBoxWithNonMaximaSuppressionLimitKernel _cpp_nms_kernel; -- cgit v1.2.1