From 2b183fb359774cbac5d628579ec2b4a7b6b41def Mon Sep 17 00:00:00 2001
From: Derek Lamberti <derek.lamberti@arm.com>
Date: Mon, 18 Feb 2019 16:36:57 +0000
Subject: IVGCVSW-2736 Deserialize using istream instead of filename

Change-Id: I5656b23d9783e7f953e677001d16e41eedeb42b2
Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
---
 src/armnnDeserializeParser/DeserializeParser.cpp | 35 +++++++-----------------
 1 file changed, 10 insertions(+), 25 deletions(-)

(limited to 'src/armnnDeserializeParser/DeserializeParser.cpp')

diff --git a/src/armnnDeserializeParser/DeserializeParser.cpp b/src/armnnDeserializeParser/DeserializeParser.cpp
index de9b1a98c7..9af5087cff 100644
--- a/src/armnnDeserializeParser/DeserializeParser.cpp
+++ b/src/armnnDeserializeParser/DeserializeParser.cpp
@@ -352,13 +352,6 @@ void IDeserializeParser::Destroy(IDeserializeParser* parser)
     delete parser;
 }
 
-INetworkPtr DeserializeParser::CreateNetworkFromBinaryFile(const char* graphFile)
-{
-    ResetParser();
-    m_Graph = LoadGraphFromFile(graphFile, m_FileContent);
-    return CreateNetworkFromGraph();
-}
-
 INetworkPtr DeserializeParser::CreateNetworkFromBinary(const std::vector<uint8_t>& binaryContent)
 {
      ResetParser();
@@ -366,25 +359,11 @@ INetworkPtr DeserializeParser::CreateNetworkFromBinary(const std::vector<uint8_t
      return CreateNetworkFromGraph();
 }
 
-DeserializeParser::GraphPtr DeserializeParser::LoadGraphFromFile(const char* fileName, std::string& fileContent)
+armnn::INetworkPtr DeserializeParser::CreateNetworkFromBinary(std::istream& binaryContent)
 {
-    if (fileName == nullptr)
-    {
-        throw InvalidArgumentException(boost::str(boost::format("Invalid (null) file name %1%") %
-                                                  CHECK_LOCATION().AsString()));
-    }
-    boost::system::error_code errorCode;
-    boost::filesystem::path pathToFile(fileName);
-    if (!boost::filesystem::exists(pathToFile, errorCode))
-    {
-        throw FileNotFoundException(boost::str(boost::format("Cannot find the file (%1%) errorCode: %2% %3%") %
-                                               fileName %
-                                               errorCode %
-                                               CHECK_LOCATION().AsString()));
-    }
-    std::ifstream file(fileName, std::ios::binary);
-    fileContent = std::string((std::istreambuf_iterator<char>(file)), std::istreambuf_iterator<char>());
-    return LoadGraphFromBinary(reinterpret_cast<const uint8_t*>(fileContent.c_str()), fileContent.size());
+    ResetParser();
+    m_Graph = LoadGraphFromBinary(binaryContent);
+    return CreateNetworkFromGraph();
 }
 
 DeserializeParser::GraphPtr DeserializeParser::LoadGraphFromBinary(const uint8_t* binaryContent, size_t len)
@@ -406,6 +385,12 @@ DeserializeParser::GraphPtr DeserializeParser::LoadGraphFromBinary(const uint8_t
     return GetSerializedGraph(binaryContent);
 }
 
+DeserializeParser::GraphPtr DeserializeParser::LoadGraphFromBinary(std::istream& binaryContent)
+{
+    std::string content((std::istreambuf_iterator<char>(binaryContent)), std::istreambuf_iterator<char>());
+    return GetSerializedGraph(content.data());
+}
+
 INetworkPtr DeserializeParser::CreateNetworkFromGraph()
 {
     m_Network = INetwork::Create();
-- 
cgit v1.2.1