IVGCVSW-2405 Rename SubGraph to SubgraphView

Change-Id: Ie50aeccf053c20c3a01a75042bbc3acd824375af
Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>

4 files changed, 30 insertions, 30 deletions

diff --git a/src/armnnTfLiteParser/TfLiteParser.cpp b/src/armnnTfLiteParser/TfLiteParser.cpp
index 57333439aa..0cc6f93f3a 100644
--- a/src/armnnTfLiteParser/TfLiteParser.cpp
+++ b/src/armnnTfLiteParser/TfLiteParser.cpp
@@ -491,15 +491,15 @@ void TfLiteParser::AddBroadcastReshapeLayer(size_t subgraphIndex,
     CHECK_MODEL(m_Model, subgraphIndex, operatorIndex);
     BOOST_ASSERT(layer != nullptr);
 
-    const auto & subGraphPtr = m_Model->subgraphs[subgraphIndex];
-    const auto & operatorPtr = subGraphPtr->operators[operatorIndex];
+    const auto & subgraphPtr = m_Model->subgraphs[subgraphIndex];
+    const auto & operatorPtr = subgraphPtr->operators[operatorIndex];
 
     BOOST_ASSERT(operatorPtr->inputs.size() > 1);
 
     uint32_t reshapedInputId = CHECKED_NON_NEGATIVE(operatorPtr->inputs[0]);
-    TensorRawPtr tensorPtr = subGraphPtr->tensors[reshapedInputId].get();
+    TensorRawPtr tensorPtr = subgraphPtr->tensors[reshapedInputId].get();
     uint32_t inputId = CHECKED_NON_NEGATIVE(operatorPtr->inputs[1]);
-    TensorRawPtr tensorPtr1 = subGraphPtr->tensors[inputId].get();
+    TensorRawPtr tensorPtr1 = subgraphPtr->tensors[inputId].get();
 
     armnn::TensorInfo reshapedTensorInfo = ToTensorInfo(tensorPtr);
     armnn::TensorInfo inputTensorInfo    = ToTensorInfo(tensorPtr1);
@@ -573,7 +573,7 @@ INetworkPtr TfLiteParser::CreateNetworkFromModel()
     }
 
     size_t subgraphIndex = 0;
