From 1ac690a12d4952acb8c06b41f0492ed47524b1f1 Mon Sep 17 00:00:00 2001
From: Mike Kelly <mike.kelly@arm.com>
Date: Tue, 17 Nov 2020 11:41:38 +0000
Subject: MLCE-278-IVGCVSW-5530 FusedActivation issues

 * GetOverriddenDataType was returning incorrect quantization data
 * Optimized CpuAcc and GpuAcc SubGraphs fail validation on debug versions
   of ArmNN

Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: Ie97935cc2af67bd9aeebc94b63dafa458bd1aa8c
---
 src/backends/aclCommon/ArmComputeSubgraphUtils.hpp | 37 +++++-----------------
 1 file changed, 8 insertions(+), 29 deletions(-)

(limited to 'src/backends/aclCommon/ArmComputeSubgraphUtils.hpp')

diff --git a/src/backends/aclCommon/ArmComputeSubgraphUtils.hpp b/src/backends/aclCommon/ArmComputeSubgraphUtils.hpp
index d969d5bc31..860d88df80 100644
--- a/src/backends/aclCommon/ArmComputeSubgraphUtils.hpp
+++ b/src/backends/aclCommon/ArmComputeSubgraphUtils.hpp
@@ -47,38 +47,17 @@ SubgraphView::OutputSlots CreateOutputsFrom(const std::vector<Layer*>& layers)
 
 } // namespace
 
-inline const TensorInfo GetOverriddenDataType(const TensorInfo& info, Optional<DataType> type)
+inline void ReportUntouchedLayers(OptimizationViews& optimizationViews, std::map<LayerGuid, Layer*> untouched)
 {
-    if (!type)
+    std::vector<Layer*> untouchedVector;
+    for (const auto& pair : untouched)
     {
-        return info;
+        Layer* layer = pair.second;
+        SubgraphView subgraphView(CreateInputsFrom({layer}),
+                                  CreateOutputsFrom({layer}),
+                                  {layer});
+        optimizationViews.AddUntouchedSubgraph(std::move(subgraphView));
     }
-
-    return TensorInfo(info.GetShape(), type.value(), info.GetQuantizationScale(), info.GetQuantizationOffset());
-}
-
-inline armnn::Optional<armnn::DataType> GetOptionalBiasTypeFromWeightsType(armnn::Optional<armnn::DataType> weightsType)
-{
-    if (!weightsType)
-    {
-        return weightsType;
-    }
-
-    switch(weightsType.value())
-    {
-        case armnn::DataType::BFloat16:
-        case armnn::DataType::Float16:
-        case armnn::DataType::Float32:
-            return weightsType;
-        case armnn::DataType::QAsymmS8:
-        case armnn::DataType::QAsymmU8:
-        case armnn::DataType::QSymmS8:
-        case armnn::DataType::QSymmS16:
-            return armnn::DataType::Signed32;
-        default:
-            ARMNN_ASSERT_MSG(false, "GetBiasTypeFromWeightsType(): Unsupported data type.");
-    }
-    return armnn::EmptyOptional();
 }
 
 template<typename LayerType>
-- 
cgit v1.2.1