Release 18.05

1 files changed, 53 insertions, 37 deletions

diff --git a/tests/TfMobileNet-Armnn/TfMobileNet-Armnn.cpp b/tests/TfMobileNet-Armnn/TfMobileNet-Armnn.cpp
index e1aebb6bb0..54759bf88a 100644
--- a/tests/TfMobileNet-Armnn/TfMobileNet-Armnn.cpp
+++ b/tests/TfMobileNet-Armnn/TfMobileNet-Armnn.cpp
@@ -8,43 +8,59 @@
 
 int main(int argc, char* argv[])
 {
-    std::vector<ImageSet> imageSet =
+    int retVal = EXIT_FAILURE;
+    try
     {
-        {"Dog.jpg", 209},
-        // top five predictions in tensorflow:
-        // -----------------------------------
-        // 209:Labrador retriever 0.949995
-        // 160:Rhodesian ridgeback 0.0270182
-        // 208:golden retriever 0.0192866
-        // 853:tennis ball 0.000470382
-        // 239:Greater Swiss Mountain dog 0.000464451
-        {"Cat.jpg", 283},
-        // top five predictions in tensorflow:
-        // -----------------------------------
-        // 283:tiger cat 0.579016
-        // 286:Egyptian cat 0.319676
-        // 282:tabby, tabby cat 0.0873346
-        // 288:lynx, catamount 0.011163
-        // 289:leopard, Panthera pardus 0.000856755
-        {"shark.jpg", 3},
-        // top five predictions in tensorflow:
-        // -----------------------------------
-        // 3:great white shark, white shark, ... 0.996926
-        // 4:tiger shark, Galeocerdo cuvieri 0.00270528
-        // 149:killer whale, killer, orca, ... 0.000121848
-        // 395:sturgeon 7.78977e-05
-        // 5:hammerhead, hammerhead shark 6.44127e-055
-    };
+        // Coverity fix: The following code may throw an exception of type std::length_error.
+        std::vector<ImageSet> imageSet =
+        {
+            {"Dog.jpg", 209},
+            // top five predictions in tensorflow:
+            // -----------------------------------
+            // 209:Labrador retriever 0.949995
+            // 160:Rhodesian ridgeback 0.0270182
+            // 208:golden retriever 0.0192866
+            // 853:tennis ball 0.000470382
+            // 239:Greater Swiss Mountain dog 0.000464451
+            {"Cat.jpg", 283},
+            // top five predictions in tensorflow:
+            // -----------------------------------
+            // 283:tiger cat 0.579016
+            // 286:Egyptian cat 0.319676
+            // 282:tabby, tabby cat 0.0873346
+            // 288:lynx, catamount 0.011163
+            // 289:leopard, Panthera pardus 0.000856755
+            {"shark.jpg", 3},
+            // top five predictions in tensorflow:
+            // -----------------------------------
+            // 3:great white shark, white shark, ... 0.996926
+            // 4:tiger shark, Galeocerdo cuvieri 0.00270528
+            // 149:killer whale, killer, orca, ... 0.000121848
+            // 395:sturgeon 7.78977e-05
+            // 5:hammerhead, hammerhead shark 6.44127e-055
+        };
 
-    armnn::TensorShape inputTensorShape({ 1, 224, 224, 3  });
-    return armnn::test::ClassifierInferenceTestMain<MobileNetDatabase, armnnTfParser::ITfParser>(
-        argc, argv, "mobilenet_v1_1.0_224_fp32.pb", true, "input", "output", { 0, 1, 2 },
-        [&imageSet](const char* dataDir) {
-            return MobileNetDatabase(
-                dataDir,
-                224,
-                224,
-                imageSet);
-        },
-        &inputTensorShape);
+        armnn::TensorShape inputTensorShape({ 1, 224, 224, 3  });
+
+        // Coverity fix: ClassifierInferenceTestMain() may throw uncaught exceptions.
+        retVal = armnn::test::ClassifierInferenceTestMain<MobileNetDatabase, armnnTfParser::ITfParser>(
+                     argc, argv, "mobilenet_v1_1.0_224_fp32.pb", true, "input", "output", { 0, 1, 2 },
+                     [&imageSet](const char* dataDir) {
+                         return MobileNetDatabase(
+                             dataDir,
+                             224,
+                             224,
+                             imageSet);
+                     },
+                     &inputTensorShape);
+    }
+    catch (const std::exception& e)
+    {
+        // Coverity fix: BOOST_LOG_TRIVIAL (typically used to report errors) may throw an
+        // exception of type std::length_error.
+        // Using stderr instead in this context as there is no point in nesting try-catch blocks here.
+        std::cerr << "WARNING: TfMobileNet-Armnn: An error has occurred when running "
+                     "the classifier inference tests: " << e.what() << std::endl;
+    }
+    return retVal;
 }