commit 16f82f987b44b090a01807a2c79ed7fcc6bf80ea
author Narumol Prangnawarat <narumol.prangnawarat@arm.com> Mon Sep 14 16:12:44 2020 +0100
committer Narumol Prangnawarat <narumol.prangnawarat@arm.com> Tue Sep 15 10:19:00 2020 +0100
tree 5e26fccece92956c19e14d0d5c106e5d38ea4576
parent 919c14ef132986aa1514b2070ce6d19b5579a6ab

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

diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp
index 17813a8..cd5f369 100644
--- a/src/armnn/Network.cpp
+++ b/src/armnn/Network.cpp
@@ -1038,11 +1038,14 @@
     // 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(),