Rename input/output binding members

Change-Id: I8fc122e1eb5c42bdc444930b40015884b5080648
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/src/inference_engine_armnn.cpp b/src/inference_engine_armnn.cpp
index 0d2e9c5e267960e5727cbc912163a3a40ff751a6..30eeff115d2e610f5e414243443d3274f513b401 100644 (file)
--- a/src/inference_engine_armnn.cpp
+++ b/src/inference_engine_armnn.cpp
@@ -147,16 +147,16 @@ int InferenceARMNN::CreateTfLiteNetwork(std::string model_path)
 
     std::vector<std::string> in_names = parser->GetSubgraphInputTensorNames(0);
     for (auto const &name:in_names) {
-        inputBindingInfo.push_back(parser->GetNetworkInputBindingInfo(0, name));
+        mInputBindingInfo.push_back(parser->GetNetworkInputBindingInfo(0, name));
     }
 
     std::vector<std::string> out_names = parser->GetSubgraphOutputTensorNames(0);
     for (auto const &name:out_names) {
-        outputBindingInfo.push_back(parser->GetNetworkOutputBindingInfo(0, name));
+        mOutputBindingInfo.push_back(parser->GetNetworkOutputBindingInfo(0, name));
     }
 
-    LOGI("Input Tensor count = %d", (int)inputBindingInfo.size());
-    LOGI("Output Tensor count = %d", (int) outputBindingInfo.size());
+    LOGI("Input Tensor count = %d", (int)mInputBindingInfo.size());
+    LOGI("Output Tensor count = %d", (int)mOutputBindingInfo.size());
 
     LOGI("LEAVE");
 
@@ -235,7 +235,7 @@ int InferenceARMNN::GetInputLayerProperty(inference_engine_layer_property &prope
     // TODO. Need to check if model file loading is done.
 
     std::vector<armnn::BindingPointInfo>::iterator iter;
-    for (iter = inputBindingInfo.begin(); iter != inputBindingInfo.end(); iter++) {
+    for (iter = mInputBindingInfo.begin(); iter != mInputBindingInfo.end(); iter++) {
         inference_engine_tensor_info out_info;
         armnn::BindingPointInfo bindingInfo = *iter;
         armnn::TensorInfo tensorInfo = bindingInfo.second;
@@ -264,7 +264,7 @@ int InferenceARMNN::GetOutputLayerProperty(inference_engine_layer_property &prop
     // TODO. Need to check if model file loading is done.
 
     std::vector<armnn::BindingPointInfo>::iterator iter;
-    for (iter = outputBindingInfo.begin(); iter != outputBindingInfo.end(); iter++) {
+    for (iter = mOutputBindingInfo.begin(); iter != mOutputBindingInfo.end(); iter++) {
         inference_engine_tensor_info out_info;
         armnn::BindingPointInfo bindingInfo = *iter;
         armnn::TensorInfo tensorInfo = bindingInfo.second;
@@ -307,12 +307,12 @@ int InferenceARMNN::Run(std::vector<inference_engine_tensor_buffer> &input_buffe
 {
     LOGI("ENTER");
 
-    armnn::BindingPointInfo outBindingInfo = outputBindingInfo.front();
+    armnn::BindingPointInfo outBindingInfo = mOutputBindingInfo.front();
     armnn::TensorInfo outputTensorInfo = outBindingInfo.second;
     armnn::TensorShape shape = outputTensorInfo.GetShape();
 
     // input
-    armnn::BindingPointInfo inBindingInfo = inputBindingInfo.front();
+    armnn::BindingPointInfo inBindingInfo = mInputBindingInfo.front();
     armnn::TensorInfo inputTensorInfo = inBindingInfo.second;
 
     int tensor_size = 1;
@@ -343,8 +343,8 @@ int InferenceARMNN::Run(std::vector<inference_engine_tensor_buffer> &input_buffe
     armnn::InputTensors input_tensors;
     armnn::OutputTensors output_tensors;
 
-    input_tensors.push_back({inputBindingInfo[0].first, InputTensors.front()});
-    output_tensors.push_back({outputBindingInfo[0].first, mOutputTensor.front()});
+    input_tensors.push_back({mInputBindingInfo[0].first, InputTensors.front()});
+    output_tensors.push_back({mOutputBindingInfo[0].first, mOutputTensor.front()});
 
     armnn::Status ret = mRuntime->EnqueueWorkload(mNetworkIdentifier,
                                                   input_tensors, output_tensors);

diff --git a/src/inference_engine_armnn_private.h b/src/inference_engine_armnn_private.h
index 48911dd45d8432573334af05e2fd2c410b0e52e5..ece87bdc34ac68e4577b7323622d6a81b2998073 100644 (file)
--- a/src/inference_engine_armnn_private.h
+++ b/src/inference_engine_armnn_private.h
@@ -77,8 +77,8 @@ private:
     armnn::NetworkId mNetworkIdentifier;
     armnn::IRuntime::CreationOptions mOptions;
 
-    std::vector<armnn::BindingPointInfo> inputBindingInfo;
-    std::vector<armnn::BindingPointInfo> outputBindingInfo;
+    std::vector<armnn::BindingPointInfo> mInputBindingInfo;
+    std::vector<armnn::BindingPointInfo> mOutputBindingInfo;
 
     std::vector<armnn::Tensor> mOutputTensor;
 };