Add VINO Factory, simplely test passed

openvino_param_lib/src/param_manager.cpp

@@ -99,9 +99,9 @@ void operator>>(const YAML::Node & node, ParamManager::InferenceRawData & infer)
   YAML_PARSE(node, "batch", infer.batch)
   YAML_PARSE(node, "confidence_threshold", infer.confidence_threshold)
   YAML_PARSE(node, "enable_roi_constraint", infer.enable_roi_constraint)
-  if (infer.model_type.size() == 0) {
-    infer.model_type = "SSD";
-  }
+  // if (infer.model_type.size() == 0) {
+  //   infer.model_type = "SSD";
+  // }
   slog::info << "Inference Params:name=" << infer.name << slog::endl;
 }
 

openvino_wrapper_lib/CMakeLists.txt

@@ -20,6 +20,7 @@ project(openvino_wrapper_lib)
 ## to use C++17
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_CXX_FLAGS "-std=c++17 ${CMAKE_CXX_FLAGS}")
 ####################################
 

openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/age_gender_detection.hpp

@@ -75,12 +75,13 @@ class AgeGenderDetection : public BaseInference
 {
 public:
   using Result = openvino_wrapper_lib::AgeGenderResult;
-  AgeGenderDetection();
-  ~AgeGenderDetection() override;
+  AgeGenderDetection() {};
+  ~AgeGenderDetection() override {};
+
   /**
    * @brief Load the age gender detection model.
    */
-  void loadNetwork(std::shared_ptr<Models::AgeGenderDetectionModel>);
+  void loadNetwork(const std::shared_ptr<Models::BaseModel>) override;
   /**
    * @brief Enqueue a frame to this class.
    * The frame will be buffered but not infered yet.

openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/base_inference.hpp

@@ -22,7 +22,9 @@
 #include <memory>
 #include <string>
 #include <vector>
+#include "openvino_param_lib/param_manager.hpp"
 #include "openvino_wrapper_lib/engines/engine.hpp"
+#include "openvino_wrapper_lib/engines/engine_manager.hpp"
 #include "openvino_wrapper_lib/models/base_model.hpp"
 #include "openvino_wrapper_lib/slog.hpp"
 #include "openvino/openvino.hpp"
@@ -93,13 +95,21 @@ class Result
 class BaseInference
 {
 public:
-  BaseInference();
-  virtual ~BaseInference();
+  BaseInference() {};
+  virtual ~BaseInference() {};
+
+  virtual void init(const Params::ParamManager::InferenceRawData &val) {};
   /**
    * @brief load the Engine instance that contains the request for
    * running netwrok on target calculation device.
    */
   void loadEngine(std::shared_ptr<Engines::Engine> engine);
+
+  /**
+   * @brief Load the face detection model.
+   */
+  virtual void loadNetwork(const std::shared_ptr<Models::BaseModel>) = 0;
+
   /**
    * @brief Get the loaded Engine instance.
    * @return The loaded Engine instance.

openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/emotions_detection.hpp

@@ -65,12 +65,12 @@ class EmotionsDetection : public BaseInference
 {
 public:
   using Result = openvino_wrapper_lib::EmotionsResult;
-  EmotionsDetection();
-  ~EmotionsDetection() override;
+  EmotionsDetection() {};
+  ~EmotionsDetection() override {};
   /**
    * @brief Load the emotin detection model.
    */
-  void loadNetwork(std::shared_ptr<Models::EmotionDetectionModel>);
+  void loadNetwork(const std::shared_ptr<Models::BaseModel>) override;
   /**
    * @brief Enqueue a frame to this class.
    * The frame will be buffered but not infered yet.

openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/face_detection.hpp

@@ -53,7 +53,8 @@ class FaceDetectionResult : public ObjectDetectionResult
 class FaceDetection : public ObjectDetection
 {
 public:
-  explicit FaceDetection(bool, double);
+  FaceDetection() : ObjectDetection() {};
+  ~FaceDetection() override {};
 };
 }  // namespace openvino_wrapper_lib
 #endif  // OPENVINO_WRAPPER_LIB__INFERENCES__FACE_DETECTION_HPP_

openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/face_reidentification.hpp

@@ -54,12 +54,18 @@ class FaceReidentification : public BaseInference
 {
 public:
   using Result = openvino_wrapper_lib::FaceReidentificationResult;
-  explicit FaceReidentification(double);
-  ~FaceReidentification() override;
+  FaceReidentification() {};
+  ~FaceReidentification() override {};
+
+  /**
+   * @brief initialize params
+   */
+  void init(const Params::ParamManager::InferenceRawData &val) override;
+
   /**
    * @brief Load the face reidentification model.
    */
-  void loadNetwork(std::shared_ptr<Models::FaceReidentificationModel>);
+  void loadNetwork(const std::shared_ptr<Models::BaseModel>) override;
   /**
    * @brief Enqueue a frame to this class.
    * The frame will be buffered but not infered yet.

openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/head_pose_detection.hpp

@@ -79,12 +79,13 @@ class HeadPoseDetection : public BaseInference
 {
 public:
   using Result = openvino_wrapper_lib::HeadPoseResult;
-  HeadPoseDetection();
-  ~HeadPoseDetection() override;
+  HeadPoseDetection() {};
+  ~HeadPoseDetection() override {};
+
   /**
    * @brief Load the headpose detection model.
    */
-  void loadNetwork(std::shared_ptr<Models::HeadPoseDetectionModel>);
+  void loadNetwork(const std::shared_ptr<Models::BaseModel>) override;
   /**
    * @brief Enqueue a frame to this class.
    * The frame will be buffered but not infered yet.

openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/landmarks_detection.hpp

@@ -54,12 +54,12 @@ class LandmarksDetection : public BaseInference
 {
 public:
   using Result = openvino_wrapper_lib::LandmarksDetectionResult;
-  LandmarksDetection();
-  ~LandmarksDetection() override;
+  LandmarksDetection() {};
+  ~LandmarksDetection() override {};
   /**
    * @brief Load the landmarks detection model.
    */
-  void loadNetwork(std::shared_ptr<Models::LandmarksDetectionModel>);
+  void loadNetwork(const std::shared_ptr<Models::BaseModel>) override;
   /**
    * @brief Enqueue a frame to this class.
    * The frame will be buffered but not infered yet.

openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/license_plate_detection.hpp

@@ -54,12 +54,12 @@ class LicensePlateDetection : public BaseInference
 {
 public:
   using Result = openvino_wrapper_lib::LicensePlateDetectionResult;
-  LicensePlateDetection();
-  ~LicensePlateDetection() override;
+  LicensePlateDetection() {};
+  ~LicensePlateDetection() override {};
   /**
    * @brief Load the license plate detection model.
    */
-  void loadNetwork(std::shared_ptr<Models::LicensePlateDetectionModel>);
+  void loadNetwork(const std::shared_ptr<Models::BaseModel>) override;
   /**
    * @brief Enqueue a frame to this class.
    * The frame will be buffered but not infered yet.

openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/object_detection.hpp

@@ -72,7 +72,7 @@ class ObjectDetectionResult : public Result
     return this->confidence_ > s2.confidence_;
   }
 
-private:
+protected:
   std::string label_ = "";
   float confidence_ = -1;
 };
@@ -103,7 +103,7 @@ class ObjectDetectionResultFilter : public BaseFilter
    */
   std::vector<cv::Rect> getFilteredLocations() override;
 
-private:
+protected:
   /**
    * @brief Decide whether a result is valid for label filter condition.
    * @param[in] Result to be decided, filter operator, target label value.
@@ -142,12 +142,17 @@ class ObjectDetection : public BaseInference
 public:
   using Result = openvino_wrapper_lib::ObjectDetectionResult;
   using Filter = openvino_wrapper_lib::ObjectDetectionResultFilter;
-  explicit ObjectDetection(bool, double);
-  ~ObjectDetection() override;
+  ObjectDetection() {};
+  ~ObjectDetection() override {};
+
+  /**
+   * @brief initialize params
+   */
+  void init(const Params::ParamManager::InferenceRawData &val) override;
   /**
    * @brief Load the face detection model.
    */
-  void loadNetwork(std::shared_ptr<Models::ObjectDetectionModel>);
+  void loadNetwork(const std::shared_ptr<Models::BaseModel>) override;
   /**
    * @brief Enqueue a frame to this class.
    * The frame will be buffered but not infered yet.
@@ -195,7 +200,7 @@ class ObjectDetection : public BaseInference
    */
   static double calcIoU(const cv::Rect & box_1, const cv::Rect & box_2);
 
-private:
+protected:
   std::shared_ptr<Models::ObjectDetectionModel> valid_model_;
   std::shared_ptr<Filter> result_filter_;
   std::vector<Result> results_;

openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/object_segmentation.hpp

@@ -72,12 +72,17 @@ class ObjectSegmentation : public BaseInference
 {
 public:
   using Result = openvino_wrapper_lib::ObjectSegmentationResult;
-  explicit ObjectSegmentation(double);
-  ~ObjectSegmentation() override;
+  ObjectSegmentation() {};
+  ~ObjectSegmentation() override {};
+
+  /**
+   * @brief initialize params
+   */
+  void init(const Params::ParamManager::InferenceRawData &val) override;
   /**
    * @brief Load the object segmentation model.
    */
-  void loadNetwork(std::shared_ptr<Models::ObjectSegmentationModel>);
+  void loadNetwork(const std::shared_ptr<Models::BaseModel>) override;
   /**
    * @brief Enqueue a frame to this class.
    * The frame will be buffered but not infered yet.

openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/object_segmentation_maskrcnn.hpp

@@ -72,12 +72,17 @@ class ObjectSegmentationMaskrcnn : public BaseInference
 {
 public:
   using Result = openvino_wrapper_lib::ObjectSegmentationMaskrcnnResult;
-  explicit ObjectSegmentationMaskrcnn(double);
-  ~ObjectSegmentationMaskrcnn() override;
+  ObjectSegmentationMaskrcnn() {};
+  ~ObjectSegmentationMaskrcnn() override {};
+
+  /**
+   * @brief initialize params
+   */
+  void init(const Params::ParamManager::InferenceRawData &val) override;
   /**
    * @brief Load the object segmentation model.
    */
-  void loadNetwork(std::shared_ptr<Models::ObjectSegmentationMaskrcnnModel>);
+  void loadNetwork(const std::shared_ptr<Models::BaseModel>) override;
   /**
    * @brief Enqueue a frame to this class.
    * The frame will be buffered but not infered yet.

openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/person_attribs_detection.hpp

@@ -72,12 +72,17 @@ class PersonAttribsDetection : public BaseInference
 {
 public:
   using Result = openvino_wrapper_lib::PersonAttribsDetectionResult;
-  explicit PersonAttribsDetection(double);
-  ~PersonAttribsDetection() override;
+
+  PersonAttribsDetection() {};
+  ~PersonAttribsDetection() override {}
+  /**
+   * @brief initialize params
+   */
+  void init(const Params::ParamManager::InferenceRawData &val) override;
   /**
    * @brief Load the person attributes detection model.
    */
-  void loadNetwork(std::shared_ptr<Models::PersonAttribsDetectionModel>);
+  void loadNetwork(const std::shared_ptr<Models::BaseModel>) override;
   /**
    * @brief Enqueue a frame to this class.
    * The frame will be buffered but not infered yet.

openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/person_reidentification.hpp

@@ -52,12 +52,16 @@ class PersonReidentification : public BaseInference
 {
 public:
   using Result = openvino_wrapper_lib::PersonReidentificationResult;
-  explicit PersonReidentification(double);
-  ~PersonReidentification() override;
+  PersonReidentification() {};
+  ~PersonReidentification() override {}
+  /**
+   * @brief initialize params
+   */
+  void init(const Params::ParamManager::InferenceRawData &val) override;
   /**
    * @brief Load the face detection model.
    */
-  void loadNetwork(std::shared_ptr<Models::PersonReidentificationModel>);
+  void loadNetwork(const std::shared_ptr<Models::BaseModel>) override;
   /**
    * @brief Enqueue a frame to this class.
    * The frame will be buffered but not infered yet.

openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/vehicle_attribs_detection.hpp

@@ -59,12 +59,12 @@ class VehicleAttribsDetection : public BaseInference
 {
 public:
   using Result = openvino_wrapper_lib::VehicleAttribsDetectionResult;
-  VehicleAttribsDetection();
-  ~VehicleAttribsDetection() override;
+  VehicleAttribsDetection() {};
+  ~VehicleAttribsDetection() override {};
   /**
    * @brief Load the vehicle attributes detection model.
    */
-  void loadNetwork(std::shared_ptr<Models::VehicleAttribsDetectionModel>);
+  void loadNetwork(const std::shared_ptr<Models::BaseModel>) override;
   /**
    * @brief Enqueue a frame to this class.
    * The frame will be buffered but not infered yet.

openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/base_input.hpp

@@ -43,13 +43,19 @@ struct Config
 class BaseInputDevice : public Ros2Handler
 {
 public:
+  BaseInputDevice() = default;
   /**
    * @brief Initialize the input device,
    * for cameras, it will turn the camera on and get ready to read frames,
    * for videos, it will open a video file.
    * @return Whether the input device is successfully turned on.
    */
   virtual bool initialize() = 0;
+  /**
+   * @brief Initialize the input device,
+   * @return Whether the input device is successfully setup.
+   */
+  virtual bool initialize(const std::string &str) = 0;
   /**
    * @brief Initialize the input device with given width and height.
    * @return Whether the input device is successfully turned on.

openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/image_input.hpp

@@ -32,13 +32,22 @@ namespace Input
 class Image : public BaseInputDevice
 {
 public:
+  Image() {};
   explicit Image(const std::string &);
   /**
    * @brief Read an image file from the file path.
    * @param[in] An image file path.
    * @return Whether the input device is successfully turned on.
    */
   bool initialize() override;
+
+  /**
+   * @brief Read an image file from the file path.
+   * @param[in] An image file path.
+   * @return Whether the input device is successfully setup.
+   */
+  bool initialize(const std::string &file) override {file_.assign(file); return initialize();};
+
   /**
    * @brief Initialize the input device with given width and height.
    * No implementation for Image class.

openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/image_topic.hpp

@@ -36,8 +36,9 @@ namespace Input
 class ImageTopic : public BaseInputDevice
 {
 public:
-  ImageTopic(rclcpp::Node::SharedPtr node = nullptr);
+  ImageTopic() {};
   bool initialize() override;
+  bool initialize(const std::string &file) override { return initialize();};
   bool initialize(size_t width, size_t height) override;
   bool read(cv::Mat * frame) override;
 

openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/ip_camera.hpp

@@ -33,6 +33,7 @@ namespace Input
 class IpCamera : public BaseInputDevice
 {
 public:
+  IpCamera() {};
   explicit IpCamera(const std::string & ip_uri) : ip_uri_(ip_uri) {}
   /**
    * @brief Initialize the input device,
@@ -41,6 +42,13 @@ class IpCamera : public BaseInputDevice
    * @return Whether the input device is successfully turned on.
    */
   bool initialize() override;
+  /**
+   * @brief Initialize the input device,
+   * for cameras, it will turn the camera on and get ready to read frames,
+   * for videos, it will open a video file.
+   * @return Whether the input device is successfully setup.
+   */
+  bool initialize(const std::string &ip_uri) override {ip_uri_.assign(ip_uri); return initialize();};
   /**
    * @brief Initialize the input device with given width and height.
    * @return Whether the input device is successfully turned on.