diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-12-03 20:11:53 +0000 |
|---|---|---|
| committer | Michele Di Giorgio <michele.digiorgio@arm.com> | 2020-12-08 11:21:34 +0000 |
| commit | 8c3c0e7b117723bc98b6acc85565ffa521b10c0d (patch) | |
| tree | ab07a920a90c5a5a3dd492b923b46569545edcae /src/runtime/NEON/functions/NEGenerateProposalsLayer.cpp | |
| parent | deb5b778862b1cf856f21510ef062b2f1f28b172 (diff) | |
| download | ComputeLibrary-8c3c0e7b117723bc98b6acc85565ffa521b10c0d.tar.gz | |
Remove (NE/CL)ComputeAllAnchors function
ComputeAllAnchors is used as part of GenerateProposals and not
standalone thus removes function exposure.
Partially Resolves: COMPMID-3996
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: I729010b48d747ec40d3ce2c7d0e907e8ec5cd55f
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4661
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Diffstat (limited to 'src/runtime/NEON/functions/NEGenerateProposalsLayer.cpp')
| -rw-r--r-- | src/runtime/NEON/functions/NEGenerateProposalsLayer.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/runtime/NEON/functions/NEGenerateProposalsLayer.cpp b/src/runtime/NEON/functions/NEGenerateProposalsLayer.cpp index d9a498e4bd..f3a6a30047 100644 --- a/src/runtime/NEON/functions/NEGenerateProposalsLayer.cpp +++ b/src/runtime/NEON/functions/NEGenerateProposalsLayer.cpp @@ -27,6 +27,7 @@ #include "arm_compute/runtime/NEON/NEScheduler.h" #include "src/core/NEON/kernels/NECopyKernel.h" #include "src/core/NEON/kernels/NEFillBorderKernel.h" +#include "src/core/NEON/kernels/NEGenerateProposalsLayerKernel.h" #include "src/core/NEON/kernels/NEPadLayerKernel.h" #include "src/core/helpers/AutoConfiguration.h" @@ -38,7 +39,7 @@ NEGenerateProposalsLayer::NEGenerateProposalsLayer(std::shared_ptr<IMemoryManage _flatten_deltas(), _permute_scores(), _flatten_scores(), - _compute_anchors(), + _compute_anchors(nullptr), _bounding_box(), _pad(), _dequantize_anchors(), @@ -90,7 +91,8 @@ void NEGenerateProposalsLayer::configure(const ITensor *scores, const ITensor *d // Compute all the anchors _memory_group.manage(&_all_anchors); - _compute_anchors.configure(anchors, &_all_anchors, ComputeAnchorsInfo(feat_width, feat_height, info.spatial_scale())); + _compute_anchors = std::make_unique<NEComputeAllAnchorsKernel>(); + _compute_anchors->configure(anchors, &_all_anchors, ComputeAnchorsInfo(feat_width, feat_height, info.spatial_scale())); const TensorShape flatten_shape_deltas(values_per_roi, total_num_anchors); _deltas_flattened.allocator()->init(TensorInfo(flatten_shape_deltas, 1, scores_data_type, deltas->info()->quantization_info())); @@ -234,7 +236,7 @@ Status NEGenerateProposalsLayer::validate(const ITensorInfo *scores, const ITens } TensorInfo all_anchors_info(anchors->clone()->set_tensor_shape(TensorShape(values_per_roi, total_num_anchors)).set_is_resizable(true)); - ARM_COMPUTE_RETURN_ON_ERROR(NEComputeAllAnchors::validate(anchors, &all_anchors_info, ComputeAnchorsInfo(feat_width, feat_height, info.spatial_scale()))); + ARM_COMPUTE_RETURN_ON_ERROR(NEComputeAllAnchorsKernel::validate(anchors, &all_anchors_info, ComputeAnchorsInfo(feat_width, feat_height, info.spatial_scale()))); TensorInfo deltas_permuted_info = deltas->clone()->set_tensor_shape(TensorShape(values_per_roi * num_anchors, feat_width, feat_height)).set_is_resizable(true); TensorInfo scores_permuted_info = scores->clone()->set_tensor_shape(TensorShape(num_anchors, feat_width, feat_height)).set_is_resizable(true); @@ -324,7 +326,7 @@ void NEGenerateProposalsLayer::run() MemoryGroupResourceScope scope_mg(_memory_group); // Compute all the anchors - _compute_anchors.run(); + NEScheduler::get().schedule(_compute_anchors.get(), Window::DimY); // Transpose and reshape the inputs if(!_is_nhwc) |