-    for (SubGraphPtr const & subgraph : m_Model->subgraphs)
+    for (SubgraphPtr const & subgraph : m_Model->subgraphs)
     {
         m_SubgraphConnections.emplace_back(subgraph->tensors.size());
 
@@ -2237,15 +2237,15 @@ TfLiteParser::TensorRawPtrVector TfLiteParser::GetInputs(const ModelPtr & model,
 {
     CHECK_MODEL(model, subgraphIndex, operatorIndex);
 
-    const auto & subGraphPtr = model->subgraphs[subgraphIndex];
-    const auto & operatorPtr = subGraphPtr->operators[operatorIndex];
+    const auto & subgraphPtr = model->subgraphs[subgraphIndex];
+    const auto & operatorPtr = subgraphPtr->operators[operatorIndex];
 
     size_t inputCount = operatorPtr->inputs.size();
     TensorRawPtrVector result(inputCount);
     for (size_t i=0; i<inputCount; ++i)
     {
         uint32_t inputId = CHECKED_NON_NEGATIVE(operatorPtr->inputs[i]);
-        result[i] = subGraphPtr->tensors[inputId].get();
+        result[i] = subgraphPtr->tensors[inputId].get();
     }
     return result;
 }
@@ -2256,8 +2256,8 @@ TfLiteParser::TensorRawPtrVector TfLiteParser::GetOutputs(const ModelPtr & model
 {
     CHECK_MODEL(model, subgraphIndex, operatorIndex);
 
-    const auto & subGraphPtr = model->subgraphs[subgraphIndex];
-    const auto & operatorPtr = subGraphPtr->operators[operatorIndex];
+    const auto & subgraphPtr = model->subgraphs[subgraphIndex];
+    const auto & operatorPtr = subgraphPtr->operators[operatorIndex];
 
     size_t outputCount = operatorPtr->outputs.size();
     TensorRawPtrVector result(outputCount);
@@ -2265,7 +2265,7 @@ TfLiteParser::TensorRawPtrVector TfLiteParser::GetOutputs(const ModelPtr & model
     {
         uint32_t outputId = CHECKED_NON_NEGATIVE(operatorPtr->outputs[i]);
         CHECK_TENSOR(model, subgraphIndex, outputId);
-        result[i] = subGraphPtr->tensors[outputId].get();
+        result[i] = subgraphPtr->tensors[outputId].get();
     }
     return result;
 }
@@ -2274,15 +2274,15 @@ TfLiteParser::TensorIdRawPtrVector TfLiteParser::GetSubgraphInputs(const ModelPt
                                                                    size_t subgraphIndex)
 {
     CHECK_SUBGRAPH(model, subgraphIndex);
-    const auto & subGraphPtr = model->subgraphs[subgraphIndex];
+    const auto & subgraphPtr = model->subgraphs[subgraphIndex];
 
-    size_t inputCount = subGraphPtr->inputs.size();
+    size_t inputCount = subgraphPtr->inputs.size();
     TensorIdRawPtrVector result(inputCount);
     for (size_t i=0; i<inputCount; ++i)
     {
-        uint32_t inputId = CHECKED_NON_NEGATIVE(subGraphPtr->inputs[i]);
+        uint32_t inputId = CHECKED_NON_NEGATIVE(subgraphPtr->inputs[i]);
         CHECK_TENSOR(model, subgraphIndex, inputId);
-        result[i] = std::make_pair(inputId, subGraphPtr->tensors[inputId].get());
+        result[i] = std::make_pair(inputId, subgraphPtr->tensors[inputId].get());
     }
     return result;
 }
@@ -2291,14 +2291,14 @@ TfLiteParser::TensorIdRawPtrVector TfLiteParser::GetSubgraphOutputs(const ModelP
                                                                     size_t subgraphIndex)
 {
     CHECK_SUBGRAPH(model, subgraphIndex);
-    const auto & subGraphPtr = model->subgraphs[subgraphIndex];
+    const auto & subgraphPtr = model->subgraphs[subgraphIndex];
 
-    size_t outputCount = subGraphPtr->outputs.size();
+    size_t outputCount = subgraphPtr->outputs.size();
     TensorIdRawPtrVector result(outputCount);
     for (size_t i=0; i<outputCount; ++i)
     {
-        uint32_t outputId = CHECKED_NON_NEGATIVE(subGraphPtr->outputs[i]);
-        result[i] = std::make_pair(outputId, subGraphPtr->tensors[outputId].get());
+        uint32_t outputId = CHECKED_NON_NEGATIVE(subgraphPtr->outputs[i]);
+        result[i] = std::make_pair(outputId, subgraphPtr->tensors[outputId].get());
     }
     return result;
 }
@@ -2308,8 +2308,8 @@ std::vector<int32_t>& TfLiteParser::GetInputTensorIds(const ModelPtr& model,
                                                       size_t operatorIndex)
 {
     CHECK_MODEL(model, subgraphIndex, operatorIndex);
-    const auto & subGraphPtr = model->subgraphs[subgraphIndex];
-    const auto & operatorPtr = subGraphPtr->operators[operatorIndex];
+    const auto & subgraphPtr = model->subgraphs[subgraphIndex];
+    const auto & operatorPtr = subgraphPtr->operators[operatorIndex];
     return operatorPtr->inputs;
 }
 
@@ -2318,8 +2318,8 @@ std::vector<int32_t>& TfLiteParser::GetOutputTensorIds(const ModelPtr& model,
                                                        size_t operatorIndex)
 {
     CHECK_MODEL(model, subgraphIndex, operatorIndex);
-    const auto & subGraphPtr = model->subgraphs[subgraphIndex];
-    const auto & operatorPtr = subGraphPtr->operators[operatorIndex];
+    const auto & subgraphPtr = model->subgraphs[subgraphIndex];
+    const auto & operatorPtr = subgraphPtr->operators[operatorIndex];
     return operatorPtr->outputs;
 }
 
@@ -2420,7 +2420,7 @@ void TfLiteParser::SetupConstantLayers(size_t subgraphIndex)
 {
     CHECK_SUBGRAPH(m_Model, subgraphIndex);
 
-    const auto & subGraphPtr = m_Model->subgraphs[subgraphIndex];
+    const auto & subgraphPtr = m_Model->subgraphs[subgraphIndex];
     for (unsigned int subgraphIndex = 0; subgraphIndex < m_SubgraphConnections.size(); ++subgraphIndex)
     {
         for (unsigned int tensorIndex = 0; tensorIndex < m_SubgraphConnections[subgraphIndex].size(); ++tensorIndex)
@@ -2428,7 +2428,7 @@ void TfLiteParser::SetupConstantLayers(size_t subgraphIndex)
             if (m_SubgraphConnections[subgraphIndex][tensorIndex].outputSlot == nullptr &&
                 m_SubgraphConnections[subgraphIndex][tensorIndex].inputSlots.size() > 0)
             {
-                TensorRawPtr tensorPtr = subGraphPtr->tensors[tensorIndex].get();
+                TensorRawPtr tensorPtr = subgraphPtr->tensors[tensorIndex].get();
                 armnn::TensorInfo tensorInfo = ToTensorInfo(tensorPtr);
                 auto tensorAndData = CreateConstTensor(tensorPtr,
                                                        tensorInfo,
diff --git a/src/armnnTfLiteParser/TfLiteParser.hpp b/src/armnnTfLiteParser/TfLiteParser.hpp
index 929af1f0db..07a0f26590 100644
--- a/src/armnnTfLiteParser/TfLiteParser.hpp
+++ b/src/armnnTfLiteParser/TfLiteParser.hpp
@@ -20,7 +20,7 @@ class TfLiteParser : public ITfLiteParser
 public:
     // Shorthands for TfLite types
     using ModelPtr = std::unique_ptr<tflite::ModelT>;
-    using SubGraphPtr = std::unique_ptr<tflite::SubGraphT>;
+    using SubgraphPtr = std::unique_ptr<tflite::SubGraphT>;
     using OperatorPtr = std::unique_ptr<tflite::OperatorT>;
     using OperatorCodePtr = std::unique_ptr<tflite::OperatorCodeT>;
     using TensorPtr = std::unique_ptr<tflite::TensorT>;
diff --git a/src/armnnTfLiteParser/test/GetTensorIds.cpp b/src/armnnTfLiteParser/test/GetTensorIds.cpp
index c55b6d3fe9..6b82bb1f97 100644
--- a/src/armnnTfLiteParser/test/GetTensorIds.cpp
+++ b/src/armnnTfLiteParser/test/GetTensorIds.cpp
@@ -135,13 +135,13 @@ BOOST_FIXTURE_TEST_CASE(GetOutputTensorIdsNullModel, GetInputOutputTensorIdsFixt
     BOOST_CHECK_THROW(TfLiteParser::GetOutputTensorIds(nullptr, 0, 0), armnn::ParseException);
 }
 
-BOOST_FIXTURE_TEST_CASE(GetInputTensorIdsInvalidSubGraph, GetInputOutputTensorIdsFixture)
+BOOST_FIXTURE_TEST_CASE(GetInputTensorIdsInvalidSubgraph, GetInputOutputTensorIdsFixture)
 {
     TfLiteParser::ModelPtr model = TfLiteParser::LoadModelFromBinary(m_GraphBinary.data(), m_GraphBinary.size());
     BOOST_CHECK_THROW(TfLiteParser::GetInputTensorIds(model, 1, 0), armnn::ParseException);
 }
 
-BOOST_FIXTURE_TEST_CASE(GetOutputTensorIdsInvalidSubGraph, GetInputOutputTensorIdsFixture)
+BOOST_FIXTURE_TEST_CASE(GetOutputTensorIdsInvalidSubgraph, GetInputOutputTensorIdsFixture)
 {
     TfLiteParser::ModelPtr model = TfLiteParser::LoadModelFromBinary(m_GraphBinary.data(), m_GraphBinary.size());
     BOOST_CHECK_THROW(TfLiteParser::GetOutputTensorIds(model, 1, 0), armnn::ParseException);
diff --git a/src/armnnTfLiteParser/test/LoadModel.cpp b/src/armnnTfLiteParser/test/LoadModel.cpp
index ea490106c4..dac30efb1e 100644
--- a/src/armnnTfLiteParser/test/LoadModel.cpp
+++ b/src/armnnTfLiteParser/test/LoadModel.cpp
@@ -10,7 +10,7 @@
 
 using armnnTfLiteParser::TfLiteParser;
 using ModelPtr = TfLiteParser::ModelPtr;
-using SubGraphPtr = TfLiteParser::SubGraphPtr;
+using SubgraphPtr = TfLiteParser::SubgraphPtr;
 using OperatorPtr = TfLiteParser::OperatorPtr;
 
 BOOST_AUTO_TEST_SUITE(TensorflowLiteParser)
@@ -156,7 +156,7 @@ struct LoadModelFixture : public ParserFlatbuffersFixture
         }
     }
 
-    void CheckSubgraph(const SubGraphPtr& subgraph, size_t tensors, const std::vector<int32_t>& inputs,
+    void CheckSubgraph(const SubgraphPtr& subgraph, size_t tensors, const std::vector<int32_t>& inputs,
                        const std::vector<int32_t>& outputs, size_t operators, const std::string& name)
     {
         BOOST_CHECK(subgraph);