MLCE-1248 Removing limitations on zero scale value in quantization.

Currently Arm NN will fail to load models containing quantization
scale value of zero.

Signed-off-by: Colm Donelan <colm.donelan@arm.com>
Change-Id: Ifefcee1279b8667da63d1aa7d42e5d44875f9fbe

1 files changed, 5 insertions, 13 deletions

diff --git a/src/armnn/test/RuntimeTests.cpp b/src/armnn/test/RuntimeTests.cpp
index 7079f0e4e8..6d5e2ae2b5 100644
--- a/src/armnn/test/RuntimeTests.cpp
+++ b/src/armnn/test/RuntimeTests.cpp
@@ -540,20 +540,12 @@ TEST_CASE("IVGCVSW_1929_QuantizedSoftmaxIssue")
     std::vector<armnn::BackendId> backends = { armnn::Compute::CpuRef };
     std::vector<std::string>      errMessages;
 
-    try
-    {
-        armnn::IOptimizedNetworkPtr optNet = Optimize(*net,
-                                                      backends,
-                                                      runtime->GetDeviceSpec(),
-                                                      OptimizerOptionsOpaque(),
-                                                      errMessages);
-        FAIL("An exception should have been thrown");
-    }
-    catch (const armnn::InvalidArgumentException&)
-    {
-        // Different exceptions are thrown on different backends
-    }
+    // We expect optimize to work but the errMessages should contain something.
+    CHECK_NOTHROW(armnn::IOptimizedNetworkPtr optNet =
+                      Optimize(*net, backends, runtime->GetDeviceSpec(), OptimizerOptionsOpaque(), errMessages));
     CHECK(errMessages.size() > 0);
+    // Should contain "updated to Scale"
+    CHECK(errMessages[0].find("updated to Scale") != std::string::npos);
 }
 
 TEST_CASE("RuntimeBackendOptions")