diff options
author | Finn Williams <Finn.Williams@arm.com> | 2020-07-03 10:12:03 +0100 |
---|---|---|
committer | Jim Flynn <jim.flynn@arm.com> | 2020-07-26 15:42:26 +0000 |
commit | f24effa4995ea4c3dd91e33d4a2787e02decf8b4 (patch) | |
tree | 56e0f22cab0fd8544693b9240bd8d74426eaa454 /src/armnn/layers/DetectionPostProcessLayer.cpp | |
parent | 8398edcfb933b638ddf4b88d84d6e188c49b1e0d (diff) | |
download | armnn-f24effa4995ea4c3dd91e33d4a2787e02decf8b4.tar.gz |
IVGCVSW-5155 Update Arm NN API to allow for call to shape inference
Signed-off-by: Finn Williams <Finn.Williams@arm.com>
Change-Id: I0a2babe5b5b09eb81c9900dc3a05071034a0440b
Diffstat (limited to 'src/armnn/layers/DetectionPostProcessLayer.cpp')
-rw-r--r-- | src/armnn/layers/DetectionPostProcessLayer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/armnn/layers/DetectionPostProcessLayer.cpp b/src/armnn/layers/DetectionPostProcessLayer.cpp index fddf86f573..b18781b1c0 100644 --- a/src/armnn/layers/DetectionPostProcessLayer.cpp +++ b/src/armnn/layers/DetectionPostProcessLayer.cpp @@ -34,13 +34,13 @@ DetectionPostProcessLayer* DetectionPostProcessLayer::Clone(Graph& graph) const return std::move(layer); } -void DetectionPostProcessLayer::ValidateTensorShapesFromInputs(ShapeInferenceMethod shapeInferenceMethod) +void DetectionPostProcessLayer::ValidateTensorShapesFromInputs() { VerifyLayerConnections(2, CHECK_LOCATION()); const TensorShape& outputShape = GetOutputSlot(0).GetTensorInfo().GetShape(); - VerifyShapeInferenceType(outputShape, shapeInferenceMethod); + VerifyShapeInferenceType(outputShape, m_ShapeInferenceMethod); // on this level constant data should not be released. ARMNN_ASSERT_MSG(m_Anchors != nullptr, "DetectionPostProcessLayer: Anchors data should not be null."); @@ -53,21 +53,21 @@ void DetectionPostProcessLayer::ValidateTensorShapesFromInputs(ShapeInferenceMet const TensorShape& inferredDetectionScores = TensorShape({ 1, detectedBoxes }); const TensorShape& inferredNumberDetections = TensorShape({ 1 }); - ValidateAndCopyShape(outputShape, inferredDetectionBoxes, shapeInferenceMethod, "DetectionPostProcessLayer"); + ValidateAndCopyShape(outputShape, inferredDetectionBoxes, m_ShapeInferenceMethod, "DetectionPostProcessLayer"); ValidateAndCopyShape(GetOutputSlot(1).GetTensorInfo().GetShape(), inferredDetectionScores, - shapeInferenceMethod, + m_ShapeInferenceMethod, "DetectionPostProcessLayer", 1); ValidateAndCopyShape(GetOutputSlot(2).GetTensorInfo().GetShape(), inferredDetectionScores, - shapeInferenceMethod, + m_ShapeInferenceMethod, "DetectionPostProcessLayer", 2); ValidateAndCopyShape(GetOutputSlot(3).GetTensorInfo().GetShape(), inferredNumberDetections, - shapeInferenceMethod, + m_ShapeInferenceMethod, "DetectionPostProcessLayer", 3); } |