commit 861985ff2964720a0165e109c3fc568cb245bbe9
author Nina Drozd <nina.drozd@arm.com> Thu Apr 18 14:48:51 2019 +0100
committer Nina Drozd <nina.drozd@arm.com> Fri Apr 19 16:49:43 2019 +0100
tree f5829f273076dec3fb1d67b071fe1baf0bb73fbe
parent 17660e68c91d48bfb3fc3c9540a1834f33e9e561

IVGCVSW-2925: Combine Pad with Convolution2d in the Optimizer

* Added new optimization for folding pad layer into convolution2d layer following it
* Added new test in OptimizerTests.cpp
* Added new optimization into All optimizations
* Added call to new optimization in Optimize in Network.cpp
* Updated CMakeLists.txt

Signed-off-by: Nina Drozd <nina.drozd@arm.com>
Change-Id: I682e07c71bbd42c49c02dda30a848a9ab2b16e7e

src/armnn/Network.cpp

diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp
index c1462c0..0bd8d4b 100644
--- a/src/armnn/Network.cpp
+++ b/src/armnn/Network.cpp
@@ -436,7 +436,8 @@
                                                 OptimizeInversePermutes(),
                                                 MovePermuteUp(),
                                                 PermuteAsReshape(),
-                                                OptimizeConsecutiveReshapes()));
+                                                OptimizeConsecutiveReshapes(),
+                                                FoldPadIntoConvolution2d()));
 
     // Infer the tensor infos for all output slots. Throws an exception on failure
     optGraph.InferTensorInfos();