IVGCVSW-7365 Fix behaviour of --import-inputs-if-aligned in ExecuteNetwork

Move call to 'SetupInputAndOutputs' to after LoadedNetwork is available.

Change-Id: I101e297d1d7b2517011d4ef3f1a4927566845474
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
diff --git a/tests/ExecuteNetwork/ArmNNExecutor.cpp b/tests/ExecuteNetwork/ArmNNExecutor.cpp
index 943d3aa..9657f05 100644
--- a/tests/ExecuteNetwork/ArmNNExecutor.cpp
+++ b/tests/ExecuteNetwork/ArmNNExecutor.cpp
@@ -26,7 +26,6 @@
     auto optNet = OptimizeNetwork(network.get());
 
     m_IOInfo = GetIOInfo(optNet.get());
-    SetupInputsAndOutputs();
 
     armnn::ProfilingDetailsMethod profilingDetailsMethod = ProfilingDetailsMethod::Undefined;
     if (params.m_OutputDetailsOnlyToStdOut)
@@ -57,6 +56,8 @@
         return;
     }
 
+    SetupInputsAndOutputs();
+
     if (m_Params.m_Iterations > 1)
     {
         std::stringstream msg;
@@ -415,11 +416,12 @@
                 }
             }
 
-            if (m_Params.m_ImportInputsIfAligned)
-            {
-                m_ImportedInputIds.push_back(
-                    m_Runtime->ImportInputs(m_NetworkId, m_InputTensorsVec.back(), armnn::MemorySource::Malloc));
-            }
+        }
+
+        if (m_Params.m_ImportInputsIfAligned)
+        {
+            m_ImportedInputIds.push_back(
+                m_Runtime->ImportInputs(m_NetworkId, inputTensors, armnn::MemorySource::Malloc));
         }
         m_InputTensorsVec.emplace_back(inputTensors);
     }