commit a0f8b15d4ddb5075f380003ff31b271d389d3b66
author James Conroy <james.conroy@arm.com> Tue Jun 21 11:31:47 2022 +0000
committer James Conroy <james.conroy@arm.com> Tue Jun 21 11:31:47 2022 +0000
tree 5a4f351ee688bd760449c82c455b0e324b11f88d
parent 03bf98a8bc51ad20eef4b9ca5fbf6ce15e063721

Revert "IVGCVSW-6873 Import inputs but don't export outputs fails."

This reverts commit 03bf98a8bc51ad20eef4b9ca5fbf6ce15e063721.

Reason for revert: Caused failures in tests located in internal repo.

Change-Id: If35cb0ede349b270e4e7827324382e09455d8cfa

src/armnn/Network.cpp

diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp
index 9520c13..f2ba94f 100644
--- a/src/armnn/Network.cpp
+++ b/src/armnn/Network.cpp
@@ -1362,7 +1362,7 @@
 ITensorHandleFactory::FactoryId CalculateSlotOption(BackendsMap& backends,
                                                     OutputSlot& outputSlot,
                                                     TensorHandleFactoryRegistry& registry,
-                                                    bool exportEnabled)
+                                                    bool importEnabled)
 {
     // First ensure the from backends can support the TensorHandeAPI
     Layer& layer = outputSlot.GetOwningLayer();
@@ -1390,7 +1390,7 @@
     std::map<ITensorHandleFactory::FactoryId, int> factoryScores;
     for (auto&& pref : srcPrefs)
     {
-        if (exportEnabled)
+        if (importEnabled)
         {
             ITensorHandleFactory* factory = registry.GetFactory(pref);
             if (outputConnection)
@@ -1602,13 +1602,12 @@
                                               BackendsMap& backends,
                                               TensorHandleFactoryRegistry& registry,
                                               bool importEnabled,
-                                              bool exportEnabled,
                                               Optional<std::vector<std::string>&> errMessages)
 {
     ARMNN_SCOPED_PROFILING_EVENT(Compute::Undefined, "Optimizer_SelectTensorHandleStrategy");
     OptimizationResult result;
 
-    optGraph.ForEachLayer([&backends, &registry, &result, &errMessages, importEnabled, exportEnabled](Layer* layer)
+    optGraph.ForEachLayer([&backends, &registry, &result, &errMessages, importEnabled](Layer* layer)
     {
         ARMNN_ASSERT(layer);
 
@@ -1633,7 +1632,7 @@
                     slotOption = CalculateSlotOptionForOutput(backends, outputSlot, registry);
                     break;
                 default:
-                    slotOption = CalculateSlotOption(backends, outputSlot, registry, exportEnabled);
+                    slotOption = CalculateSlotOption(backends, outputSlot, registry, importEnabled);
                     break;
             }
             outputSlot.SetTensorHandleFactory(slotOption);
@@ -1697,15 +1696,7 @@
 
     std::unique_ptr<Graph> graph = std::make_unique<Graph>(inGraph);
 
-    // We need to pass on the information about whether import and export is enabled to the LoadNetwork phase.
-    // The mechanism to do that is to add model options to the optimized network.
-    armnn::BackendOptions importExport("Global",
-                                        {{"ImportEnabled", options.m_ImportEnabled},
-                                         {"ExportEnabled", options.m_ExportEnabled}});
-    ModelOptions optimizedOptions(options.m_ModelOptions);
-    optimizedOptions.push_back(importExport);
-
-    auto optNet = IOptimizedNetworkPtr(new IOptimizedNetwork(std::move(graph), optimizedOptions),
+    auto optNet = IOptimizedNetworkPtr(new IOptimizedNetwork(std::move(graph), options.m_ModelOptions),
                                        &IOptimizedNetwork::Destroy);
 
     IOptimizedNetwork* optNetObjPtr = optNet.get();
@@ -1828,9 +1819,7 @@
                                                                    backends,
                                                                    tensorHandleFactoryRegistry,
                                                                    options.m_ImportEnabled,
-                                                                   options.m_ExportEnabled,
                                                                    messages);
-
     if (strategyResult.m_Error)
     {
         // Failed to apply the backend-specific optimizations