Deletion of related methods as inherited class changing. 32/212532/3 submit/tizen/20190905.022044
authorHyunsoo Park <hance.park@samsung.com>
Thu, 22 Aug 2019 11:26:53 +0000 (20:26 +0900)
committerHyunsoo Park <hance.park@samsung.com>
Thu, 5 Sep 2019 01:17:27 +0000 (10:17 +0900)
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>
packaging/inference-engine-tflite.spec
src/inference_engine_tflite.cpp
src/inference_engine_tflite_private.h

index e3969ce25c51ea182503eac3fd73b753ee44e326..9ace9ba2c0713617b4f8009e5ad845b97a2536f8 100644 (file)
@@ -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
index 60c7c16a427b6a99a61c0e3087aa0ea2f09d941b..ed611f3ff299aa1d50f2ed8e0e695063f268ebc9 100644 (file)
@@ -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);
index 2af0756f6f155104910b682368ab12c8ff0d007f..ffa3528929314aab8439784d3d67adeb8aa63eb7 100644 (file)
 #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;