From 16f82f987b44b090a01807a2c79ed7fcc6bf80ea Mon Sep 17 00:00:00 2001
From: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Date: Mon, 14 Sep 2020 16:12:44 +0100
Subject: IVGCVSW-5305 AddBroadcastReshapeLayer as optimizer

 * Remove AddBroadcastReshapeLayer from TfLiteParser
 * Add AddBroadcastReshapeLayer as optimizer
 * AddBroadcastReshapeLayer optimizer unit tests
 * Load-scope dynamic tensor broadcasting unit tests

Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Change-Id: I3549e85b71b41cbd4d96c0f1ece7887acbca76d1
---
 src/armnn/Network.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/armnn/Network.cpp')

diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp
index 17813a8983..cd5f369271 100644
--- a/src/armnn/Network.cpp
+++ b/src/armnn/Network.cpp
@@ -1038,11 +1038,14 @@ IOptimizedNetworkPtr Optimize(const INetwork& inNetwork,
     // Get the optimized graph
     Graph& optGraph = optNetObjPtr->GetGraph();
 
+    // Perform AddBroadcastReshapeLayer optimisation
+    using namespace optimizations;
+    Optimizer::Pass(optGraph, MakeOptimizations(AddBroadcastReshapeLayer()));
+
     // Infer the tensor infos for all output slots. Throws an exception on failure
     optGraph.InferTensorInfos();
 
     // Perform optimisation passes
-    using namespace optimizations;
     Optimizer::Pass(optGraph, MakeOptimizations(SquashEqualPermuteSiblings(),
                                                 SquashEqualTransposeSiblings(),
                                                 SquashEqualReshapeSiblings(),
-- 
cgit v1.2.1