change enumeration values to new ones submit/tizen/20200423.063253 submit/tizen/20200423.064104 submit/tizen/20200423.083755
authorInki Dae <inki.dae@samsung.com>
Fri, 17 Apr 2020 07:43:07 +0000 (16:43 +0900)
committerInki Dae <inki.dae@samsung.com>
Mon, 20 Apr 2020 00:51:05 +0000 (09:51 +0900)
some enumeration values of inference-engine-interface have been
updated so change them.

Signed-off-by: Inki Dae <inki.dae@samsung.com>
src/inference_engine_opencv.cpp

index 3ee3967..9fa81ca 100644 (file)
@@ -120,7 +120,7 @@ int InferenceOpenCV::GetInputTensorBuffers(std::vector<inference_engine_tensor_b
         pBuff = mInputData.back().ptr<void*>(0);
         size_t sizeBuff = mInputData.back().elemSize() * mInputData.back().rows * mInputData.back().cols;
         LOGI("elemSize: %zd, rows: %d, cols: %d", mInputData.back().elemSize(), mInputData.back().rows, mInputData.back().cols );
-        inference_engine_tensor_buffer buffer = { pBuff, TENSOR_DATA_TYPE_FLOAT32, sizeBuff, 1 };
+        inference_engine_tensor_buffer buffer = { pBuff, INFERENCE_TENSOR_DATA_TYPE_FLOAT32, sizeBuff, 1 };
         buffers.push_back(buffer);
     }
 
@@ -146,13 +146,13 @@ int InferenceOpenCV::GetOutputTensorBuffers(std::vector<inference_engine_tensor_
     for (iter = mOutputBlobs.begin(); iter != mOutputBlobs.end(); ++iter) {
         pBuff = (*iter).ptr<void*>(0);
         size_t sizeBuff = (*iter).total() * (*iter).elemSize();
-        inference_engine_tensor_buffer buffer = { pBuff, TENSOR_DATA_TYPE_FLOAT32, sizeBuff, 1};
+        inference_engine_tensor_buffer buffer = { pBuff, INFERENCE_TENSOR_DATA_TYPE_FLOAT32, sizeBuff, 1};
         buffers.push_back(buffer);
     }
 
     if (buffers.empty()) {
         LOGI("buff empty");
-        inference_engine_tensor_buffer buffer = { nullptr, TENSOR_DATA_TYPE_FLOAT32, 0, 1};
+        inference_engine_tensor_buffer buffer = { nullptr, INFERENCE_TENSOR_DATA_TYPE_FLOAT32, 0, 1};
         buffers.push_back(buffer);
     }
 
@@ -210,8 +210,8 @@ int InferenceOpenCV::GetOutputLayerProperty(inference_engine_layer_property &pro
                             lInputShape,
                             lOutputShape);
         inference_engine_tensor_info tensor_info;
-        tensor_info.data_type =TENSOR_DATA_TYPE_FLOAT32;
-        tensor_info.shape_type = TENSOR_SHAPE_NCHW;
+        tensor_info.data_type =INFERENCE_TENSOR_DATA_TYPE_FLOAT32;
+        tensor_info.shape_type = INFERENCE_TENSOR_SHAPE_NCHW;
         // lOutputShape may have multiple tensors
         // even though the output layer's name is only one
         LOGI("size of OutputShape: %d", lOutputShape.size());