aboutsummaryrefslogtreecommitdiff
path: root/delegate/src/Convolution.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'delegate/src/Convolution.hpp')
-rw-r--r--delegate/src/Convolution.hpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/delegate/src/Convolution.hpp b/delegate/src/Convolution.hpp
index 7ea3a3a987..17189027dc 100644
--- a/delegate/src/Convolution.hpp
+++ b/delegate/src/Convolution.hpp
@@ -102,12 +102,10 @@ TfLiteStatus VisitConv2dOperator(DelegateData& delegateData,
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 @@ TfLiteStatus VisitConv3dOperator(DelegateData& delegateData,
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 @@ TfLiteStatus VisitDepthwiseConv2dOperator(DelegateData& delegateData,
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)