aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDerek Lamberti <derek.lamberti@arm.com>2019-02-20 13:57:42 +0000
committerDerek Lamberti <derek.lamberti@arm.com>2019-02-20 15:41:32 +0000
commit0028d1b0ce5f4c2c6a6eb3c66f38111c21eb47a3 (patch)
tree894d7ac05ef1610bad636e24489248e6c472b313 /tests
parentbe25fc18f7e55bc39f537601e42a9d5c9d0c111f (diff)
downloadarmnn-0028d1b0ce5f4c2c6a6eb3c66f38111c21eb47a3.tar.gz
IVGSVSW-2736 Rename DeserializeParser => Deserializer & fix namespaces
Change-Id: I4166c0bbb5ba7f8b8884e71134c21f43d1fc27b0 Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/ExecuteNetwork/ExecuteNetwork.cpp4
-rw-r--r--tests/InferenceModel.hpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/ExecuteNetwork/ExecuteNetwork.cpp b/tests/ExecuteNetwork/ExecuteNetwork.cpp
index a97d6da3d5..c040c9b1f8 100644
--- a/tests/ExecuteNetwork/ExecuteNetwork.cpp
+++ b/tests/ExecuteNetwork/ExecuteNetwork.cpp
@@ -6,7 +6,7 @@
#include <armnn/TypesUtils.hpp>
#if defined(ARMNN_SERIALIZER)
-#include "armnnDeserializeParser/IDeserializeParser.hpp"
+#include "armnnDeserializer/IDeserializer.hpp"
#endif
#if defined(ARMNN_CAFFE_PARSER)
#include "armnnCaffeParser/ICaffeParser.hpp"
@@ -367,7 +367,7 @@ int RunTest(const std::string& format,
if (modelFormat.find("armnn") != std::string::npos)
{
#if defined(ARMNN_SERIALIZER)
- return MainImpl<armnnDeserializeParser::IDeserializeParser, float>(
+ return MainImpl<armnnDeserializer::IDeserializer, float>(
modelPath.c_str(), isModelBinary, computeDevice,
inputNamesVector, inputTensorShapes,
inputTensorDataFilePathsVector, inputTypesVector,
diff --git a/tests/InferenceModel.hpp b/tests/InferenceModel.hpp
index 4819523595..3b3dd95e88 100644
--- a/tests/InferenceModel.hpp
+++ b/tests/InferenceModel.hpp
@@ -6,7 +6,7 @@
#include <armnn/ArmNN.hpp>
#if defined(ARMNN_SERIALIZER)
-#include "armnnDeserializeParser/IDeserializeParser.hpp"
+#include "armnnDeserializer/IDeserializer.hpp"
#endif
#if defined(ARMNN_TF_LITE_PARSER)
#include <armnnTfLiteParser/ITfLiteParser.hpp>
@@ -165,10 +165,10 @@ public:
#if defined(ARMNN_SERIALIZER)
template <>
-struct CreateNetworkImpl<armnnDeserializeParser::IDeserializeParser>
+struct CreateNetworkImpl<armnnDeserializer::IDeserializer>
{
public:
- using IParser = armnnDeserializeParser::IDeserializeParser;
+ using IParser = armnnDeserializer::IDeserializer;
using Params = InferenceModelInternal::Params;
using BindingPointInfo = InferenceModelInternal::BindingPointInfo;