commit 475c7a8796cf0cdf5d22fa9f1962f279914834f6
author Ryan OShea <ryan.oshea3@arm.com> Mon Jan 30 14:24:15 2023 +0000
committer ryan.oshea3 <ryan.oshea3@arm.com> Mon Jan 30 15:46:29 2023 +0000
tree 056053d676320f00f43aee0cc0c8214cba78813f
parent 3ad2e14333fa0ffebe373b05ce582068c4c8f5f0

IVGCVSW-7475 Fix uncaught warnings treated as errors in delegate release build

 * Add initialization of activation type in delegate layers with
   fused activations
 * Remove unused variable activationOutputInfo on layers with
   fused activations

Signed-off-by: Ryan OShea <ryan.oshea3@arm.com>
Change-Id: Ieb2ba00516a159639871c391069faf162cbb666d

delegate/src/Convolution.hpp

diff --git a/delegate/src/Convolution.hpp b/delegate/src/Convolution.hpp
index 7ea3a3a..1718902 100644
--- a/delegate/src/Convolution.hpp
+++ b/delegate/src/Convolution.hpp
@@ -102,12 +102,10 @@
     const armnn::TensorInfo& outputTensorInfo = GetTensorInfoForTfLiteTensor(tfLiteOutputTensor, true);
 
     auto* tfLiteNodeParameters = reinterpret_cast<TfLiteConvParams*>(tfLiteNode->builtin_data);
-    TfLiteFusedActivation activationType;
+    TfLiteFusedActivation activationType=kTfLiteActNone;
     if (tfLiteNodeParameters)
     {
         activationType = tfLiteNodeParameters->activation;
-
-        const armnn::TensorInfo& activationOutputInfo = GetTensorInfoForTfLiteTensor(tfLiteOutputTensor, true);
         TfLiteStatus activationStatus = ValidateFusedActivationOperator(delegateData, tfLiteContext, outputTensorInfo,
                                                                         outputTensorInfo, activationType);
         if(activationStatus != kTfLiteOk)
@@ -279,12 +277,10 @@
     const armnn::TensorInfo& outputTensorInfo = GetTensorInfoForTfLiteTensor(tfLiteOutputTensor, true);
 
     auto* tfLiteNodeParameters = reinterpret_cast<TfLiteConv3DParams*>(tfLiteNode->builtin_data);
-    TfLiteFusedActivation activationType;
+    TfLiteFusedActivation activationType=kTfLiteActNone;
     if (tfLiteNodeParameters)
     {
         activationType = tfLiteNodeParameters->activation;
-
-        const armnn::TensorInfo& activationOutputInfo = GetTensorInfoForTfLiteTensor(tfLiteOutputTensor, true);
         TfLiteStatus activationStatus = ValidateFusedActivationOperator(delegateData, tfLiteContext, outputTensorInfo,
                                                                         outputTensorInfo, activationType);
         if(activationStatus != kTfLiteOk)
@@ -490,12 +486,10 @@
     const armnn::TensorInfo& outputTensorInfo = GetTensorInfoForTfLiteTensor(tfLiteOutputTensor, true);
 
     auto* tfLiteNodeParameters = reinterpret_cast<TfLiteDepthwiseConvParams *>(tfLiteNode->builtin_data);
-    TfLiteFusedActivation activationType;
+    TfLiteFusedActivation activationType = kTfLiteActNone;
     if (tfLiteNodeParameters)
     {
         activationType = tfLiteNodeParameters->activation;
-
-        const armnn::TensorInfo& activationOutputInfo = GetTensorInfoForTfLiteTensor(tfLiteOutputTensor, true);
         TfLiteStatus activationStatus = ValidateFusedActivationOperator(delegateData, tfLiteContext, outputTensorInfo,
                                                                         outputTensorInfo, activationType);
         if(activationStatus != kTfLiteOk)