summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHyunsoo Park <hance.park@samsung.com>2019-08-22 20:26:53 +0900
committerHyunsoo Park <hance.park@samsung.com>2019-09-05 10:17:27 +0900
commit2d61f5fe388e32265ddaf9a13ac1404d9bad1fa1 (patch)
tree69a02bb034a8be97e8558a7dcc5b5308c6797459
parentb3e871d429dbf75ff7dc1dcda9cd1dcc848059e1 (diff)
downloadinference-engine-tflite-2d61f5fe388e32265ddaf9a13ac1404d9bad1fa1.tar.gz
inference-engine-tflite-2d61f5fe388e32265ddaf9a13ac1404d9bad1fa1.tar.bz2
inference-engine-tflite-2d61f5fe388e32265ddaf9a13ac1404d9bad1fa1.zip
Deletion of related methods as inherited class changing.submit/tizen/20190905.022044
It is inherited by IInferenceEngineVision and IInferenceEngineCommon both. But relationship of them is changed as inheritant. So i remove unneccessary methods. Change-Id: I22303fbdea68b2944f9a64fc99fee77a8501d4e9 Signed-off-by: Hyunsoo Park <hance.park@samsung.com>
-rw-r--r--packaging/inference-engine-tflite.spec2
-rw-r--r--src/inference_engine_tflite.cpp7
-rw-r--r--src/inference_engine_tflite_private.h5
3 files changed, 3 insertions, 11 deletions
diff --git a/packaging/inference-engine-tflite.spec b/packaging/inference-engine-tflite.spec
index e3969ce..9ace9ba 100644
--- a/packaging/inference-engine-tflite.spec
+++ b/packaging/inference-engine-tflite.spec
@@ -1,7 +1,7 @@
Name: inference-engine-tflite
Summary: Tensorflow-Lite based implementation of inference-engine-interface
Version: 0.0.1
-Release: 3
+Release: 4
Group: Multimedia/Libraries
License: Apache-2.0
Source0: %{name}-%{version}.tar.gz
diff --git a/src/inference_engine_tflite.cpp b/src/inference_engine_tflite.cpp
index 60c7c16..ed611f3 100644
--- a/src/inference_engine_tflite.cpp
+++ b/src/inference_engine_tflite.cpp
@@ -240,11 +240,6 @@ int InferenceTFLite::CreateInputLayerPassage()
return INFERENCE_ENGINE_ERROR_NONE;
}
-int InferenceTFLite::PrepareInputLayerPassage()
-{
- return INFERENCE_ENGINE_ERROR_NONE;
-}
-
int InferenceTFLite::PrepareInputLayerPassage(inference_input_type_e type)
{
switch (type) {
@@ -549,7 +544,7 @@ void EngineVisionDestroy(class IInferenceEngineVision *engine)
delete engine;
}
-class IInferenceEngineCommon* EngineCommonInit(std::string protoFile, std::string weightFile,
+class IInferenceEngineCommon* EngineCommonInit(std::string protoFile, std::string weightFile,
std::string userFile)
{
InferenceTFLite *engine = new InferenceTFLite(protoFile, weightFile, userFile);
diff --git a/src/inference_engine_tflite_private.h b/src/inference_engine_tflite_private.h
index 2af0756..ffa3528 100644
--- a/src/inference_engine_tflite_private.h
+++ b/src/inference_engine_tflite_private.h
@@ -43,12 +43,11 @@
#define LOG_TAG "INFERENCE_ENGINE_TFLITE"
using namespace InferenceEngineInterface::Vision;
-using namespace InferenceEngineInterface::Common;
namespace InferenceEngineImpl {
namespace TFLiteImpl {
-class InferenceTFLite : public IInferenceEngineVision, public IInferenceEngineCommon {
+class InferenceTFLite : public IInferenceEngineVision {
public:
InferenceTFLite(std::string protoFile,
std::string weightFile,
@@ -83,8 +82,6 @@ public:
int CreateInputLayerPassage() override;
- int PrepareInputLayerPassage() override;
-
int PrepareInputLayerPassage(inference_input_type_e type) override;
int Run(cv::Mat tensor) override;