Merge pull request #166 from JoelTsui/master

fix tflite bugs

Former-commit-id: 1fb6a5c4f1cc8815d19591a70fa526a2ec452c52

CMakeLists.txt

@@ -126,6 +126,10 @@ if(CONFIG_TF_SERIALIZER)
     add_definitions(-DCONFIG_TF_SERIALIZER=1)
 endif()
 
+if(CONFIG_TFLITE_SERIALIZER)
+    add_definitions(-DCONFIG_TFLITE_SERIALIZER=1)
+endif()
+
 if(CONFIG_TENGINE_SERIALIZER)
     add_definitions(-DCONFIG_TENGINE_SERIALIZER=1)
 endif()

operator/include/operator/detection_postprocess.hpp

@@ -39,7 +39,7 @@ public:
     DetectionPostProcess(const DetectionPostProcess& src) = default;
 
     virtual ~DetectionPostProcess() {}
-    bool InferShape(const std::vector<TEngine::TShape>& ishape, std::vector<TEngine::TShape>& oshape);
+    bool InferShape(const std::vector<TEngine::TShape>& ishape, std::vector<TEngine::TShape>& oshape, int layout) override;
     void SetSchema(void) override;
 };
 

operator/operator/detection_postprocess.cpp

@@ -25,7 +25,7 @@
 
 namespace TEngine {
 
-bool DetectionPostProcess::InferShape(const std::vector<TEngine::TShape>& ishape, std::vector<TEngine::TShape>& oshape)
+bool DetectionPostProcess::InferShape(const std::vector<TEngine::TShape>& ishape, std::vector<TEngine::TShape>& oshape, int layout)
 {
     int max_detections = param_.max_detections;
     int max_classes_per_detection = param_.max_classes_per_detection;