commit 0dfb2658ce521571aa0f9e859f813c60fda9d8d6
author Colm Donelan <colm.donelan@arm.com> Thu Jun 22 10:19:17 2023 +0100
committer Colm Donelan <colm.donelan@arm.com> Fri Jun 30 14:20:56 2023 +0100
tree ef4605cebb29c6754da8dfea0decd4250288e2a5
parent 16e27cf81424dcad05d129f9ba368a8c446cd25f

IVGCVSW-7666 Add a FileComparisonExecutor to ExecuteNetwork.

* Implement the "-C" command line option of executenetwork.
* Add a FileComparisonExecutorFile which will read tensors from
  a previously written text file and compare them to the execution
  output.

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

src/armnnTfLiteParser/TfLiteParser.cpp

diff --git a/src/armnnTfLiteParser/TfLiteParser.cpp b/src/armnnTfLiteParser/TfLiteParser.cpp
index 199a853..1c5b4fc 100644
--- a/src/armnnTfLiteParser/TfLiteParser.cpp
+++ b/src/armnnTfLiteParser/TfLiteParser.cpp
@@ -4876,9 +4876,15 @@
         std::stringstream msg;
         msg << "Cannot find the file (" << fileName << ") errorCode: " << errorCode
             << " " << CHECK_LOCATION().AsString();
-
         throw FileNotFoundException(msg.str());
     }
+    if (!fs::is_regular_file(pathToFile))
+    {
+        // Exclude non regular files.
+        throw InvalidArgumentException(fmt::format("File \"{}\" is not a regular file and cannot be loaded.",
+                                                   pathToFile.c_str()));
+    }
+
     std::ifstream file(fileName, std::ios::binary);
     std::string fileContent((std::istreambuf_iterator<char>(file)), std::istreambuf_iterator<char>());
     return LoadModelFromBinary(reinterpret_cast<const uint8_t *>(fileContent.c_str()),

src/armnnTfLiteParser/test/TfLiteParser.cpp

diff --git a/src/armnnTfLiteParser/test/TfLiteParser.cpp b/src/armnnTfLiteParser/test/TfLiteParser.cpp
index 65bbaea..841c46e 100644
--- a/src/armnnTfLiteParser/test/TfLiteParser.cpp
+++ b/src/armnnTfLiteParser/test/TfLiteParser.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright © 2020 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2020, 2023 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 
@@ -37,4 +37,20 @@
     CHECK_THROWS_AS((RunTest<4, armnn::DataType::QAsymmU8>(0, { }, { 0 })), armnn::ParseException);
 }
 
+TEST_CASE("ParseInvalidFileName")
+{
+    // Nullptr should throw InvalidArgumentException
+    CHECK_THROWS_AS(armnnTfLiteParser::TfLiteParserImpl::LoadModelFromFile(nullptr), armnn::InvalidArgumentException);
+    // Empty string should throw FileNotFoundException.
+    CHECK_THROWS_AS(armnnTfLiteParser::TfLiteParserImpl::LoadModelFromFile(""), armnn::FileNotFoundException);
+    // Garbage string should throw FileNotFoundException.
+    CHECK_THROWS_AS(armnnTfLiteParser::TfLiteParserImpl::LoadModelFromFile("askjfhseuirwqeuiy"),
+                    armnn::FileNotFoundException);
+    // Valid directory should throw InvalidArgumentException
+    CHECK_THROWS_AS(armnnTfLiteParser::TfLiteParserImpl::LoadModelFromFile("."), armnn::InvalidArgumentException);
+    // Valid file but not a regular file should throw InvalidArgumentException
+    CHECK_THROWS_AS(armnnTfLiteParser::TfLiteParserImpl::LoadModelFromFile("/dev/null"),
+                    armnn::InvalidArgumentException);
+}
+
 }