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/FullyConnectedLayer.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/FullyConnectedLayer.cpp')
| -rw-r--r-- | src/armnn/layers/FullyConnectedLayer.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/armnn/layers/FullyConnectedLayer.cpp b/src/armnn/layers/FullyConnectedLayer.cpp index 174459b565..f10beda72b 100644 --- a/src/armnn/layers/FullyConnectedLayer.cpp +++ b/src/armnn/layers/FullyConnectedLayer.cpp @@ -61,13 +61,11 @@ std::vector<TensorShape> FullyConnectedLayer::InferOutputShapes(const std::vecto return std::vector<TensorShape>({ TensorShape({batches, weightShape[dimIdx]})}); } -void FullyConnectedLayer::ValidateTensorShapesFromInputs(ShapeInferenceMethod shapeInferenceMethod) +void FullyConnectedLayer::ValidateTensorShapesFromInputs() { - IgnoreUnused(shapeInferenceMethod); - const TensorShape& outputShape = GetOutputSlot(0).GetTensorInfo().GetShape(); - VerifyShapeInferenceType(outputShape, shapeInferenceMethod); + VerifyShapeInferenceType(outputShape, m_ShapeInferenceMethod); // check if we m_Weight data is not nullptr ARMNN_ASSERT_MSG(m_Weight != nullptr, "FullyConnectedLayer: Weights data should not be null."); @@ -78,7 +76,7 @@ void FullyConnectedLayer::ValidateTensorShapesFromInputs(ShapeInferenceMethod sh ARMNN_ASSERT(inferredShapes.size() == 1); ARMNN_ASSERT(inferredShapes[0].GetDimensionality() == Dimensionality::Specified); - ValidateAndCopyShape(outputShape, inferredShapes[0], shapeInferenceMethod, "FullyConnectedLayer"); + ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "FullyConnectedLayer"); } Layer::ConstantTensors FullyConnectedLayer::GetConstantTensorsByRef() |