commit d218d9804723e78da9bbd36e6211b3310426852b
author Finn Williams <Finn.Williams@arm.com> Mon Aug 09 13:00:08 2021 +0100
committer Matthew Sloyan <matthew.sloyan@arm.com> Tue Aug 10 10:30:28 2021 +0000
tree 38d4fc63d6a3ed376a094d8b4867e8c15f7d73ad
parent b20d1d4888c270d4d57a0bdcc011ded89a2f5b38

IVGCVSW-6289 Separate tensor shape inference and validation calls

 * Pass m_shapeInferenceMethod to OptimizerOptions in ExecuteNetwork

Signed-off-by: Finn Williams <Finn.Williams@arm.com>
Change-Id: I90280fb7629092d3b66e8a3968ca9e35a0df854a

src/armnn/Network.cpp

diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp
index 365f1bd..42d7ae3 100644
--- a/src/armnn/Network.cpp
+++ b/src/armnn/Network.cpp
@@ -1594,13 +1594,22 @@
     // Get the optimized graph
     Graph& optGraph = optNetObjPtr->pOptimizedNetworkImpl->GetGraph();
 
-    // Infer the tensor infos for all output slots. Throws an exception on failure
-    optGraph.InferTensorInfos();
+    if(options.m_shapeInferenceMethod == ShapeInferenceMethod::InferAndValidate)
+    {
+        // Infer the tensor infos for all output slots. Throws an exception on failure
+        optGraph.InferTensorInfos();
+    }
 
     // Perform AddBroadcastReshapeLayer optimisation
     using namespace optimizations;
     Optimizer::Pass(optGraph, MakeOptimizations(AddBroadcastReshapeLayer()));
 
+    if(options.m_shapeInferenceMethod == ShapeInferenceMethod::ValidateOnly)
+    {
+        // Validate the tensor infos for all output slots. Throws an exception on failure
+        optGraph.InferTensorInfos();
+    }
+
     // Perform optimisation passes
     Optimizer::Pass(optGraph, MakeOptimizations(SquashEqualPermuteSiblings(),
                                                 SquashEqualTransposeSiblings(),

tests/InferenceModel.hpp

diff --git a/tests/InferenceModel.hpp b/tests/InferenceModel.hpp
index 3107593..4d2b167 100644
--- a/tests/InferenceModel.hpp
+++ b/tests/InferenceModel.hpp
@@ -440,6 +440,9 @@
             options.m_ReduceFp32ToBf16 = params.m_EnableBf16TurboMode;
             options.m_Debug = params.m_PrintIntermediateLayers;
 
+            options.m_shapeInferenceMethod = params.m_InferOutputShape ?
+                    armnn::ShapeInferenceMethod::InferAndValidate : armnn::ShapeInferenceMethod::ValidateOnly;
+
             armnn::BackendOptions gpuAcc("GpuAcc",
             {
                 { "FastMathEnabled", params.m_EnableFastMath },