commit 6b0b53d307f956c3d67429f2a93df91f2eb2f483
author jimfly01 <jim.flynn@arm.com> Mon Oct 08 14:43:01 2018 +0100
committer Matthew Bentham <matthew.bentham@arm.com> Wed Oct 10 16:16:58 2018 +0100
tree fcc03458f6396d9b9bee55674ca5af562ed5a16b
parent 0d9d4193200e8bfbaf4cb8f32c866d5fe73a3e7e

IVGCVSW-1929: Fix for this defect (QASYM8 no scale)

* Now hand in an optional vector of strings to Optimize
  function in which errors/warning messages are placed.
* Optimize function changed to check outputs of each
  layer. If they are Quantized 8 bit but the scale has
  not been set an error message is added for each such output.
* Unit test modelled on defect report added to exercise the fix.

!android-nn-driver:152483

Change-Id: If9901f5324a516f1ab62858266b38f98dae16201

src/armnnUtils/ParserPrototxtFixture.hpp

diff --git a/src/armnnUtils/ParserPrototxtFixture.hpp b/src/armnnUtils/ParserPrototxtFixture.hpp
index 89b823a..c502ad9 100644
--- a/src/armnnUtils/ParserPrototxtFixture.hpp
+++ b/src/armnnUtils/ParserPrototxtFixture.hpp
@@ -101,7 +101,8 @@
 
         armnn::INetworkPtr network =
             m_Parser->CreateNetworkFromString(m_Prototext.c_str(), inputShapes, requestedOutputs);
-        auto optimized = Optimize(*network, { runtime.second, armnn::Compute::CpuRef }, runtime.first->GetDeviceSpec());
+        auto optimized = Optimize(*network,
+                { runtime.second, armnn::Compute::CpuRef }, runtime.first->GetDeviceSpec());
         armnn::Status ret = runtime.first->LoadNetwork(m_NetworkIdentifier, move(optimized), errorMessage);
         if (ret != armnn::Status::Success)
         {
@@ -122,7 +123,8 @@
 
         armnn::INetworkPtr network =
             m_Parser->CreateNetworkFromString(m_Prototext.c_str());
-        auto optimized = Optimize(*network, { runtime.second, armnn::Compute::CpuRef }, runtime.first->GetDeviceSpec());
+        auto optimized = Optimize(*network,
+                { runtime.second, armnn::Compute::CpuRef }, runtime.first->GetDeviceSpec());
         armnn::Status ret = runtime.first->LoadNetwork(m_NetworkIdentifier, move(optimized), errorMessage);
         if (ret != armnn::Status::Success)
         {