diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2022-05-06 12:14:16 +0100 |
|---|---|---|
| committer | mike.kelly <mike.kelly@arm.com> | 2022-05-06 19:26:17 +0000 |
| commit | 84d63785eb2dceba297a685ebd98f1d29be47326 (patch) | |
| tree | efc28e6c28df26bdf946de7923c4b2b554913e1d /delegate/src/FullyConnected.hpp | |
| parent | 727c2b577fb2df7d433866792f1561af4ce43505 (diff) | |
| download | armnn-84d63785eb2dceba297a685ebd98f1d29be47326.tar.gz | |
IVGCVSW-6929 Fix for segfault in tflite delegate
* It's possible that a model may have an input entry for bias tensors
but that the index for those is -1. If it's -1 then it's not present.
* Fixed logic error in IsOptionalOperandPresent: it returned false if
it was present and true if it was missing.
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I45ad8d8552122493c529b1a35a5689416ccfbb71
Diffstat (limited to 'delegate/src/FullyConnected.hpp')
| -rw-r--r-- | delegate/src/FullyConnected.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/delegate/src/FullyConnected.hpp b/delegate/src/FullyConnected.hpp index 18db550e5c..e8c13f2053 100644 --- a/delegate/src/FullyConnected.hpp +++ b/delegate/src/FullyConnected.hpp @@ -31,7 +31,7 @@ TfLiteStatus VisitFullyConnectedOperator(DelegateData& delegateData, return kTfLiteError; } TF_LITE_ENSURE_STATUS(ValidateNumOutputs(tfLiteContext, tfLiteNode, 1, nodeIndex)); - bool biasEnabled = (numInputs == 3); + bool biasEnabled = IsOptionalOperandPresent(tfLiteNode, 2); const TfLiteTensor* tfLiteTensors = tfLiteContext->tensors; const TfLiteTensor& tfLiteInputTensor = tfLiteTensors[tfLiteNode->inputs->data[0]]; @@ -52,9 +52,9 @@ TfLiteStatus VisitFullyConnectedOperator(DelegateData& delegateData, return kTfLiteError; } - const armnn::TensorInfo& inputTensorInfo = GetTensorInfoForTfLiteTensor(tfLiteInputTensor); - armnn::TensorInfo weightsTensorInfo = GetTensorInfoForTfLiteTensor(tfLiteWeightsTensor); - const armnn::TensorInfo& outputTensorInfo = GetTensorInfoForTfLiteTensor(tfLiteOutputTensor); + const armnn::TensorInfo& inputTensorInfo = GetTensorInfoForTfLiteTensor(tfLiteInputTensor); + armnn::TensorInfo weightsTensorInfo = GetTensorInfoForTfLiteTensor(tfLiteWeightsTensor); + const armnn::TensorInfo& outputTensorInfo = GetTensorInfoForTfLiteTensor(tfLiteOutputTensor); // Fully Connected Layer accepts two dimensional weights input int32_t weightsDimension = static_cast<int32_t>(weightsTensorInfo.GetNumDimensions()); |