commit ef33cb192eef332fb3a26be742b341288421e5bc
author Kevin May <kevin.may@arm.com> Fri Jan 29 14:24:57 2021 +0000
committer Kevin May <kevin.may@arm.com> Thu Feb 04 11:31:51 2021 +0000
tree 1497367ada6382887baf698b3b8a791abca05d9d
parent 7d96b16acfdbdcef6739d59ba067a37c062aa03f

IVGCVSW-5592 Implement Pimpl Idiom for Caffe and Onnx Parsers

Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: I760dc4f33c0f87113cda2fa924da70f2e8c19025

src/armnnOnnxParser/test/GetInputsOutputs.cpp

diff --git a/src/armnnOnnxParser/test/GetInputsOutputs.cpp b/src/armnnOnnxParser/test/GetInputsOutputs.cpp
index b22ef3a..5bb3095 100644
--- a/src/armnnOnnxParser/test/GetInputsOutputs.cpp
+++ b/src/armnnOnnxParser/test/GetInputsOutputs.cpp
@@ -68,8 +68,8 @@
 
 BOOST_FIXTURE_TEST_CASE(GetInput, GetInputsOutputsMainFixture)
 {
-    ModelPtr model = armnnOnnxParser::OnnxParser::LoadModelFromString(m_Prototext.c_str());
-    std::vector<std::string> tensors = armnnOnnxParser::OnnxParser::GetInputs(model);
+    ModelPtr model = armnnOnnxParser::OnnxParserImpl::LoadModelFromString(m_Prototext.c_str());
+    std::vector<std::string> tensors = armnnOnnxParser::OnnxParserImpl::GetInputs(model);
     BOOST_CHECK_EQUAL(1, tensors.size());
     BOOST_CHECK_EQUAL("Input", tensors[0]);
 
@@ -77,8 +77,8 @@
 
 BOOST_FIXTURE_TEST_CASE(GetOutput, GetInputsOutputsMainFixture)
 {
-    ModelPtr model = armnnOnnxParser::OnnxParser::LoadModelFromString(m_Prototext.c_str());
-    std::vector<std::string> tensors = armnnOnnxParser::OnnxParser::GetOutputs(model);
+    ModelPtr model = armnnOnnxParser::OnnxParserImpl::LoadModelFromString(m_Prototext.c_str());
+    std::vector<std::string> tensors = armnnOnnxParser::OnnxParserImpl::GetOutputs(model);
     BOOST_CHECK_EQUAL(1, tensors.size());
     BOOST_CHECK_EQUAL("Output", tensors[0]);
 }
@@ -139,20 +139,20 @@
 
 BOOST_FIXTURE_TEST_CASE(GetEmptyInputs, GetEmptyInputsOutputsFixture)
 {
-    ModelPtr model = armnnOnnxParser::OnnxParser::LoadModelFromString(m_Prototext.c_str());
-    std::vector<std::string> tensors = armnnOnnxParser::OnnxParser::GetInputs(model);
+    ModelPtr model = armnnOnnxParser::OnnxParserImpl::LoadModelFromString(m_Prototext.c_str());
+    std::vector<std::string> tensors = armnnOnnxParser::OnnxParserImpl::GetInputs(model);
     BOOST_CHECK_EQUAL(0, tensors.size());
 }
 
 BOOST_AUTO_TEST_CASE(GetInputsNullModel)
 {
-    BOOST_CHECK_THROW(armnnOnnxParser::OnnxParser::LoadModelFromString(""), armnn::InvalidArgumentException);
+    BOOST_CHECK_THROW(armnnOnnxParser::OnnxParserImpl::LoadModelFromString(""), armnn::InvalidArgumentException);
 }
 
 BOOST_AUTO_TEST_CASE(GetOutputsNullModel)
 {
     auto silencer = google::protobuf::LogSilencer(); //get rid of errors from protobuf
-    BOOST_CHECK_THROW(armnnOnnxParser::OnnxParser::LoadModelFromString("nknnk"), armnn::ParseException);
+    BOOST_CHECK_THROW(armnnOnnxParser::OnnxParserImpl::LoadModelFromString("nknnk"), armnn::ParseException);
 }
 
 struct GetInputsMultipleFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser::IOnnxParser>
@@ -243,8 +243,8 @@
 
 BOOST_FIXTURE_TEST_CASE(GetInputsMultipleInputs, GetInputsMultipleFixture)
 {
-    ModelPtr model = armnnOnnxParser::OnnxParser::LoadModelFromString(m_Prototext.c_str());
-    std::vector<std::string> tensors = armnnOnnxParser::OnnxParser::GetInputs(model);
+    ModelPtr model = armnnOnnxParser::OnnxParserImpl::LoadModelFromString(m_Prototext.c_str());
+    std::vector<std::string> tensors = armnnOnnxParser::OnnxParserImpl::GetInputs(model);
     BOOST_CHECK_EQUAL(2, tensors.size());
     BOOST_CHECK_EQUAL("Input0", tensors[0]);
     BOOST_CHECK_EQUAL("Input1", tensors[1]);