diff --git a/README.md b/README.md index f31964bc..d21c26e9 100644 --- a/README.md +++ b/README.md @@ -249,7 +249,7 @@ One-step installation scripts are provided for the dependencies' installation. P ``` Run example application with an absolute path of an image on another console: ```bash - rosrun dynamic_vino_sample image_object_client ~/catkin_ws/src/ros_openvino_toolkit/data/images/car.png + rosrun vino_sample image_object_client ~/catkin_ws/src/ros_openvino_toolkit/data/images/car.png ``` * run face detection service sample code input from Image Run image processing service: @@ -258,7 +258,7 @@ One-step installation scripts are provided for the dependencies' installation. P ``` Run example application with an absolute path of an image on another console: ```bash - rosrun dynamic_vino_sample image_people_client ~/catkin_ws/src/ros_openvino_toolkit/data/images/team.jpg + rosrun vino_sample image_people_client ~/catkin_ws/src/ros_openvino_toolkit/data/images/team.jpg ``` # TODO Features * Support **result filtering** for inference process, so that the inference results can be filtered to different subsidiary inference. For example, given an image, firstly we do Object Detection on it, secondly we pass cars to vehicle brand recognition and pass license plate to license number recognition. diff --git a/doc/BINARY_VERSION_README.md b/doc/BINARY_VERSION_README.md index 63b11f76..2bb115e1 100644 --- a/doc/BINARY_VERSION_README.md +++ b/doc/BINARY_VERSION_README.md @@ -204,7 +204,7 @@ sudo ln -s ~/catkin_ws/src/ros_openvino_toolkit /opt/openvino_toolkit/ros_openvi ``` Run example application with an absolute path of an image on another console: ```bash - rosrun dynamic_vino_sample image_object_client ~/catkin_ws/src/ros_openvino_toolkit/data/images/car.png + rosrun vino_sample image_object_client ~/catkin_ws/src/ros_openvino_toolkit/data/images/car.png ``` * run people detection service sample code input from Image Run image processing service: @@ -213,7 +213,7 @@ sudo ln -s ~/catkin_ws/src/ros_openvino_toolkit /opt/openvino_toolkit/ros_openvi ``` Run example application with an absolute path of an image on another console: ```bash - rosrun dynamic_vino_sample image_people_client ~/catkin_ws/src/ros_openvino_toolkit/data/images/team.jpg + rosrun vino_sample image_people_client ~/catkin_ws/src/ros_openvino_toolkit/data/images/team.jpg ``` ## 6. Known Issues * Possible problems diff --git a/dynamic_vino_lib/CMakeLists.txt b/vino_core_lib/CMakeLists.txt similarity index 99% rename from dynamic_vino_lib/CMakeLists.txt rename to vino_core_lib/CMakeLists.txt index 8439692d..ebbdc780 100644 --- a/dynamic_vino_lib/CMakeLists.txt +++ b/vino_core_lib/CMakeLists.txt @@ -14,7 +14,7 @@ cmake_minimum_required (VERSION 2.8.3) -project(dynamic_vino_lib) +project(vino_core_lib) message(STATUS "Looking for inference engine configuration file at: ${CMAKE_PREFIX_PATH}") find_package(InferenceEngine 1.1) diff --git a/dynamic_vino_lib/Doxyfile b/vino_core_lib/Doxyfile similarity index 100% rename from dynamic_vino_lib/Doxyfile rename to vino_core_lib/Doxyfile diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/args_helper.h b/vino_core_lib/include/vino_core_lib/args_helper.h similarity index 100% rename from dynamic_vino_lib/include/dynamic_vino_lib/args_helper.h rename to vino_core_lib/include/vino_core_lib/args_helper.h diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/common.h b/vino_core_lib/include/vino_core_lib/common.h similarity index 100% rename from dynamic_vino_lib/include/dynamic_vino_lib/common.h rename to vino_core_lib/include/vino_core_lib/common.h diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/engines/engine.h b/vino_core_lib/include/vino_core_lib/engines/engine.h similarity index 90% rename from dynamic_vino_lib/include/dynamic_vino_lib/engines/engine.h rename to vino_core_lib/include/vino_core_lib/engines/engine.h index 5eb284a2..b548c395 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/engines/engine.h +++ b/vino_core_lib/include/vino_core_lib/engines/engine.h @@ -18,12 +18,12 @@ * @brief A header file with declaration for NetworkEngine class * @file engine.h */ -#ifndef DYNAMIC_VINO_LIB_ENGINES_ENGINE_H -#define DYNAMIC_VINO_LIB_ENGINES_ENGINE_H +#ifndef VINO_CORE_LIB_ENGINES_ENGINE_H +#define VINO_CORE_LIB_ENGINES_ENGINE_H #pragma once -#include "dynamic_vino_lib/models/base_model.h" +#include "vino_core_lib/models/base_model.h" #include "inference_engine.hpp" /** @@ -65,4 +65,4 @@ class Engine }; } // namespace Engines -#endif // DYNAMIC_VINO_LIB_ENGINES_ENGINE_H +#endif // VINO_CORE_LIB_ENGINES_ENGINE_H diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/factory.h b/vino_core_lib/include/vino_core_lib/factory.h similarity index 92% rename from dynamic_vino_lib/include/dynamic_vino_lib/factory.h rename to vino_core_lib/include/vino_core_lib/factory.h index 98210efb..cc76fba4 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/factory.h +++ b/vino_core_lib/include/vino_core_lib/factory.h @@ -19,16 +19,16 @@ * @file factory.h */ -#ifndef DYNAMIC_VINO_LIB_FACTORY_H -#define DYNAMIC_VINO_LIB_FACTORY_H +#ifndef VINO_CORE_LIB_FACTORY_H +#define VINO_CORE_LIB_FACTORY_H #include #include #include -#include "dynamic_vino_lib/common.h" -#include "dynamic_vino_lib/inputs/base_input.h" +#include "vino_core_lib/common.h" +#include "vino_core_lib/inputs/base_input.h" #include "extension/ext_list.hpp" /** @@ -67,4 +67,4 @@ class Factory const std::string& custom_cldnn_message, bool performance_message); }; -#endif // DYNAMIC_VINO_LIB_FACTORY_H +#endif // VINO_CORE_LIB_FACTORY_H diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/age_gender_detection.h b/vino_core_lib/include/vino_core_lib/inferences/age_gender_detection.h similarity index 86% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/age_gender_detection.h rename to vino_core_lib/include/vino_core_lib/inferences/age_gender_detection.h index 6c1b2749..9b07496a 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/age_gender_detection.h +++ b/vino_core_lib/include/vino_core_lib/inferences/age_gender_detection.h @@ -18,16 +18,16 @@ * @brief A header file with declaration for AgeGenderDetection Class * @file age_gender_recignition.h */ -#ifndef DYNAMIC_VINO_LIB_INFERENCES_AGE_GENDER_DETECTION_H -#define DYNAMIC_VINO_LIB_INFERENCES_AGE_GENDER_DETECTION_H +#ifndef VINO_CORE_LIB_INFERENCES_AGE_GENDER_DETECTION_H +#define VINO_CORE_LIB_INFERENCES_AGE_GENDER_DETECTION_H #include #include #include -#include "dynamic_vino_lib/engines/engine.h" -#include "dynamic_vino_lib/inferences/base_inference.h" -#include "dynamic_vino_lib/models/age_gender_detection_model.h" +#include "vino_core_lib/engines/engine.h" +#include "vino_core_lib/inferences/base_inference.h" +#include "vino_core_lib/models/age_gender_detection_model.h" #include "inference_engine.hpp" #include "opencv2/opencv.hpp" @@ -36,7 +36,7 @@ namespace Outputs class BaseOuput; } -namespace dynamic_vino_lib +namespace vino_core_lib { /** * @class AgeGenderResult @@ -76,7 +76,7 @@ class AgeGenderResult : public Result class AgeGenderDetection : public BaseInference { public: - using Result = dynamic_vino_lib::AgeGenderResult; + using Result = vino_core_lib::AgeGenderResult; AgeGenderDetection(); ~AgeGenderDetection() override; /** @@ -114,7 +114,7 @@ class AgeGenderDetection : public BaseInference * to the frame generated by the input device. * @param[in] idx The index of the result. */ - const dynamic_vino_lib::Result* getLocationResult(int idx) const override; + const vino_core_lib::Result* getLocationResult(int idx) const override; /** * @brief Get the name of the Inference instance. * @return The name of the Inference instance. @@ -131,6 +131,6 @@ class AgeGenderDetection : public BaseInference std::shared_ptr valid_model_; std::vector results_; }; -} // namespace dynamic_vino_lib +} // namespace vino_core_lib -#endif // DYNAMIC_VINO_LIB_INFERENCES_AGE_GENDER_DETECTION_H +#endif // VINO_CORE_LIB_INFERENCES_AGE_GENDER_DETECTION_H diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_inference.h b/vino_core_lib/include/vino_core_lib/inferences/base_inference.h similarity index 93% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_inference.h rename to vino_core_lib/include/vino_core_lib/inferences/base_inference.h index e2b569d9..6e3011e2 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_inference.h +++ b/vino_core_lib/include/vino_core_lib/inferences/base_inference.h @@ -18,14 +18,14 @@ * @brief A header file with declaration for BaseInference Class * @file base_inference.h */ -#ifndef DYNAMIC_VINO_LIB_INFERENCES_BASE_INFERENCE_H -#define DYNAMIC_VINO_LIB_INFERENCES_BASE_INFERENCE_H +#ifndef VINO_CORE_LIB_INFERENCES_BASE_INFERENCE_H +#define VINO_CORE_LIB_INFERENCES_BASE_INFERENCE_H #include #include -#include "dynamic_vino_lib/engines/engine.h" -#include "dynamic_vino_lib/slog.h" +#include "vino_core_lib/engines/engine.h" +#include "vino_core_lib/slog.h" #include "inference_engine.hpp" #include "opencv2/opencv.hpp" @@ -73,7 +73,7 @@ void matU8ToBlob(const cv::Mat& orig_image, InferenceEngine::Blob::Ptr& blob, } } -namespace dynamic_vino_lib +namespace vino_core_lib { /** * @class Result @@ -155,7 +155,7 @@ class BaseInference * to the frame generated by the input device. * @param[in] idx The index of the result. */ - virtual const dynamic_vino_lib::Result* getLocationResult(int idx) const = 0; + virtual const vino_core_lib::Result* getLocationResult(int idx) const = 0; /** * @brief Get the name of the Inference instance. * @return The name of the Inference instance. @@ -198,6 +198,6 @@ class BaseInference int enqueued_frames = 0; bool results_fetched_ = false; }; -} // namespace dynamic_vino_lib +} // namespace vino_core_lib -#endif // DYNAMIC_VINO_LIB_INFERENCES_BASE_INFERENCE_H +#endif // VINO_CORE_LIB_INFERENCES_BASE_INFERENCE_H diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/emotions_detection.h b/vino_core_lib/include/vino_core_lib/inferences/emotions_detection.h similarity index 86% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/emotions_detection.h rename to vino_core_lib/include/vino_core_lib/inferences/emotions_detection.h index bb4e1f29..f774dab5 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/emotions_detection.h +++ b/vino_core_lib/include/vino_core_lib/inferences/emotions_detection.h @@ -18,16 +18,16 @@ * @brief A header file with declaration for EmotionsDetection Class * @file emotions_detection.h */ -#ifndef DYNAMIC_VINO_LIB_INFERENCES_EMOTIONS_DETECTION_H -#define DYNAMIC_VINO_LIB_INFERENCES_EMOTIONS_DETECTION_H +#ifndef VINO_CORE_LIB_INFERENCES_EMOTIONS_DETECTION_H +#define VINO_CORE_LIB_INFERENCES_EMOTIONS_DETECTION_H #include #include #include -#include "dynamic_vino_lib/engines/engine.h" -#include "dynamic_vino_lib/inferences/base_inference.h" -#include "dynamic_vino_lib/models/emotion_detection_model.h" +#include "vino_core_lib/engines/engine.h" +#include "vino_core_lib/inferences/base_inference.h" +#include "vino_core_lib/models/emotion_detection_model.h" #include "inference_engine.hpp" #include "opencv2/opencv.hpp" @@ -35,7 +35,7 @@ namespace Outputs { class BaseOuput; } -namespace dynamic_vino_lib +namespace vino_core_lib { /** * @class EmotionResult @@ -67,7 +67,7 @@ class EmotionsResult : public Result class EmotionsDetection : public BaseInference { public: - using Result = dynamic_vino_lib::EmotionsResult; + using Result = vino_core_lib::EmotionsResult; EmotionsDetection(); ~EmotionsDetection() override; /** @@ -105,7 +105,7 @@ class EmotionsDetection : public BaseInference * to the frame generated by the input device. * @param[in] idx The index of the result. */ - const dynamic_vino_lib::Result* getLocationResult(int idx) const override; + const vino_core_lib::Result* getLocationResult(int idx) const override; /** * @brief Get the name of the Inference instance. * @return The name of the Inference instance. @@ -122,6 +122,6 @@ class EmotionsDetection : public BaseInference std::shared_ptr valid_model_; std::vector results_; }; -} // namespace dynamic_vino_lib +} // namespace vino_core_lib -#endif // DYNAMIC_VINO_LIB_INFERENCES_EMOTIONS_DETECTION_H +#endif // VINO_CORE_LIB_INFERENCES_EMOTIONS_DETECTION_H diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/face_detection.h b/vino_core_lib/include/vino_core_lib/inferences/face_detection.h similarity index 87% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/face_detection.h rename to vino_core_lib/include/vino_core_lib/inferences/face_detection.h index 7addb3a5..ef692f56 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/face_detection.h +++ b/vino_core_lib/include/vino_core_lib/inferences/face_detection.h @@ -18,8 +18,8 @@ * @brief A header file with declaration for FaceDetection Class * @file face_detection.h */ -#ifndef DYNAMIC_VINO_LIB_INFERENCES_FACE_DETECTION_H -#define DYNAMIC_VINO_LIB_INFERENCES_FACE_DETECTION_H +#ifndef VINO_CORE_LIB_INFERENCES_FACE_DETECTION_H +#define VINO_CORE_LIB_INFERENCES_FACE_DETECTION_H #include #include @@ -30,14 +30,14 @@ #include #include -#include "dynamic_vino_lib/engines/engine.h" -#include "dynamic_vino_lib/inferences/base_inference.h" -#include "dynamic_vino_lib/models/face_detection_model.h" +#include "vino_core_lib/engines/engine.h" +#include "vino_core_lib/inferences/base_inference.h" +#include "vino_core_lib/models/face_detection_model.h" #include "inference_engine.hpp" #include "opencv2/opencv.hpp" // namespace -namespace dynamic_vino_lib +namespace vino_core_lib { /** * @class FaceDetectionResult @@ -73,7 +73,7 @@ class FaceDetectionResult : public Result class FaceDetection : public BaseInference { public: - using Result = dynamic_vino_lib::FaceDetectionResult; + using Result = vino_core_lib::FaceDetectionResult; explicit FaceDetection(double); ~FaceDetection() override; /** @@ -111,7 +111,7 @@ class FaceDetection : public BaseInference * to the frame generated by the input device. * @param[in] idx The index of the result. */ - const dynamic_vino_lib::Result* getLocationResult(int idx) const override; + const vino_core_lib::Result* getLocationResult(int idx) const override; /** * @brief Show the observed detection result either through image window or ROS topic. @@ -132,5 +132,5 @@ class FaceDetection : public BaseInference int object_size_; double show_output_thresh_ = 0; }; -} // namespace dynamic_vino_lib -#endif // DYNAMIC_VINO_LIB_INFERENCES_FACE_DETECTION_H +} // namespace vino_core_lib +#endif // VINO_CORE_LIB_INFERENCES_FACE_DETECTION_H diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/head_pose_detection.h b/vino_core_lib/include/vino_core_lib/inferences/head_pose_detection.h similarity index 87% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/head_pose_detection.h rename to vino_core_lib/include/vino_core_lib/inferences/head_pose_detection.h index 125d6207..87996a63 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/head_pose_detection.h +++ b/vino_core_lib/include/vino_core_lib/inferences/head_pose_detection.h @@ -18,20 +18,20 @@ * @brief A header file with declaration for FaceDetection Class * @file head_pose_detection.h */ -#ifndef DYNAMIC_VINO_LIB_INFERENCES_HEAD_POSE_DETECTION_H -#define DYNAMIC_VINO_LIB_INFERENCES_HEAD_POSE_DETECTION_H +#ifndef VINO_CORE_LIB_INFERENCES_HEAD_POSE_DETECTION_H +#define VINO_CORE_LIB_INFERENCES_HEAD_POSE_DETECTION_H #include #include #include -#include "dynamic_vino_lib/engines/engine.h" -#include "dynamic_vino_lib/inferences/base_inference.h" -#include "dynamic_vino_lib/models/head_pose_detection_model.h" +#include "vino_core_lib/engines/engine.h" +#include "vino_core_lib/inferences/base_inference.h" +#include "vino_core_lib/models/head_pose_detection_model.h" #include "inference_engine.hpp" #include "opencv2/opencv.hpp" -namespace dynamic_vino_lib +namespace vino_core_lib { /** * @class HeadPoseResult @@ -80,7 +80,7 @@ class HeadPoseResult : public Result class HeadPoseDetection : public BaseInference { public: - using Result = dynamic_vino_lib::HeadPoseResult; + using Result = vino_core_lib::HeadPoseResult; HeadPoseDetection(); ~HeadPoseDetection() override; /** @@ -118,7 +118,7 @@ class HeadPoseDetection : public BaseInference * to the frame generated by the input device. * @param[in] idx The index of the result. */ - const dynamic_vino_lib::Result* getLocationResult(int idx) const override; + const vino_core_lib::Result* getLocationResult(int idx) const override; /** * @brief Get the name of the Inference instance. * @return The name of the Inference instance. @@ -135,5 +135,5 @@ class HeadPoseDetection : public BaseInference std::shared_ptr valid_model_; std::vector results_; }; -} // namespace dynamic_vino_lib -#endif // DYNAMIC_VINO_LIB_INFERENCES_HEAD_POSE_DETECTION_H +} // namespace vino_core_lib +#endif // VINO_CORE_LIB_INFERENCES_HEAD_POSE_DETECTION_H diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_detection.h b/vino_core_lib/include/vino_core_lib/inferences/object_detection.h similarity index 87% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_detection.h rename to vino_core_lib/include/vino_core_lib/inferences/object_detection.h index 6eb50efa..fa4c314d 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_detection.h +++ b/vino_core_lib/include/vino_core_lib/inferences/object_detection.h @@ -17,21 +17,21 @@ * @brief A header file with declaration for ObjectDetection Class * @file object_detection.hpp */ -#ifndef DYNAMIC_VINO_LIB_INFERENCES_OBJECT_DETECTION_H -#define DYNAMIC_VINO_LIB_INFERENCES_OBJECT_DETECTION_H +#ifndef VINO_CORE_LIB_INFERENCES_OBJECT_DETECTION_H +#define VINO_CORE_LIB_INFERENCES_OBJECT_DETECTION_H #include #include #include #include #include #include -#include "dynamic_vino_lib/models/object_detection_model.h" -#include "dynamic_vino_lib/engines/engine.h" -#include "dynamic_vino_lib/inferences/base_inference.h" +#include "vino_core_lib/models/object_detection_model.h" +#include "vino_core_lib/engines/engine.h" +#include "vino_core_lib/inferences/base_inference.h" #include "inference_engine.hpp" #include "opencv2/opencv.hpp" // namespace -namespace dynamic_vino_lib { +namespace vino_core_lib { /** * @class ObjectDetectionResult * @brief Class for storing and processing face detection result. @@ -56,7 +56,7 @@ class ObjectDetectionResult : public Result { */ class ObjectDetection : public BaseInference { public: - using Result = dynamic_vino_lib::ObjectDetectionResult; + using Result = vino_core_lib::ObjectDetectionResult; explicit ObjectDetection(bool,double); ~ObjectDetection() override; /** @@ -94,7 +94,7 @@ class ObjectDetection : public BaseInference { * to the frame generated by the input device. * @param[in] idx The index of the result. */ - const dynamic_vino_lib::Result* getLocationResult(int idx) const override; + const vino_core_lib::Result* getLocationResult(int idx) const override; /** * @brief Show the observed detection result either through image window or ROS topic. @@ -114,5 +114,5 @@ class ObjectDetection : public BaseInference { int object_size_; double show_output_thresh_ = 0; }; -} // namespace dynamic_vino_lib -#endif // DYNAMIC_VINO_LIB_INFERENCES_OBJECT_DETECTION_H +} // namespace vino_core_lib +#endif // VINO_CORE_LIB_INFERENCES_OBJECT_DETECTION_H diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_segmentation.h b/vino_core_lib/include/vino_core_lib/inferences/object_segmentation.h similarity index 86% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_segmentation.h rename to vino_core_lib/include/vino_core_lib/inferences/object_segmentation.h index e6100e1a..29bfe805 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_segmentation.h +++ b/vino_core_lib/include/vino_core_lib/inferences/object_segmentation.h @@ -16,21 +16,21 @@ * @brief A header file with declaration for ObjectSegmentation Class * @file object_detection.hpp */ -#ifndef DYNAMIC_VINO_LIB__INFERENCES__OBJECT_SEGMENTATION_HPP_ -#define DYNAMIC_VINO_LIB__INFERENCES__OBJECT_SEGMENTATION_HPP_ +#ifndef VINO_CORE_LIB__INFERENCES__OBJECT_SEGMENTATION_HPP_ +#define VINO_CORE_LIB__INFERENCES__OBJECT_SEGMENTATION_HPP_ #include #include #include #include #include #include -#include "dynamic_vino_lib/models/object_segmentation_model.h" -#include "dynamic_vino_lib/engines/engine.h" -#include "dynamic_vino_lib/inferences/base_inference.h" +#include "vino_core_lib/models/object_segmentation_model.h" +#include "vino_core_lib/engines/engine.h" +#include "vino_core_lib/inferences/base_inference.h" #include "inference_engine.hpp" #include "opencv2/opencv.hpp" // namespace -namespace dynamic_vino_lib +namespace vino_core_lib { /** * @class ObjectSegmentationResult @@ -70,7 +70,7 @@ class ObjectSegmentationResult : public Result class ObjectSegmentation : public BaseInference { public: - using Result = dynamic_vino_lib::ObjectSegmentationResult; + using Result = vino_core_lib::ObjectSegmentationResult; explicit ObjectSegmentation(double); ~ObjectSegmentation() override; /** @@ -108,7 +108,7 @@ class ObjectSegmentation : public BaseInference * to the frame generated by the input device. * @param[in] idx The index of the result. */ - const dynamic_vino_lib::Result * getLocationResult(int idx) const override; + const vino_core_lib::Result * getLocationResult(int idx) const override; /** * @brief Show the observed detection result either through image window or ROS topic. @@ -127,5 +127,5 @@ class ObjectSegmentation : public BaseInference int height_ = 0; double show_output_thresh_ = 0; }; -} // namespace dynamic_vino_lib -#endif // DYNAMIC_VINO_LIB__INFERENCES__OBJECT_SEGMENTATION_HPP_ +} // namespace vino_core_lib +#endif // VINO_CORE_LIB__INFERENCES__OBJECT_SEGMENTATION_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/person_reidentification.h b/vino_core_lib/include/vino_core_lib/inferences/person_reidentification.h similarity index 86% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/person_reidentification.h rename to vino_core_lib/include/vino_core_lib/inferences/person_reidentification.h index 72b9b7a0..7605b1ff 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/person_reidentification.h +++ b/vino_core_lib/include/vino_core_lib/inferences/person_reidentification.h @@ -16,18 +16,18 @@ * @brief A header file with declaration for PersonReidentification Class * @file person_reidentification.hpp */ -#ifndef DYNAMIC_VINO_LIB__INFERENCES__PERSON_REIDENTIFICATION_HPP_ -#define DYNAMIC_VINO_LIB__INFERENCES__PERSON_REIDENTIFICATION_HPP_ +#ifndef VINO_CORE_LIB__INFERENCES__PERSON_REIDENTIFICATION_HPP_ +#define VINO_CORE_LIB__INFERENCES__PERSON_REIDENTIFICATION_HPP_ #include #include #include -#include "dynamic_vino_lib/models/person_reidentification_model.h" -#include "dynamic_vino_lib/engines/engine.h" -#include "dynamic_vino_lib/inferences/base_inference.h" +#include "vino_core_lib/models/person_reidentification_model.h" +#include "vino_core_lib/engines/engine.h" +#include "vino_core_lib/inferences/base_inference.h" #include "inference_engine.hpp" #include "opencv2/opencv.hpp" // namespace -namespace dynamic_vino_lib +namespace vino_core_lib { /** * @class PersonReidentificationResult @@ -50,7 +50,7 @@ class PersonReidentificationResult : public Result class PersonReidentification : public BaseInference { public: - using Result = dynamic_vino_lib::PersonReidentificationResult; + using Result = vino_core_lib::PersonReidentificationResult; explicit PersonReidentification(double); ~PersonReidentification() override; /** @@ -88,7 +88,7 @@ class PersonReidentification : public BaseInference * to the frame generated by the input device. * @param[in] idx The index of the result. */ - const dynamic_vino_lib::Result * getLocationResult(int idx) const override; + const vino_core_lib::Result * getLocationResult(int idx) const override; /** * @brief Show the observed detection result either through image window or ROS topic. @@ -118,5 +118,5 @@ class PersonReidentification : public BaseInference std::vector> recorded_persons_; double match_thresh_ = 0; }; -} // namespace dynamic_vino_lib -#endif // DYNAMIC_VINO_LIB__INFERENCES__PERSON_REIDENTIFICATION_HPP_ +} // namespace vino_core_lib +#endif // VINO_CORE_LIB__INFERENCES__PERSON_REIDENTIFICATION_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/base_input.h b/vino_core_lib/include/vino_core_lib/inputs/base_input.h similarity index 95% rename from dynamic_vino_lib/include/dynamic_vino_lib/inputs/base_input.h rename to vino_core_lib/include/vino_core_lib/inputs/base_input.h index e300fdee..54fab55f 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/base_input.h +++ b/vino_core_lib/include/vino_core_lib/inputs/base_input.h @@ -18,11 +18,11 @@ * @brief A header file with declaration for BaseInput Class * @file base_input.h */ -#ifndef DYNAMIC_VINO_LIB_INPUTS_BASE_INPUT_H -#define DYNAMIC_VINO_LIB_INPUTS_BASE_INPUT_H +#ifndef VINO_CORE_LIB_INPUTS_BASE_INPUT_H +#define VINO_CORE_LIB_INPUTS_BASE_INPUT_H #include -#include "dynamic_vino_lib/inputs/ros_handler.h" +#include "vino_core_lib/inputs/ros_handler.h" /** * @class BaseInputDevice @@ -131,4 +131,4 @@ class BaseInputDevice : public Ros2Handler std::string frame_id_; }; } // namespace Input -#endif // DYNAMIC_VINO_LIB_INPUTS_BASE_INPUT_H +#endif // VINO_CORE_LIB_INPUTS_BASE_INPUT_H diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/image_input.h b/vino_core_lib/include/vino_core_lib/inputs/image_input.h similarity index 90% rename from dynamic_vino_lib/include/dynamic_vino_lib/inputs/image_input.h rename to vino_core_lib/include/vino_core_lib/inputs/image_input.h index afdbd619..536511e3 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/image_input.h +++ b/vino_core_lib/include/vino_core_lib/inputs/image_input.h @@ -18,12 +18,12 @@ * @brief A header file with declaration for Image class * @file file_input.h */ -#ifndef DYNAMIC_VINO_LIB_INPUTS_IMAGE_INPUT_H -#define DYNAMIC_VINO_LIB_INPUTS_IMAGE_INPUT_H +#ifndef VINO_CORE_LIB_INPUTS_IMAGE_INPUT_H +#define VINO_CORE_LIB_INPUTS_IMAGE_INPUT_H #include #include -#include "dynamic_vino_lib/inputs/base_input.h" +#include "vino_core_lib/inputs/base_input.h" namespace Input { @@ -72,4 +72,4 @@ class Image : public BaseInputDevice }; } // namespace Input -#endif // DYNAMIC_VINO_LIB_INPUTS_IMAGE_INPUT_H +#endif // VINO_CORE_LIB_INPUTS_IMAGE_INPUT_H diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/realsense_camera.h b/vino_core_lib/include/vino_core_lib/inputs/realsense_camera.h similarity index 90% rename from dynamic_vino_lib/include/dynamic_vino_lib/inputs/realsense_camera.h rename to vino_core_lib/include/vino_core_lib/inputs/realsense_camera.h index f4a87d0f..3e51690b 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/realsense_camera.h +++ b/vino_core_lib/include/vino_core_lib/inputs/realsense_camera.h @@ -19,12 +19,12 @@ * @file realsense_camera.h */ -#ifndef DYNAMIC_VINO_LIB_INPUTS_REALSENSE_CAMERA_H -#define DYNAMIC_VINO_LIB_INPUTS_REALSENSE_CAMERA_H +#ifndef VINO_CORE_LIB_INPUTS_REALSENSE_CAMERA_H +#define VINO_CORE_LIB_INPUTS_REALSENSE_CAMERA_H #include #include -#include "dynamic_vino_lib/inputs/base_input.h" +#include "vino_core_lib/inputs/base_input.h" namespace Input { @@ -69,4 +69,4 @@ class RealSenseCamera : public BaseInputDevice }; } // namespace Input -#endif // DYNAMIC_VINO_LIB_INPUTS_REALSENSE_CAMERA_H +#endif // VINO_CORE_LIB_INPUTS_REALSENSE_CAMERA_H diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/realsense_camera_topic.h b/vino_core_lib/include/vino_core_lib/inputs/realsense_camera_topic.h similarity index 87% rename from dynamic_vino_lib/include/dynamic_vino_lib/inputs/realsense_camera_topic.h rename to vino_core_lib/include/vino_core_lib/inputs/realsense_camera_topic.h index 8d5fbf9d..a03f83d0 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/realsense_camera_topic.h +++ b/vino_core_lib/include/vino_core_lib/inputs/realsense_camera_topic.h @@ -19,8 +19,8 @@ * @file realsense_camera.h */ -#ifndef DYNAMIC_VINO_LIB_INPUTS_REALSENSE_CAMERA_TOPIC_H -#define DYNAMIC_VINO_LIB_INPUTS_REALSENSE_CAMERA_TOPIC_H +#ifndef VINO_CORE_LIB_INPUTS_REALSENSE_CAMERA_TOPIC_H +#define VINO_CORE_LIB_INPUTS_REALSENSE_CAMERA_TOPIC_H #include #include @@ -30,7 +30,7 @@ #include -#include "dynamic_vino_lib/inputs/base_input.h" +#include "vino_core_lib/inputs/base_input.h" namespace Input { @@ -64,4 +64,4 @@ class RealSenseCameraTopic : public BaseInputDevice }; } // namespace Input -#endif // DYNAMIC_VINO_LIB_INPUTS_REALSENSE_CAMERA_TOPIC_H_ +#endif // VINO_CORE_LIB_INPUTS_REALSENSE_CAMERA_TOPIC_H_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/ros_handler.h b/vino_core_lib/include/vino_core_lib/inputs/ros_handler.h similarity index 100% rename from dynamic_vino_lib/include/dynamic_vino_lib/inputs/ros_handler.h rename to vino_core_lib/include/vino_core_lib/inputs/ros_handler.h diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/standard_camera.h b/vino_core_lib/include/vino_core_lib/inputs/standard_camera.h similarity index 90% rename from dynamic_vino_lib/include/dynamic_vino_lib/inputs/standard_camera.h rename to vino_core_lib/include/vino_core_lib/inputs/standard_camera.h index 8928a741..b6581625 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/standard_camera.h +++ b/vino_core_lib/include/vino_core_lib/inputs/standard_camera.h @@ -19,11 +19,11 @@ * @file standard_camera.h */ -#ifndef DYNAMIC_VINO_LIB_INPUTS_STANDARD_CAMERA_H -#define DYNAMIC_VINO_LIB_INPUTS_STANDARD_CAMERA_H +#ifndef VINO_CORE_LIB_INPUTS_STANDARD_CAMERA_H +#define VINO_CORE_LIB_INPUTS_STANDARD_CAMERA_H #include -#include "dynamic_vino_lib/inputs/base_input.h" +#include "vino_core_lib/inputs/base_input.h" namespace Input { @@ -63,4 +63,4 @@ class StandardCamera : public BaseInputDevice cv::VideoCapture cap; }; } // namespace Input -#endif // DYNAMIC_VINO_LIB_INPUTS_STANDARD_CAMERA_H +#endif // VINO_CORE_LIB_INPUTS_STANDARD_CAMERA_H diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/video_input.h b/vino_core_lib/include/vino_core_lib/inputs/video_input.h similarity index 90% rename from dynamic_vino_lib/include/dynamic_vino_lib/inputs/video_input.h rename to vino_core_lib/include/vino_core_lib/inputs/video_input.h index d1ae6f47..05875cc0 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/video_input.h +++ b/vino_core_lib/include/vino_core_lib/inputs/video_input.h @@ -18,12 +18,12 @@ * @brief A header file with declaration for Video class * @file video_input.h */ -#ifndef DYNAMIC_VINO_LIB_INPUTS_VIDEO_INPUT_H -#define DYNAMIC_VINO_LIB_INPUTS_VIDEO_INPUT_H +#ifndef VINO_CORE_LIB_INPUTS_VIDEO_INPUT_H +#define VINO_CORE_LIB_INPUTS_VIDEO_INPUT_H #include #include -#include "dynamic_vino_lib/inputs/base_input.h" +#include "vino_core_lib/inputs/base_input.h" namespace Input { @@ -69,4 +69,4 @@ class Video : public BaseInputDevice }; } // namespace Input -#endif // DYNAMIC_VINO_LIB_INPUTS_VIDEO_INPUT_H +#endif // VINO_CORE_LIB_INPUTS_VIDEO_INPUT_H diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/age_gender_detection_model.h b/vino_core_lib/include/vino_core_lib/models/age_gender_detection_model.h similarity index 89% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/age_gender_detection_model.h rename to vino_core_lib/include/vino_core_lib/models/age_gender_detection_model.h index 586b0e86..c24a0977 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/age_gender_detection_model.h +++ b/vino_core_lib/include/vino_core_lib/models/age_gender_detection_model.h @@ -19,11 +19,11 @@ * @file age_gender_detection_model.h */ -#ifndef DYNAMIC_VINO_LIB_MODELS_AGE_GENDER_DETECTION_MODEL_H -#define DYNAMIC_VINO_LIB_MODELS_AGE_GENDER_DETECTION_MODEL_H +#ifndef VINO_CORE_LIB_MODELS_AGE_GENDER_DETECTION_MODEL_H +#define VINO_CORE_LIB_MODELS_AGE_GENDER_DETECTION_MODEL_H #include -#include "dynamic_vino_lib/models/base_model.h" +#include "vino_core_lib/models/base_model.h" namespace Models { @@ -76,4 +76,4 @@ class AgeGenderDetectionModel : public BaseModel }; } // namespace Models -#endif // DYNAMIC_VINO_LIB_MODELS_AGE_GENDER_DETECTION_MODEL_H +#endif // VINO_CORE_LIB_MODELS_AGE_GENDER_DETECTION_MODEL_H diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/base_model.h b/vino_core_lib/include/vino_core_lib/models/base_model.h similarity index 100% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/base_model.h rename to vino_core_lib/include/vino_core_lib/models/base_model.h diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/emotion_detection_model.h b/vino_core_lib/include/vino_core_lib/models/emotion_detection_model.h similarity index 87% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/emotion_detection_model.h rename to vino_core_lib/include/vino_core_lib/models/emotion_detection_model.h index 65a1e490..6856a943 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/emotion_detection_model.h +++ b/vino_core_lib/include/vino_core_lib/models/emotion_detection_model.h @@ -19,11 +19,11 @@ * @file emotion_detection_model.h */ -#ifndef DYNAMIC_VINO_LIB_MODELS_EMOTION_DETECTION_MODEL_H -#define DYNAMIC_VINO_LIB_MODELS_EMOTION_DETECTION_MODEL_H +#ifndef VINO_CORE_LIB_MODELS_EMOTION_DETECTION_MODEL_H +#define VINO_CORE_LIB_MODELS_EMOTION_DETECTION_MODEL_H #include -#include "dynamic_vino_lib/models/base_model.h" +#include "vino_core_lib/models/base_model.h" namespace Models { @@ -59,4 +59,4 @@ class EmotionDetectionModel : public BaseModel }; } // namespace Models -#endif // DYNAMIC_VINO_LIB_MODELS_EMOTION_DETECTION_MODEL_H +#endif // VINO_CORE_LIB_MODELS_EMOTION_DETECTION_MODEL_H diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/face_detection_model.h b/vino_core_lib/include/vino_core_lib/models/face_detection_model.h similarity index 88% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/face_detection_model.h rename to vino_core_lib/include/vino_core_lib/models/face_detection_model.h index 778c1db3..284cfc58 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/face_detection_model.h +++ b/vino_core_lib/include/vino_core_lib/models/face_detection_model.h @@ -19,11 +19,11 @@ * @file face_detection_model.h */ -#ifndef DYNAMIC_VINO_LIB_MODELS_FACE_DETECTION_MODEL_H -#define DYNAMIC_VINO_LIB_MODELS_FACE_DETECTION_MODEL_H +#ifndef VINO_CORE_LIB_MODELS_FACE_DETECTION_MODEL_H +#define VINO_CORE_LIB_MODELS_FACE_DETECTION_MODEL_H #include -#include "dynamic_vino_lib/models/base_model.h" +#include "vino_core_lib/models/base_model.h" namespace Models { @@ -69,4 +69,4 @@ class FaceDetectionModel : public BaseModel }; } // namespace Models -#endif // DYNAMIC_VINO_LIB_MODELS_FACE_DETECTION_MODEL_H +#endif // VINO_CORE_LIB_MODELS_FACE_DETECTION_MODEL_H diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/head_pose_detection_model.h b/vino_core_lib/include/vino_core_lib/models/head_pose_detection_model.h similarity index 89% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/head_pose_detection_model.h rename to vino_core_lib/include/vino_core_lib/models/head_pose_detection_model.h index db3eb498..9816d6b1 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/head_pose_detection_model.h +++ b/vino_core_lib/include/vino_core_lib/models/head_pose_detection_model.h @@ -19,11 +19,11 @@ * @file head_pose_detection_model.h */ -#ifndef DYNAMIC_VINO_LIB_MODELS_HEAD_POSE_DETECTION_MODEL_H -#define DYNAMIC_VINO_LIB_MODELS_HEAD_POSE_DETECTION_MODEL_H +#ifndef VINO_CORE_LIB_MODELS_HEAD_POSE_DETECTION_MODEL_H +#define VINO_CORE_LIB_MODELS_HEAD_POSE_DETECTION_MODEL_H #include -#include "dynamic_vino_lib/models/base_model.h" +#include "vino_core_lib/models/base_model.h" namespace Models { @@ -81,4 +81,4 @@ class HeadPoseDetectionModel : public BaseModel }; } // namespace Models -#endif // DYNAMIC_VINO_LIB_MODELS_HEAD_POSE_DETECTION_MODEL_H +#endif // VINO_CORE_LIB_MODELS_HEAD_POSE_DETECTION_MODEL_H diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/object_detection_model.h b/vino_core_lib/include/vino_core_lib/models/object_detection_model.h similarity index 88% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/object_detection_model.h rename to vino_core_lib/include/vino_core_lib/models/object_detection_model.h index b0fe6c9f..23a23613 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/object_detection_model.h +++ b/vino_core_lib/include/vino_core_lib/models/object_detection_model.h @@ -17,10 +17,10 @@ * @brief A header file with declaration for ObjectDetectionModel Class * @file face_detection_model.h */ -#ifndef DYNAMIC_VINO_LIB_MODELS_OBJECT_DETECTION_MODEL_H -#define DYNAMIC_VINO_LIB_MODELS_OBJECT_DETECTION_MODEL_H +#ifndef VINO_CORE_LIB_MODELS_OBJECT_DETECTION_MODEL_H +#define VINO_CORE_LIB_MODELS_OBJECT_DETECTION_MODEL_H #include -#include "dynamic_vino_lib/models/base_model.h" +#include "vino_core_lib/models/base_model.h" namespace Models { /** * @class ObjectDetectionModel @@ -48,4 +48,4 @@ class ObjectDetectionModel : public BaseModel { std::string output_; }; } // namespace Models -#endif // DYNAMIC_VINO_LIB_MODELS_OBJECT_DETECTION_MODEL_H +#endif // VINO_CORE_LIB_MODELS_OBJECT_DETECTION_MODEL_H diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/object_segmentation_model.h b/vino_core_lib/include/vino_core_lib/models/object_segmentation_model.h similarity index 88% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/object_segmentation_model.h rename to vino_core_lib/include/vino_core_lib/models/object_segmentation_model.h index 38418824..85eeab91 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/object_segmentation_model.h +++ b/vino_core_lib/include/vino_core_lib/models/object_segmentation_model.h @@ -15,10 +15,10 @@ * @brief A header file with declaration for ObjectSegmentationModel Class * @file face_detection_model.h */ -#ifndef DYNAMIC_VINO_LIB__MODELS__OBJECT_SEGMENTATION_MODEL_HPP_ -#define DYNAMIC_VINO_LIB__MODELS__OBJECT_SEGMENTATION_MODEL_HPP_ +#ifndef VINO_CORE_LIB__MODELS__OBJECT_SEGMENTATION_MODEL_HPP_ +#define VINO_CORE_LIB__MODELS__OBJECT_SEGMENTATION_MODEL_HPP_ #include -#include "dynamic_vino_lib/models/base_model.h" +#include "vino_core_lib/models/base_model.h" namespace Models { /** @@ -69,4 +69,4 @@ class ObjectSegmentationModel : public BaseModel std::string detection_output_; }; } // namespace Models -#endif // DYNAMIC_VINO_LIB__MODELS__OBJECT_SEGMENTATION_MODEL_HPP_ +#endif // VINO_CORE_LIB__MODELS__OBJECT_SEGMENTATION_MODEL_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/person_reidentification_model.h b/vino_core_lib/include/vino_core_lib/models/person_reidentification_model.h similarity index 85% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/person_reidentification_model.h rename to vino_core_lib/include/vino_core_lib/models/person_reidentification_model.h index a9cff01f..f3dba956 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/person_reidentification_model.h +++ b/vino_core_lib/include/vino_core_lib/models/person_reidentification_model.h @@ -16,10 +16,10 @@ * @brief A header file with declaration for PersonReidentificationModel Class * @file face_detection_model.h */ -#ifndef DYNAMIC_VINO_LIB__MODELS__PERSON_REIDENTIFICATION_MODEL_HPP_ -#define DYNAMIC_VINO_LIB__MODELS__PERSON_REIDENTIFICATION_MODEL_HPP_ +#ifndef VINO_CORE_LIB__MODELS__PERSON_REIDENTIFICATION_MODEL_HPP_ +#define VINO_CORE_LIB__MODELS__PERSON_REIDENTIFICATION_MODEL_HPP_ #include -#include "dynamic_vino_lib/models/base_model.h" +#include "vino_core_lib/models/base_model.h" namespace Models { /** @@ -45,4 +45,4 @@ class PersonReidentificationModel : public BaseModel std::string output_; }; } // namespace Models -#endif // DYNAMIC_VINO_LIB__MODELS__PERSON_REIDENTIFICATION_MODEL_HPP_ +#endif // VINO_CORE_LIB__MODELS__PERSON_REIDENTIFICATION_MODEL_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/base_output.h b/vino_core_lib/include/vino_core_lib/outputs/base_output.h similarity index 72% rename from dynamic_vino_lib/include/dynamic_vino_lib/outputs/base_output.h rename to vino_core_lib/include/vino_core_lib/outputs/base_output.h index 97e9ccf1..5fa5bfce 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/base_output.h +++ b/vino_core_lib/include/vino_core_lib/outputs/base_output.h @@ -19,21 +19,21 @@ * @file head_pose_detection_model.h */ -#ifndef DYNAMIC_VINO_LIB_OUTPUTS_BASE_OUTPUT_H -#define DYNAMIC_VINO_LIB_OUTPUTS_BASE_OUTPUT_H +#ifndef VINO_CORE_LIB_OUTPUTS_BASE_OUTPUT_H +#define VINO_CORE_LIB_OUTPUTS_BASE_OUTPUT_H #include #include -#include "dynamic_vino_lib/inferences/age_gender_detection.h" -#include "dynamic_vino_lib/inferences/base_inference.h" -#include "dynamic_vino_lib/inferences/emotions_detection.h" -#include "dynamic_vino_lib/inferences/face_detection.h" -#include "dynamic_vino_lib/inferences/head_pose_detection.h" -#include "dynamic_vino_lib/inferences/object_detection.h" -#include "dynamic_vino_lib/inferences/object_segmentation.h" -#include "dynamic_vino_lib/inferences/person_reidentification.h" -#include "dynamic_vino_lib/services/frame_processing_server.h" +#include "vino_core_lib/inferences/age_gender_detection.h" +#include "vino_core_lib/inferences/base_inference.h" +#include "vino_core_lib/inferences/emotions_detection.h" +#include "vino_core_lib/inferences/face_detection.h" +#include "vino_core_lib/inferences/head_pose_detection.h" +#include "vino_core_lib/inferences/object_detection.h" +#include "vino_core_lib/inferences/object_segmentation.h" +#include "vino_core_lib/inferences/person_reidentification.h" +#include "vino_core_lib/services/frame_processing_server.h" #include "opencv2/opencv.hpp" class Pipeline; @@ -56,45 +56,45 @@ class BaseOutput * @brief Generate output content according to the face detection result. */ virtual void accept( - const std::vector&) + const std::vector&) { } /** * @brief Generate output content according to the face detection result. */ virtual void accept( - const std::vector&) + const std::vector&) { } /** * @brief Generate output content according to the emotion detection result. */ - virtual void accept(const std::vector&) + virtual void accept(const std::vector&) { } /** * @brief Generate output content according to the age and gender detection * result. */ - virtual void accept(const std::vector&) + virtual void accept(const std::vector&) { } /** * @brief Generate output content according to the headpose detection result. */ - virtual void accept(const std::vector&) + virtual void accept(const std::vector&) { } /** * @brief Generate output content according to the object segmentation result. */ - virtual void accept(const std::vector&) + virtual void accept(const std::vector&) { } /** * @brief Generate output content according to the person reidentification result. */ - virtual void accept(const std::vector &) + virtual void accept(const std::vector &) { } /** @@ -135,4 +135,4 @@ class BaseOutput Pipeline* pipeline_; }; } // namespace Outputs -#endif // DYNAMIC_VINO_LIB_OUTPUTS_BASE_OUTPUT_H +#endif // VINO_CORE_LIB_OUTPUTS_BASE_OUTPUT_H diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/image_window_output.h b/vino_core_lib/include/vino_core_lib/outputs/image_window_output.h similarity index 83% rename from dynamic_vino_lib/include/dynamic_vino_lib/outputs/image_window_output.h rename to vino_core_lib/include/vino_core_lib/outputs/image_window_output.h index 2bdca7c2..ce381a6b 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/image_window_output.h +++ b/vino_core_lib/include/vino_core_lib/outputs/image_window_output.h @@ -19,12 +19,12 @@ * @file image_window_output.h */ -#ifndef DYNAMIC_VINO_LIB_OUTPUTS_IMAGE_WINDOW_OUTPUT_H -#define DYNAMIC_VINO_LIB_OUTPUTS_IMAGE_WINDOW_OUTPUT_H +#ifndef VINO_CORE_LIB_OUTPUTS_IMAGE_WINDOW_OUTPUT_H +#define VINO_CORE_LIB_OUTPUTS_IMAGE_WINDOW_OUTPUT_H #include #include -#include "dynamic_vino_lib/outputs/base_output.h" +#include "vino_core_lib/outputs/base_output.h" namespace Outputs { @@ -58,49 +58,49 @@ class ImageWindowOutput : public BaseOutput * @param[in] A face detection result objetc. */ void accept( - const std::vector&) override; + const std::vector&) override; /** * @brief Generate image window output content according to * the emotion detection result. * @param[in] A emotion detection result objetc. */ - void accept(const std::vector&) override; + void accept(const std::vector&) override; /** * @brief Generate image window output content according to * the age and gender detection result. * @param[in] A head pose detection result objetc. */ - void accept(const std::vector&) override; + void accept(const std::vector&) override; /** * @brief Generate image window output content according to * the headpose detection result. * @param[in] An age gender detection result objetc. */ - void accept(const std::vector&) override; + void accept(const std::vector&) override; /** * @brief Generate image window output content according to * the object detection result. * @param[in] An object detection result objetc. */ - void accept(const std::vector&) override; + void accept(const std::vector&) override; /** * @brief Generate image window output content according to * the object segmentation result. * @param[in] An object segmentation result objetc. */ - void accept(const std::vector&) override; + void accept(const std::vector&) override; /** * @brief Generate image window output content according to * the person re-ID result. * @param[in] An object segmentation result objetc. */ - void accept(const std::vector &) override; + void accept(const std::vector &) override; /** * @brief Merge mask for image window ouput * the object segmentation result. * @param[in] An object segmentation result objetc. */ - void mergeMask(const std::vector &); + void mergeMask(const std::vector &); private: unsigned findOutput(const cv::Rect &); @@ -143,4 +143,4 @@ class ImageWindowOutput : public BaseOutput }; }; } // namespace Outputs -#endif // DYNAMIC_VINO_LIB_OUTPUTS_IMAGE_WINDOW_OUTPUT_H +#endif // VINO_CORE_LIB_OUTPUTS_IMAGE_WINDOW_OUTPUT_H diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_service_output.h b/vino_core_lib/include/vino_core_lib/outputs/ros_service_output.h similarity index 90% rename from dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_service_output.h rename to vino_core_lib/include/vino_core_lib/outputs/ros_service_output.h index 82c2ea5f..373ace30 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_service_output.h +++ b/vino_core_lib/include/vino_core_lib/outputs/ros_service_output.h @@ -17,8 +17,8 @@ * @file ros_topic_output.h */ -#ifndef DYNAMIC_VINO_LIB__OUTPUTS__ROS_SERVICE_OUTPUT_HPP_ -#define DYNAMIC_VINO_LIB__OUTPUTS__ROS_SERVICE_OUTPUT_HPP_ +#ifndef VINO_CORE_LIB__OUTPUTS__ROS_SERVICE_OUTPUT_HPP_ +#define VINO_CORE_LIB__OUTPUTS__ROS_SERVICE_OUTPUT_HPP_ #include #include @@ -49,8 +49,8 @@ #include #include -#include "dynamic_vino_lib/inferences/face_detection.h" -#include "dynamic_vino_lib/outputs/ros_topic_output.h" +#include "vino_core_lib/inferences/face_detection.h" +#include "vino_core_lib/outputs/ros_topic_output.h" namespace Outputs { @@ -83,4 +83,4 @@ class RosServiceOutput : public RosTopicOutput const std::string service_name_; }; } // namespace Outputs -#endif // DYNAMIC_VINO_LIB__OUTPUTS__ROS_SERVICE_OUTPUT_HPP_ +#endif // VINO_CORE_LIB__OUTPUTS__ROS_SERVICE_OUTPUT_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_topic_output.h b/vino_core_lib/include/vino_core_lib/outputs/ros_topic_output.h similarity index 82% rename from dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_topic_output.h rename to vino_core_lib/include/vino_core_lib/outputs/ros_topic_output.h index 3b6c024b..5b783d98 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_topic_output.h +++ b/vino_core_lib/include/vino_core_lib/outputs/ros_topic_output.h @@ -19,8 +19,8 @@ * @file ros_topic_output.h */ -#ifndef DYNAMIC_VINO_LIB_OUTPUTS_ROS_TOPIC_OUTPUT_H -#define DYNAMIC_VINO_LIB_OUTPUTS_ROS_TOPIC_OUTPUT_H +#ifndef VINO_CORE_LIB_OUTPUTS_ROS_TOPIC_OUTPUT_H +#define VINO_CORE_LIB_OUTPUTS_ROS_TOPIC_OUTPUT_H #include #include @@ -42,8 +42,8 @@ #include #include -#include "dynamic_vino_lib/inferences/face_detection.h" -#include "dynamic_vino_lib/outputs/base_output.h" +#include "vino_core_lib/inferences/face_detection.h" +#include "vino_core_lib/outputs/base_output.h" namespace Outputs { @@ -70,44 +70,44 @@ class RosTopicOutput : public BaseOutput * the person reidentification result. * @param[in] results a bundle of person reidentification results. */ - void accept(const std::vector &) override; + void accept(const std::vector &) override; /** * @brief Generate ros topic infomation according to * the object segmentation result. * @param[in] results a bundle of object segmentation results. */ - void accept(const std::vector &) override; + void accept(const std::vector &) override; /** * @brief Generate ros topic infomation according to * the face detection result. * @param[in] An face detection result objetc. */ void accept( - const std::vector&) override; + const std::vector&) override; /** * @brief Generate ros topic infomation according to * the emotion detection result. * @param[in] An emotion detection result objetc. */ - void accept(const std::vector&) override; + void accept(const std::vector&) override; /** * @brief Generate ros topic infomation according to * the age gender detection result. * @param[in] An age gender detection result objetc. */ - void accept(const std::vector &) override; + void accept(const std::vector &) override; /**detected_objects_topic_ * @brief Generate ros topic infomation according to * the headpose detection result. * @param[in] An head pose detection result objetc. */ - void accept(const std::vector&) override; + void accept(const std::vector&) override; /** * @brief Generate ros topic infomation according to * the headpose detection result. * @param[in] An head pose detection result objetc. */ - void accept(const std::vector&) override; + void accept(const std::vector&) override; private: @@ -133,4 +133,4 @@ class RosTopicOutput : public BaseOutput }; } // namespace Outputs -#endif // DYNAMIC_VINO_LIB_OUTPUTS_ROS_TOPIC_OUTPUT_H +#endif // VINO_CORE_LIB_OUTPUTS_ROS_TOPIC_OUTPUT_H diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/rviz_output.h b/vino_core_lib/include/vino_core_lib/outputs/rviz_output.h similarity index 75% rename from dynamic_vino_lib/include/dynamic_vino_lib/outputs/rviz_output.h rename to vino_core_lib/include/vino_core_lib/outputs/rviz_output.h index 595e1864..e932ec20 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/rviz_output.h +++ b/vino_core_lib/include/vino_core_lib/outputs/rviz_output.h @@ -17,8 +17,8 @@ * @file image_window_output.h */ -#ifndef DYNAMIC_VINO_LIB__OUTPUTS__RVIZ_OUTPUT_HPP_ -#define DYNAMIC_VINO_LIB__OUTPUTS__RVIZ_OUTPUT_HPP_ +#ifndef VINO_CORE_LIB__OUTPUTS__RVIZ_OUTPUT_HPP_ +#define VINO_CORE_LIB__OUTPUTS__RVIZ_OUTPUT_HPP_ @@ -26,8 +26,8 @@ #include #include -#include "dynamic_vino_lib/outputs/base_output.h" -#include "dynamic_vino_lib/outputs/image_window_output.h" +#include "vino_core_lib/outputs/base_output.h" +#include "vino_core_lib/outputs/image_window_output.h" namespace Outputs { @@ -54,44 +54,44 @@ class RvizOutput : public BaseOutput * the face detection result. * @param[in] A face detection result objetc. */ - void accept(const std::vector &) override; + void accept(const std::vector &) override; /** * @brief Generate rviz output content according to * the object detection result. * @param[in] results A bundle of object detection results. */ - void accept(const std::vector &) override; + void accept(const std::vector &) override; /** * @brief Generate rviz output content according to * the object segmentation result. * @param[in] results A bundle of object segmentation results. */ - void accept(const std::vector &) override; + void accept(const std::vector &) override; /** * @brief Generate rviz output content according to * the age and gender detection result. * @param[in] A head pose detection result objetc. */ - void accept(const std::vector &) override; + void accept(const std::vector &) override; /** * @brief Generate rviz output content according to * the headpose detection result. * @param[in] An age gender detection result objetc. */ - void accept(const std::vector &) override; + void accept(const std::vector &) override; /** * @brief Generate rviz output content according to * the object segmentation result. * @param[in] An object segmentation result objetc. */ - void accept(const std::vector&) override; + void accept(const std::vector&) override; /** * @brief Generate rviz output content according to * the person re-ID result. * @param[in] An object segmentation result objetc. */ - void accept(const std::vector &) override; + void accept(const std::vector &) override; /** * @brief Merge mask for image window ouput * the object segmentation result. @@ -106,5 +106,5 @@ class RvizOutput : public BaseOutput std::shared_ptr image_window_output_; }; } // namespace Outputs -#endif // DYNAMIC_VINO_LIB__OUTPUTS__RVIZ_OUTPUT_HPP_ +#endif // VINO_CORE_LIB__OUTPUTS__RVIZ_OUTPUT_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/pipeline.h b/vino_core_lib/include/vino_core_lib/pipeline.h similarity index 90% rename from dynamic_vino_lib/include/dynamic_vino_lib/pipeline.h rename to vino_core_lib/include/vino_core_lib/pipeline.h index bf7394f2..db8d7ddc 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/pipeline.h +++ b/vino_core_lib/include/vino_core_lib/pipeline.h @@ -18,8 +18,8 @@ * @brief a header file with declaration of Pipeline class * @file pipeline.h */ -#ifndef DYNAMIC_VINO_LIB_PIPELINE_H -#define DYNAMIC_VINO_LIB_PIPELINE_H +#ifndef VINO_CORE_LIB_PIPELINE_H +#define VINO_CORE_LIB_PIPELINE_H #include #include @@ -29,10 +29,10 @@ #include #include -#include "dynamic_vino_lib/inferences/base_inference.h" -#include "dynamic_vino_lib/inputs/standard_camera.h" -#include "dynamic_vino_lib/outputs/base_output.h" -#include "dynamic_vino_lib/pipeline_params.h" +#include "vino_core_lib/inferences/base_inference.h" +#include "vino_core_lib/inputs/standard_camera.h" +#include "vino_core_lib/outputs/base_output.h" +#include "vino_core_lib/pipeline_params.h" #include "opencv2/opencv.hpp" /** @@ -61,7 +61,7 @@ class Pipeline * @return whether the add operation is successful */ bool add(const std::string& parent, const std::string& name, - std::shared_ptr inference); + std::shared_ptr inference); /** * @brief Add inference network to the pipeline. * @param[in] name name of the current inference network. @@ -69,7 +69,7 @@ class Pipeline * @return whether the add operation is successful */ bool add(const std::string & name, - std::shared_ptr inference); + std::shared_ptr inference); /** * @brief Add output device to the pipeline. * @param[in] parent name of the parent inference. @@ -162,7 +162,7 @@ class Pipeline std::shared_ptr input_device_; std::string input_device_name_; std::multimap next_; - std::map> + std::map> name_to_detection_map_; std::map> name_to_output_map_; @@ -178,4 +178,4 @@ class Pipeline int fps_ = 0; }; -#endif // DYNAMIC_VINO_LIB_PIPELINE_H_ +#endif // vino_core_lib_PIPELINE_H_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/pipeline_manager.h b/vino_core_lib/include/vino_core_lib/pipeline_manager.h similarity index 79% rename from dynamic_vino_lib/include/dynamic_vino_lib/pipeline_manager.h rename to vino_core_lib/include/vino_core_lib/pipeline_manager.h index 3deb2aa9..2ce98467 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/pipeline_manager.h +++ b/vino_core_lib/include/vino_core_lib/pipeline_manager.h @@ -18,8 +18,8 @@ * @brief a header file with declaration of Pipeline Manager class * @file pipeline_manager.hpp */ -#ifndef DYNAMIC_VINO_LIB__PIPELINE_MANAGER_HPP_ -#define DYNAMIC_VINO_LIB__PIPELINE_MANAGER_HPP_ +#ifndef VINO_CORE_LIB__PIPELINE_MANAGER_HPP_ +#define VINO_CORE_LIB__PIPELINE_MANAGER_HPP_ #include #include @@ -30,7 +30,7 @@ #include #include -#include "dynamic_vino_lib/pipeline.h" +#include "vino_core_lib/pipeline.h" /** * @class PipelineManager @@ -88,24 +88,24 @@ class PipelineManager { parseInputDevice(const Params::ParamManager::PipelineParams& params); std::map> parseOutput( const Params::ParamManager::PipelineParams& params); - std::map> + std::map> parseInference(const Params::ParamManager::PipelineParams& params); - std::shared_ptr createFaceDetection( + std::shared_ptr createFaceDetection( const Params::ParamManager::InferenceParams& infer); - std::shared_ptr createAgeGenderRecognition( + std::shared_ptr createAgeGenderRecognition( const Params::ParamManager::InferenceParams& infer); - std::shared_ptr createEmotionRecognition( + std::shared_ptr createEmotionRecognition( const Params::ParamManager::InferenceParams& infer); - std::shared_ptr createHeadPoseEstimation( + std::shared_ptr createHeadPoseEstimation( const Params::ParamManager::InferenceParams& infer); - std::shared_ptr createObjectDetection( + std::shared_ptr createObjectDetection( const Params::ParamManager::InferenceParams& infer); - std::shared_ptr createObjectSegmentation( + std::shared_ptr createObjectSegmentation( const Params::ParamManager::InferenceParams& infer); - std::shared_ptr createPersonReidentification( + std::shared_ptr createPersonReidentification( const Params::ParamManager::InferenceParams& infer); std::map pipelines_; std::map plugins_for_devices_; }; -#endif // DYNAMIC_VINO_LIB__PIPELINE_MANAGER_HPP_ \ No newline at end of file +#endif // VINO_CORE_LIB__PIPELINE_MANAGER_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/pipeline_params.h b/vino_core_lib/include/vino_core_lib/pipeline_params.h similarity index 90% rename from dynamic_vino_lib/include/dynamic_vino_lib/pipeline_params.h rename to vino_core_lib/include/vino_core_lib/pipeline_params.h index 4344a48c..676e2e5e 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/pipeline_params.h +++ b/vino_core_lib/include/vino_core_lib/pipeline_params.h @@ -18,8 +18,8 @@ * @brief a header file with declaration of Pipeline class * @file pipeline_param.h */ -#ifndef DYNAMIC_VINO_LIB_PIPELINE_PARAMS_H -#define DYNAMIC_VINO_LIB_PIPELINE_PARAMS_H +#ifndef VINO_CORE_LIB_PIPELINE_PARAMS_H +#define VINO_CORE_LIB_PIPELINE_PARAMS_H #include #include @@ -29,9 +29,9 @@ #include #include -#include "dynamic_vino_lib/inferences/base_inference.h" -#include "dynamic_vino_lib/inputs/standard_camera.h" -#include "dynamic_vino_lib/outputs/base_output.h" +#include "vino_core_lib/inferences/base_inference.h" +#include "vino_core_lib/inputs/standard_camera.h" +#include "vino_core_lib/outputs/base_output.h" #include "opencv2/opencv.hpp" #include "vino_param_lib/param_manager.h" @@ -81,4 +81,4 @@ class PipelineParams Params::ParamManager::PipelineParams params_; }; -#endif // DYNAMIC_VINO_LIB_PIPELINE_PARAMS_H +#endif // VINO_CORE_LIB_PIPELINE_PARAMS_H diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/services/frame_processing_server.h b/vino_core_lib/include/vino_core_lib/services/frame_processing_server.h similarity index 100% rename from dynamic_vino_lib/include/dynamic_vino_lib/services/frame_processing_server.h rename to vino_core_lib/include/vino_core_lib/services/frame_processing_server.h diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/slog.h b/vino_core_lib/include/vino_core_lib/slog.h similarity index 100% rename from dynamic_vino_lib/include/dynamic_vino_lib/slog.h rename to vino_core_lib/include/vino_core_lib/slog.h diff --git a/dynamic_vino_lib/package.xml b/vino_core_lib/package.xml similarity index 98% rename from dynamic_vino_lib/package.xml rename to vino_core_lib/package.xml index 3f9db45f..d9a5b213 100644 --- a/dynamic_vino_lib/package.xml +++ b/vino_core_lib/package.xml @@ -14,7 +14,7 @@ limitations under the License. --> - dynamic_vino_lib + vino_core_lib 0.3.0 a ROS wrapper package for Intel OpenVINO Weizhi Liu diff --git a/dynamic_vino_lib/src/engines/engine.cpp b/vino_core_lib/src/engines/engine.cpp similarity index 95% rename from dynamic_vino_lib/src/engines/engine.cpp rename to vino_core_lib/src/engines/engine.cpp index db008926..45ddb5d4 100644 --- a/dynamic_vino_lib/src/engines/engine.cpp +++ b/vino_core_lib/src/engines/engine.cpp @@ -18,7 +18,7 @@ * @brief a header file with definition of Engine class * @file engine.cpp */ -#include "dynamic_vino_lib/engines/engine.h" +#include "vino_core_lib/engines/engine.h" Engines::Engine::Engine(InferenceEngine::InferencePlugin plg, const Models::BaseModel::Ptr base_model) diff --git a/dynamic_vino_lib/src/factory.cpp b/vino_core_lib/src/factory.cpp similarity index 91% rename from dynamic_vino_lib/src/factory.cpp rename to vino_core_lib/src/factory.cpp index d886124c..cedd83c5 100644 --- a/dynamic_vino_lib/src/factory.cpp +++ b/vino_core_lib/src/factory.cpp @@ -22,12 +22,12 @@ #include #include -#include "dynamic_vino_lib/factory.h" -#include "dynamic_vino_lib/inputs/image_input.h" -#include "dynamic_vino_lib/inputs/realsense_camera.h" -#include "dynamic_vino_lib/inputs/realsense_camera_topic.h" -#include "dynamic_vino_lib/inputs/standard_camera.h" -#include "dynamic_vino_lib/inputs/video_input.h" +#include "vino_core_lib/factory.h" +#include "vino_core_lib/inputs/image_input.h" +#include "vino_core_lib/inputs/realsense_camera.h" +#include "vino_core_lib/inputs/realsense_camera_topic.h" +#include "vino_core_lib/inputs/standard_camera.h" +#include "vino_core_lib/inputs/video_input.h" std::shared_ptr Factory::makeInputDeviceByName( const std::string& input_device_name, const std::string& input_file_path) diff --git a/dynamic_vino_lib/src/inferences/age_gender_detection.cpp b/vino_core_lib/src/inferences/age_gender_detection.cpp similarity index 65% rename from dynamic_vino_lib/src/inferences/age_gender_detection.cpp rename to vino_core_lib/src/inferences/age_gender_detection.cpp index b087ab2a..f654d85a 100644 --- a/dynamic_vino_lib/src/inferences/age_gender_detection.cpp +++ b/vino_core_lib/src/inferences/age_gender_detection.cpp @@ -22,38 +22,38 @@ #include #include -#include "dynamic_vino_lib/inferences/age_gender_detection.h" -#include "dynamic_vino_lib/outputs/base_output.h" +#include "vino_core_lib/inferences/age_gender_detection.h" +#include "vino_core_lib/outputs/base_output.h" // AgeGenderResult -dynamic_vino_lib::AgeGenderResult::AgeGenderResult(const cv::Rect& location) +vino_core_lib::AgeGenderResult::AgeGenderResult(const cv::Rect& location) : Result(location) { } // AgeGender Detection -dynamic_vino_lib::AgeGenderDetection::AgeGenderDetection() - : dynamic_vino_lib::BaseInference() +vino_core_lib::AgeGenderDetection::AgeGenderDetection() + : vino_core_lib::BaseInference() { } -dynamic_vino_lib::AgeGenderDetection::~AgeGenderDetection() = default; +vino_core_lib::AgeGenderDetection::~AgeGenderDetection() = default; -void dynamic_vino_lib::AgeGenderDetection::loadNetwork( +void vino_core_lib::AgeGenderDetection::loadNetwork( std::shared_ptr network) { valid_model_ = network; setMaxBatchSize(network->getMaxBatchSize()); } -bool dynamic_vino_lib::AgeGenderDetection::enqueue( +bool vino_core_lib::AgeGenderDetection::enqueue( const cv::Mat& frame, const cv::Rect& input_frame_loc) { if (getEnqueuedNum() == 0) { results_.clear(); } - bool succeed = dynamic_vino_lib::BaseInference::enqueue( + bool succeed = vino_core_lib::BaseInference::enqueue( frame, input_frame_loc, 1, getResultsLength(), valid_model_->getInputName()); if (!succeed) return false; @@ -62,14 +62,14 @@ bool dynamic_vino_lib::AgeGenderDetection::enqueue( return true; } -bool dynamic_vino_lib::AgeGenderDetection::submitRequest() +bool vino_core_lib::AgeGenderDetection::submitRequest() { - return dynamic_vino_lib::BaseInference::submitRequest(); + return vino_core_lib::BaseInference::submitRequest(); } -bool dynamic_vino_lib::AgeGenderDetection::fetchResults() +bool vino_core_lib::AgeGenderDetection::fetchResults() { - bool can_fetch = dynamic_vino_lib::BaseInference::fetchResults(); + bool can_fetch = vino_core_lib::BaseInference::fetchResults(); if (!can_fetch) return false; auto request = getEngine()->getRequest(); InferenceEngine::Blob::Ptr genderBlob = @@ -85,23 +85,23 @@ bool dynamic_vino_lib::AgeGenderDetection::fetchResults() return true; } -const int dynamic_vino_lib::AgeGenderDetection::getResultsLength() const +const int vino_core_lib::AgeGenderDetection::getResultsLength() const { return static_cast(results_.size()); } -const dynamic_vino_lib::Result* -dynamic_vino_lib::AgeGenderDetection::getLocationResult(int idx) const +const vino_core_lib::Result* +vino_core_lib::AgeGenderDetection::getLocationResult(int idx) const { return &(results_[idx]); } -const std::string dynamic_vino_lib::AgeGenderDetection::getName() const +const std::string vino_core_lib::AgeGenderDetection::getName() const { return valid_model_->getModelName(); } -const void dynamic_vino_lib::AgeGenderDetection::observeOutput( +const void vino_core_lib::AgeGenderDetection::observeOutput( const std::shared_ptr& output) { if (output != nullptr) diff --git a/dynamic_vino_lib/src/inferences/base_inference.cpp b/vino_core_lib/src/inferences/base_inference.cpp similarity index 74% rename from dynamic_vino_lib/src/inferences/base_inference.cpp rename to vino_core_lib/src/inferences/base_inference.cpp index 4ca7d251..253a64c0 100644 --- a/dynamic_vino_lib/src/inferences/base_inference.cpp +++ b/vino_core_lib/src/inferences/base_inference.cpp @@ -21,26 +21,26 @@ #include -#include "dynamic_vino_lib/inferences/base_inference.h" +#include "vino_core_lib/inferences/base_inference.h" // Result -dynamic_vino_lib::Result::Result(const cv::Rect& location) +vino_core_lib::Result::Result(const cv::Rect& location) { location_ = location; } // BaseInference -dynamic_vino_lib::BaseInference::BaseInference() = default; +vino_core_lib::BaseInference::BaseInference() = default; -dynamic_vino_lib::BaseInference::~BaseInference() = default; +vino_core_lib::BaseInference::~BaseInference() = default; -void dynamic_vino_lib::BaseInference::loadEngine( +void vino_core_lib::BaseInference::loadEngine( const std::shared_ptr engine) { engine_ = engine; } -bool dynamic_vino_lib::BaseInference::submitRequest() +bool vino_core_lib::BaseInference::submitRequest() { if (engine_->getRequest() == nullptr) return false; if (!enqueued_frames) return false; @@ -50,7 +50,7 @@ bool dynamic_vino_lib::BaseInference::submitRequest() return true; } -bool dynamic_vino_lib::BaseInference::fetchResults() +bool vino_core_lib::BaseInference::fetchResults() { if (results_fetched_) return false; results_fetched_ = true; diff --git a/dynamic_vino_lib/src/inferences/emotions_detection.cpp b/vino_core_lib/src/inferences/emotions_detection.cpp similarity index 74% rename from dynamic_vino_lib/src/inferences/emotions_detection.cpp rename to vino_core_lib/src/inferences/emotions_detection.cpp index 9e10e3d3..3aee9eff 100644 --- a/dynamic_vino_lib/src/inferences/emotions_detection.cpp +++ b/vino_core_lib/src/inferences/emotions_detection.cpp @@ -23,39 +23,39 @@ #include #include -#include "dynamic_vino_lib/inferences/emotions_detection.h" -#include "dynamic_vino_lib/outputs/base_output.h" -#include "dynamic_vino_lib/slog.h" +#include "vino_core_lib/inferences/emotions_detection.h" +#include "vino_core_lib/outputs/base_output.h" +#include "vino_core_lib/slog.h" // EmotionsResult -dynamic_vino_lib::EmotionsResult::EmotionsResult(const cv::Rect& location) +vino_core_lib::EmotionsResult::EmotionsResult(const cv::Rect& location) : Result(location) { } // Emotions Detection -dynamic_vino_lib::EmotionsDetection::EmotionsDetection() - : dynamic_vino_lib::BaseInference() +vino_core_lib::EmotionsDetection::EmotionsDetection() + : vino_core_lib::BaseInference() { } -dynamic_vino_lib::EmotionsDetection::~EmotionsDetection() = default; +vino_core_lib::EmotionsDetection::~EmotionsDetection() = default; -void dynamic_vino_lib::EmotionsDetection::loadNetwork( +void vino_core_lib::EmotionsDetection::loadNetwork( const std::shared_ptr network) { valid_model_ = network; setMaxBatchSize(network->getMaxBatchSize()); } -bool dynamic_vino_lib::EmotionsDetection::enqueue( +bool vino_core_lib::EmotionsDetection::enqueue( const cv::Mat& frame, const cv::Rect& input_frame_loc) { if (getEnqueuedNum() == 0) { results_.clear(); } - bool succeed = dynamic_vino_lib::BaseInference::enqueue( + bool succeed = vino_core_lib::BaseInference::enqueue( frame, input_frame_loc, 1, getResultsLength(), valid_model_->getInputName()); if (!succeed) @@ -69,14 +69,14 @@ bool dynamic_vino_lib::EmotionsDetection::enqueue( return true; } -bool dynamic_vino_lib::EmotionsDetection::submitRequest() +bool vino_core_lib::EmotionsDetection::submitRequest() { - return dynamic_vino_lib::BaseInference::submitRequest(); + return vino_core_lib::BaseInference::submitRequest(); } -bool dynamic_vino_lib::EmotionsDetection::fetchResults() +bool vino_core_lib::EmotionsDetection::fetchResults() { - bool can_fetch = dynamic_vino_lib::BaseInference::fetchResults(); + bool can_fetch = vino_core_lib::BaseInference::fetchResults(); if (!can_fetch) return false; int label_length = static_cast(valid_model_->getLabels().size()); std::string output_name = valid_model_->getOutputName(); @@ -113,23 +113,23 @@ bool dynamic_vino_lib::EmotionsDetection::fetchResults() return true; } -const int dynamic_vino_lib::EmotionsDetection::getResultsLength() const +const int vino_core_lib::EmotionsDetection::getResultsLength() const { return static_cast(results_.size()); } -const dynamic_vino_lib::Result* -dynamic_vino_lib::EmotionsDetection::getLocationResult(int idx) const +const vino_core_lib::Result* +vino_core_lib::EmotionsDetection::getLocationResult(int idx) const { return &(results_[idx]); } -const std::string dynamic_vino_lib::EmotionsDetection::getName() const +const std::string vino_core_lib::EmotionsDetection::getName() const { return valid_model_->getModelName(); } -const void dynamic_vino_lib::EmotionsDetection::observeOutput( +const void vino_core_lib::EmotionsDetection::observeOutput( const std::shared_ptr& output) { if (output != nullptr) diff --git a/dynamic_vino_lib/src/inferences/face_detection.cpp b/vino_core_lib/src/inferences/face_detection.cpp similarity index 75% rename from dynamic_vino_lib/src/inferences/face_detection.cpp rename to vino_core_lib/src/inferences/face_detection.cpp index e7aa3c36..356875b4 100644 --- a/dynamic_vino_lib/src/inferences/face_detection.cpp +++ b/vino_core_lib/src/inferences/face_detection.cpp @@ -24,27 +24,27 @@ #include #include -#include "dynamic_vino_lib/inferences/face_detection.h" -#include "dynamic_vino_lib/outputs/base_output.h" -#include "dynamic_vino_lib/slog.h" +#include "vino_core_lib/inferences/face_detection.h" +#include "vino_core_lib/outputs/base_output.h" +#include "vino_core_lib/slog.h" // FaceDetectionResult -dynamic_vino_lib::FaceDetectionResult::FaceDetectionResult( +vino_core_lib::FaceDetectionResult::FaceDetectionResult( const cv::Rect& location) : Result(location) { } // FaceDetection -dynamic_vino_lib::FaceDetection::FaceDetection(double show_output_thresh) - : dynamic_vino_lib::BaseInference(), +vino_core_lib::FaceDetection::FaceDetection(double show_output_thresh) + : vino_core_lib::BaseInference(), show_output_thresh_(show_output_thresh) { } -dynamic_vino_lib::FaceDetection::~FaceDetection() = default; +vino_core_lib::FaceDetection::~FaceDetection() = default; -void dynamic_vino_lib::FaceDetection::loadNetwork( +void vino_core_lib::FaceDetection::loadNetwork( const std::shared_ptr network) { valid_model_ = network; @@ -53,7 +53,7 @@ void dynamic_vino_lib::FaceDetection::loadNetwork( setMaxBatchSize(network->getMaxBatchSize()); } -bool dynamic_vino_lib::FaceDetection::enqueue(const cv::Mat& frame, +bool vino_core_lib::FaceDetection::enqueue(const cv::Mat& frame, const cv::Rect& input_frame_loc) { // slog::info << "Face-enqueue" << slog::endl; @@ -62,7 +62,7 @@ bool dynamic_vino_lib::FaceDetection::enqueue(const cv::Mat& frame, width_ = frame.cols; height_ = frame.rows; } - if (!dynamic_vino_lib::BaseInference::enqueue( + if (!vino_core_lib::BaseInference::enqueue( frame, input_frame_loc, 1, 0, valid_model_->getInputName())) { return false; @@ -73,15 +73,15 @@ bool dynamic_vino_lib::FaceDetection::enqueue(const cv::Mat& frame, return true; } -bool dynamic_vino_lib::FaceDetection::submitRequest() +bool vino_core_lib::FaceDetection::submitRequest() { // slog::info << "Face-submitRequest" << slog::endl; - return dynamic_vino_lib::BaseInference::submitRequest(); + return vino_core_lib::BaseInference::submitRequest(); } -bool dynamic_vino_lib::FaceDetection::fetchResults() +bool vino_core_lib::FaceDetection::fetchResults() { - bool can_fetch = dynamic_vino_lib::BaseInference::fetchResults(); + bool can_fetch = vino_core_lib::BaseInference::fetchResults(); if (!can_fetch) return false; bool found_result = false; results_.clear(); @@ -122,23 +122,23 @@ bool dynamic_vino_lib::FaceDetection::fetchResults() return true; } -const int dynamic_vino_lib::FaceDetection::getResultsLength() const +const int vino_core_lib::FaceDetection::getResultsLength() const { return static_cast(results_.size()); } -const dynamic_vino_lib::Result* -dynamic_vino_lib::FaceDetection::getLocationResult(int idx) const +const vino_core_lib::Result* +vino_core_lib::FaceDetection::getLocationResult(int idx) const { return &(results_[idx]); } -const std::string dynamic_vino_lib::FaceDetection::getName() const +const std::string vino_core_lib::FaceDetection::getName() const { return valid_model_->getModelName(); } -const void dynamic_vino_lib::FaceDetection::observeOutput( +const void vino_core_lib::FaceDetection::observeOutput( const std::shared_ptr& output) { if (output != nullptr) diff --git a/dynamic_vino_lib/src/inferences/head_pose_detection.cpp b/vino_core_lib/src/inferences/head_pose_detection.cpp similarity index 67% rename from dynamic_vino_lib/src/inferences/head_pose_detection.cpp rename to vino_core_lib/src/inferences/head_pose_detection.cpp index 490936cf..b6de5827 100644 --- a/dynamic_vino_lib/src/inferences/head_pose_detection.cpp +++ b/vino_core_lib/src/inferences/head_pose_detection.cpp @@ -20,40 +20,40 @@ * @file head_pose_recognition.cpp */ -#include "dynamic_vino_lib/inferences/head_pose_detection.h" +#include "vino_core_lib/inferences/head_pose_detection.h" #include #include -#include "dynamic_vino_lib/outputs/base_output.h" +#include "vino_core_lib/outputs/base_output.h" // HeadPoseResult -dynamic_vino_lib::HeadPoseResult::HeadPoseResult(const cv::Rect& location) +vino_core_lib::HeadPoseResult::HeadPoseResult(const cv::Rect& location) : Result(location) { } // Head Pose Detection -dynamic_vino_lib::HeadPoseDetection::HeadPoseDetection() - : dynamic_vino_lib::BaseInference() +vino_core_lib::HeadPoseDetection::HeadPoseDetection() + : vino_core_lib::BaseInference() { } -dynamic_vino_lib::HeadPoseDetection::~HeadPoseDetection() = default; +vino_core_lib::HeadPoseDetection::~HeadPoseDetection() = default; -void dynamic_vino_lib::HeadPoseDetection::loadNetwork( +void vino_core_lib::HeadPoseDetection::loadNetwork( std::shared_ptr network) { valid_model_ = network; setMaxBatchSize(network->getMaxBatchSize()); } -bool dynamic_vino_lib::HeadPoseDetection::enqueue( +bool vino_core_lib::HeadPoseDetection::enqueue( const cv::Mat& frame, const cv::Rect& input_frame_loc) { if (getEnqueuedNum() == 0) { results_.clear(); } - bool succeed = dynamic_vino_lib::BaseInference::enqueue( + bool succeed = vino_core_lib::BaseInference::enqueue( frame, input_frame_loc, 1, getResultsLength(), valid_model_->getInputName()); if (!succeed) return false; @@ -62,14 +62,14 @@ bool dynamic_vino_lib::HeadPoseDetection::enqueue( return true; } -bool dynamic_vino_lib::HeadPoseDetection::submitRequest() +bool vino_core_lib::HeadPoseDetection::submitRequest() { - return dynamic_vino_lib::BaseInference::submitRequest(); + return vino_core_lib::BaseInference::submitRequest(); } -bool dynamic_vino_lib::HeadPoseDetection::fetchResults() +bool vino_core_lib::HeadPoseDetection::fetchResults() { - bool can_fetch = dynamic_vino_lib::BaseInference::fetchResults(); + bool can_fetch = vino_core_lib::BaseInference::fetchResults(); if (!can_fetch) return false; auto request = getEngine()->getRequest(); InferenceEngine::Blob::Ptr angle_r = @@ -88,23 +88,23 @@ bool dynamic_vino_lib::HeadPoseDetection::fetchResults() return true; } -const int dynamic_vino_lib::HeadPoseDetection::getResultsLength() const +const int vino_core_lib::HeadPoseDetection::getResultsLength() const { return static_cast(results_.size()); } -const dynamic_vino_lib::Result* -dynamic_vino_lib::HeadPoseDetection::getLocationResult(int idx) const +const vino_core_lib::Result* +vino_core_lib::HeadPoseDetection::getLocationResult(int idx) const { return &(results_[idx]); } -const std::string dynamic_vino_lib::HeadPoseDetection::getName() const +const std::string vino_core_lib::HeadPoseDetection::getName() const { return valid_model_->getModelName(); } -const void dynamic_vino_lib::HeadPoseDetection::observeOutput( +const void vino_core_lib::HeadPoseDetection::observeOutput( const std::shared_ptr& output) { if (output != nullptr) diff --git a/dynamic_vino_lib/src/inferences/object_detection.cpp b/vino_core_lib/src/inferences/object_detection.cpp similarity index 74% rename from dynamic_vino_lib/src/inferences/object_detection.cpp rename to vino_core_lib/src/inferences/object_detection.cpp index f25259bc..4f5f3273 100644 --- a/dynamic_vino_lib/src/inferences/object_detection.cpp +++ b/vino_core_lib/src/inferences/object_detection.cpp @@ -21,33 +21,33 @@ #include #include #include -#include "dynamic_vino_lib/inferences/object_detection.h" -#include "dynamic_vino_lib/outputs/base_output.h" -#include "dynamic_vino_lib/slog.h" +#include "vino_core_lib/inferences/object_detection.h" +#include "vino_core_lib/outputs/base_output.h" +#include "vino_core_lib/slog.h" // ObjectDetectionResult -dynamic_vino_lib::ObjectDetectionResult::ObjectDetectionResult( +vino_core_lib::ObjectDetectionResult::ObjectDetectionResult( const cv::Rect& location) : Result(location){} // ObjectDetection -dynamic_vino_lib::ObjectDetection::ObjectDetection(bool enable_roi_constraint, +vino_core_lib::ObjectDetection::ObjectDetection(bool enable_roi_constraint, double show_output_thresh) - : dynamic_vino_lib::BaseInference(), + : vino_core_lib::BaseInference(), show_output_thresh_(show_output_thresh){} -dynamic_vino_lib::ObjectDetection::~ObjectDetection() = default; -void dynamic_vino_lib::ObjectDetection::loadNetwork( +vino_core_lib::ObjectDetection::~ObjectDetection() = default; +void vino_core_lib::ObjectDetection::loadNetwork( const std::shared_ptr network) { valid_model_ = network; max_proposal_count_ = network->getMaxProposalCount(); object_size_ = network->getObjectSize(); setMaxBatchSize(network->getMaxBatchSize()); } -bool dynamic_vino_lib::ObjectDetection::enqueue(const cv::Mat& frame, +bool vino_core_lib::ObjectDetection::enqueue(const cv::Mat& frame, const cv::Rect& input_frame_loc) { if (width_ == 0 && height_ == 0) { width_ = frame.cols; height_ = frame.rows; } - if (!dynamic_vino_lib::BaseInference::enqueue( + if (!vino_core_lib::BaseInference::enqueue( frame, input_frame_loc, 1, 0, valid_model_->getInputName())) { return false; } @@ -56,11 +56,11 @@ bool dynamic_vino_lib::ObjectDetection::enqueue(const cv::Mat& frame, results_.emplace_back(r); return true; } -bool dynamic_vino_lib::ObjectDetection::submitRequest() { - return dynamic_vino_lib::BaseInference::submitRequest(); +bool vino_core_lib::ObjectDetection::submitRequest() { + return vino_core_lib::BaseInference::submitRequest(); } -bool dynamic_vino_lib::ObjectDetection::fetchResults() { - bool can_fetch = dynamic_vino_lib::BaseInference::fetchResults(); +bool vino_core_lib::ObjectDetection::fetchResults() { + bool can_fetch = vino_core_lib::BaseInference::fetchResults(); if (!can_fetch) return false; bool found_result = false; results_.clear(); @@ -94,17 +94,17 @@ bool dynamic_vino_lib::ObjectDetection::fetchResults() { if (!found_result) results_.clear(); return true; } -const int dynamic_vino_lib::ObjectDetection::getResultsLength() const { +const int vino_core_lib::ObjectDetection::getResultsLength() const { return static_cast(results_.size()); } -const dynamic_vino_lib::Result* -dynamic_vino_lib::ObjectDetection::getLocationResult(int idx) const { +const vino_core_lib::Result* +vino_core_lib::ObjectDetection::getLocationResult(int idx) const { return &(results_[idx]); } -const std::string dynamic_vino_lib::ObjectDetection::getName() const { +const std::string vino_core_lib::ObjectDetection::getName() const { return valid_model_->getModelName(); } -const void dynamic_vino_lib::ObjectDetection::observeOutput( +const void vino_core_lib::ObjectDetection::observeOutput( const std::shared_ptr& output) { if (output != nullptr) { output->accept(results_); diff --git a/dynamic_vino_lib/src/inferences/object_segmentation.cpp b/vino_core_lib/src/inferences/object_segmentation.cpp similarity index 77% rename from dynamic_vino_lib/src/inferences/object_segmentation.cpp rename to vino_core_lib/src/inferences/object_segmentation.cpp index 69b7fd23..62a060bc 100644 --- a/dynamic_vino_lib/src/inferences/object_segmentation.cpp +++ b/vino_core_lib/src/inferences/object_segmentation.cpp @@ -22,32 +22,32 @@ #include #include -#include "dynamic_vino_lib/inferences/object_segmentation.h" -#include "dynamic_vino_lib/outputs/base_output.h" -#include "dynamic_vino_lib/slog.h" +#include "vino_core_lib/inferences/object_segmentation.h" +#include "vino_core_lib/outputs/base_output.h" +#include "vino_core_lib/slog.h" // ObjectSegmentationResult -dynamic_vino_lib::ObjectSegmentationResult::ObjectSegmentationResult(const cv::Rect & location) +vino_core_lib::ObjectSegmentationResult::ObjectSegmentationResult(const cv::Rect & location) : Result(location) { } // ObjectSegmentation -dynamic_vino_lib::ObjectSegmentation::ObjectSegmentation(double show_output_thresh) -: show_output_thresh_(show_output_thresh), dynamic_vino_lib::BaseInference() +vino_core_lib::ObjectSegmentation::ObjectSegmentation(double show_output_thresh) +: show_output_thresh_(show_output_thresh), vino_core_lib::BaseInference() { } -dynamic_vino_lib::ObjectSegmentation::~ObjectSegmentation() = default; +vino_core_lib::ObjectSegmentation::~ObjectSegmentation() = default; -void dynamic_vino_lib::ObjectSegmentation::loadNetwork( +void vino_core_lib::ObjectSegmentation::loadNetwork( const std::shared_ptr network) { valid_model_ = network; setMaxBatchSize(network->getMaxBatchSize()); } -bool dynamic_vino_lib::ObjectSegmentation::enqueue( +bool vino_core_lib::ObjectSegmentation::enqueue( const cv::Mat & frame, const cv::Rect & input_frame_loc) { @@ -55,7 +55,7 @@ bool dynamic_vino_lib::ObjectSegmentation::enqueue( width_ = frame.cols; height_ = frame.rows; } - if (!dynamic_vino_lib::BaseInference::enqueue(frame, input_frame_loc, 1, 0, + if (!vino_core_lib::BaseInference::enqueue(frame, input_frame_loc, 1, 0, valid_model_->getInputName())) { return false; @@ -66,14 +66,14 @@ bool dynamic_vino_lib::ObjectSegmentation::enqueue( return true; } -bool dynamic_vino_lib::ObjectSegmentation::submitRequest() +bool vino_core_lib::ObjectSegmentation::submitRequest() { - return dynamic_vino_lib::BaseInference::submitRequest(); + return vino_core_lib::BaseInference::submitRequest(); } -bool dynamic_vino_lib::ObjectSegmentation::fetchResults() +bool vino_core_lib::ObjectSegmentation::fetchResults() { - bool can_fetch = dynamic_vino_lib::BaseInference::fetchResults(); + bool can_fetch = vino_core_lib::BaseInference::fetchResults(); if (!can_fetch) { return false; } @@ -129,23 +129,23 @@ bool dynamic_vino_lib::ObjectSegmentation::fetchResults() return true; } -const int dynamic_vino_lib::ObjectSegmentation::getResultsLength() const +const int vino_core_lib::ObjectSegmentation::getResultsLength() const { return static_cast(results_.size()); } -const dynamic_vino_lib::Result * -dynamic_vino_lib::ObjectSegmentation::getLocationResult(int idx) const +const vino_core_lib::Result * +vino_core_lib::ObjectSegmentation::getLocationResult(int idx) const { return &(results_[idx]); } -const std::string dynamic_vino_lib::ObjectSegmentation::getName() const +const std::string vino_core_lib::ObjectSegmentation::getName() const { return valid_model_->getModelName(); } -const void dynamic_vino_lib::ObjectSegmentation::observeOutput( +const void vino_core_lib::ObjectSegmentation::observeOutput( const std::shared_ptr & output) { if (output != nullptr) { diff --git a/dynamic_vino_lib/src/inferences/person_reidentification.cpp b/vino_core_lib/src/inferences/person_reidentification.cpp similarity index 73% rename from dynamic_vino_lib/src/inferences/person_reidentification.cpp rename to vino_core_lib/src/inferences/person_reidentification.cpp index 005a128d..ef192590 100644 --- a/dynamic_vino_lib/src/inferences/person_reidentification.cpp +++ b/vino_core_lib/src/inferences/person_reidentification.cpp @@ -20,34 +20,34 @@ #include #include #include -#include "dynamic_vino_lib/inferences/person_reidentification.h" -#include "dynamic_vino_lib/outputs/base_output.h" -#include "dynamic_vino_lib/slog.h" +#include "vino_core_lib/inferences/person_reidentification.h" +#include "vino_core_lib/outputs/base_output.h" +#include "vino_core_lib/slog.h" // PersonReidentificationResult -dynamic_vino_lib::PersonReidentificationResult::PersonReidentificationResult( +vino_core_lib::PersonReidentificationResult::PersonReidentificationResult( const cv::Rect & location) : Result(location) {} // PersonReidentification -dynamic_vino_lib::PersonReidentification::PersonReidentification(double match_thresh) -: match_thresh_(match_thresh), dynamic_vino_lib::BaseInference() {} +vino_core_lib::PersonReidentification::PersonReidentification(double match_thresh) +: match_thresh_(match_thresh), vino_core_lib::BaseInference() {} -dynamic_vino_lib::PersonReidentification::~PersonReidentification() = default; -void dynamic_vino_lib::PersonReidentification::loadNetwork( +vino_core_lib::PersonReidentification::~PersonReidentification() = default; +void vino_core_lib::PersonReidentification::loadNetwork( const std::shared_ptr network) { valid_model_ = network; setMaxBatchSize(network->getMaxBatchSize()); } -bool dynamic_vino_lib::PersonReidentification::enqueue( +bool vino_core_lib::PersonReidentification::enqueue( const cv::Mat & frame, const cv::Rect & input_frame_loc) { if (getEnqueuedNum() == 0) { results_.clear(); } - if (!dynamic_vino_lib::BaseInference::enqueue( + if (!vino_core_lib::BaseInference::enqueue( frame, input_frame_loc, 1, 0, valid_model_->getInputName())) { return false; @@ -57,14 +57,14 @@ bool dynamic_vino_lib::PersonReidentification::enqueue( return true; } -bool dynamic_vino_lib::PersonReidentification::submitRequest() +bool vino_core_lib::PersonReidentification::submitRequest() { - return dynamic_vino_lib::BaseInference::submitRequest(); + return vino_core_lib::BaseInference::submitRequest(); } -bool dynamic_vino_lib::PersonReidentification::fetchResults() +bool vino_core_lib::PersonReidentification::fetchResults() { - bool can_fetch = dynamic_vino_lib::BaseInference::fetchResults(); + bool can_fetch = vino_core_lib::BaseInference::fetchResults(); if (!can_fetch) {return false;} bool found_result = false; InferenceEngine::InferRequest::Ptr request = getEngine()->getRequest(); @@ -81,7 +81,7 @@ bool dynamic_vino_lib::PersonReidentification::fetchResults() return true; } -float dynamic_vino_lib::PersonReidentification::calcSimilarity( +float vino_core_lib::PersonReidentification::calcSimilarity( const std::vector & person_a, const std::vector & person_b) { if (person_a.size() != person_b.size()) { @@ -105,7 +105,7 @@ float dynamic_vino_lib::PersonReidentification::calcSimilarity( return mul_sum / (sqrt(denom_a) * sqrt(denom_b)); } -std::string dynamic_vino_lib::PersonReidentification::findMatchPerson( +std::string vino_core_lib::PersonReidentification::findMatchPerson( const std::vector & new_person) { auto size = recorded_persons_.size(); @@ -128,23 +128,23 @@ std::string dynamic_vino_lib::PersonReidentification::findMatchPerson( } } -const int dynamic_vino_lib::PersonReidentification::getResultsLength() const +const int vino_core_lib::PersonReidentification::getResultsLength() const { return static_cast(results_.size()); } -const dynamic_vino_lib::Result * -dynamic_vino_lib::PersonReidentification::getLocationResult(int idx) const +const vino_core_lib::Result * +vino_core_lib::PersonReidentification::getLocationResult(int idx) const { return &(results_[idx]); } -const std::string dynamic_vino_lib::PersonReidentification::getName() const +const std::string vino_core_lib::PersonReidentification::getName() const { return valid_model_->getModelName(); } -const void dynamic_vino_lib::PersonReidentification::observeOutput( +const void vino_core_lib::PersonReidentification::observeOutput( const std::shared_ptr & output) { if (output != nullptr) { diff --git a/dynamic_vino_lib/src/inputs/image_input.cpp b/vino_core_lib/src/inputs/image_input.cpp similarity index 96% rename from dynamic_vino_lib/src/inputs/image_input.cpp rename to vino_core_lib/src/inputs/image_input.cpp index c2790f0e..a9ef8be3 100644 --- a/dynamic_vino_lib/src/inputs/image_input.cpp +++ b/vino_core_lib/src/inputs/image_input.cpp @@ -19,7 +19,7 @@ * @file image_input.cpp */ -#include "dynamic_vino_lib/inputs/image_input.h" +#include "vino_core_lib/inputs/image_input.h" #include // Image diff --git a/dynamic_vino_lib/src/inputs/realsense_camera.cpp b/vino_core_lib/src/inputs/realsense_camera.cpp similarity index 96% rename from dynamic_vino_lib/src/inputs/realsense_camera.cpp rename to vino_core_lib/src/inputs/realsense_camera.cpp index 8ebd273c..e014e412 100644 --- a/dynamic_vino_lib/src/inputs/realsense_camera.cpp +++ b/vino_core_lib/src/inputs/realsense_camera.cpp @@ -18,8 +18,8 @@ * @brief a header file with declaration of RealSenseCamera class * @file realsense_camera.cpp */ -#include "dynamic_vino_lib/inputs/realsense_camera.h" -#include "dynamic_vino_lib/slog.h" +#include "vino_core_lib/inputs/realsense_camera.h" +#include "vino_core_lib/slog.h" // RealSenseCamera bool Input::RealSenseCamera::initialize() diff --git a/dynamic_vino_lib/src/inputs/realsense_camera_topic.cpp b/vino_core_lib/src/inputs/realsense_camera_topic.cpp similarity index 95% rename from dynamic_vino_lib/src/inputs/realsense_camera_topic.cpp rename to vino_core_lib/src/inputs/realsense_camera_topic.cpp index 900ffa07..ebd941c5 100644 --- a/dynamic_vino_lib/src/inputs/realsense_camera_topic.cpp +++ b/vino_core_lib/src/inputs/realsense_camera_topic.cpp @@ -19,9 +19,9 @@ * @file realsense_camera_topic.cpp */ -#include "dynamic_vino_lib/inputs/realsense_camera_topic.h" +#include "vino_core_lib/inputs/realsense_camera_topic.h" #include -#include "dynamic_vino_lib/slog.h" +#include "vino_core_lib/slog.h" #include diff --git a/dynamic_vino_lib/src/inputs/standard_camera.cpp b/vino_core_lib/src/inputs/standard_camera.cpp similarity index 96% rename from dynamic_vino_lib/src/inputs/standard_camera.cpp rename to vino_core_lib/src/inputs/standard_camera.cpp index d8649144..46a883f4 100644 --- a/dynamic_vino_lib/src/inputs/standard_camera.cpp +++ b/vino_core_lib/src/inputs/standard_camera.cpp @@ -18,7 +18,7 @@ * @brief a header file with declaration of StandardCamera class * @file standard_camera.cpp */ -#include "dynamic_vino_lib/inputs/standard_camera.h" +#include "vino_core_lib/inputs/standard_camera.h" // StandardCamera bool Input::StandardCamera::initialize() diff --git a/dynamic_vino_lib/src/inputs/video_input.cpp b/vino_core_lib/src/inputs/video_input.cpp similarity index 96% rename from dynamic_vino_lib/src/inputs/video_input.cpp rename to vino_core_lib/src/inputs/video_input.cpp index d493731b..dfba5c19 100644 --- a/dynamic_vino_lib/src/inputs/video_input.cpp +++ b/vino_core_lib/src/inputs/video_input.cpp @@ -21,7 +21,7 @@ #include -#include "dynamic_vino_lib/inputs/video_input.h" +#include "vino_core_lib/inputs/video_input.h" // Video Input::Video::Video(const std::string& video) diff --git a/dynamic_vino_lib/src/models/age_gender_detection_model.cpp b/vino_core_lib/src/models/age_gender_detection_model.cpp similarity index 97% rename from dynamic_vino_lib/src/models/age_gender_detection_model.cpp rename to vino_core_lib/src/models/age_gender_detection_model.cpp index 2a1122ad..c47351b8 100644 --- a/dynamic_vino_lib/src/models/age_gender_detection_model.cpp +++ b/vino_core_lib/src/models/age_gender_detection_model.cpp @@ -22,8 +22,8 @@ #include #include -#include "dynamic_vino_lib/models/age_gender_detection_model.h" -#include "dynamic_vino_lib/slog.h" +#include "vino_core_lib/models/age_gender_detection_model.h" +#include "vino_core_lib/slog.h" // Validated Age Gender Classification Network Models::AgeGenderDetectionModel::AgeGenderDetectionModel( diff --git a/dynamic_vino_lib/src/models/base_model.cpp b/vino_core_lib/src/models/base_model.cpp similarity index 97% rename from dynamic_vino_lib/src/models/base_model.cpp rename to vino_core_lib/src/models/base_model.cpp index 08153777..11c81c5a 100644 --- a/dynamic_vino_lib/src/models/base_model.cpp +++ b/vino_core_lib/src/models/base_model.cpp @@ -24,8 +24,8 @@ #include #include -#include "dynamic_vino_lib/models/base_model.h" -#include "dynamic_vino_lib/slog.h" +#include "vino_core_lib/models/base_model.h" +#include "vino_core_lib/slog.h" // Validated Base Network Models::BaseModel::BaseModel(const std::string& model_loc, int input_num, diff --git a/dynamic_vino_lib/src/models/emotion_detection_model.cpp b/vino_core_lib/src/models/emotion_detection_model.cpp similarity index 96% rename from dynamic_vino_lib/src/models/emotion_detection_model.cpp rename to vino_core_lib/src/models/emotion_detection_model.cpp index d1e6150d..e4700b52 100644 --- a/dynamic_vino_lib/src/models/emotion_detection_model.cpp +++ b/vino_core_lib/src/models/emotion_detection_model.cpp @@ -20,8 +20,8 @@ */ #include -#include "dynamic_vino_lib/models/emotion_detection_model.h" -#include "dynamic_vino_lib/slog.h" +#include "vino_core_lib/models/emotion_detection_model.h" +#include "vino_core_lib/slog.h" // Validated Emotions Detection Network Models::EmotionDetectionModel::EmotionDetectionModel( diff --git a/dynamic_vino_lib/src/models/face_detection_model.cpp b/vino_core_lib/src/models/face_detection_model.cpp similarity index 97% rename from dynamic_vino_lib/src/models/face_detection_model.cpp rename to vino_core_lib/src/models/face_detection_model.cpp index caadb0e2..1b0c74d4 100644 --- a/dynamic_vino_lib/src/models/face_detection_model.cpp +++ b/vino_core_lib/src/models/face_detection_model.cpp @@ -22,8 +22,8 @@ #include -#include "dynamic_vino_lib/models/face_detection_model.h" -#include "dynamic_vino_lib/slog.h" +#include "vino_core_lib/models/face_detection_model.h" +#include "vino_core_lib/slog.h" // Validated Face Detection Network Models::FaceDetectionModel::FaceDetectionModel(const std::string& model_loc, diff --git a/dynamic_vino_lib/src/models/head_pose_detection_model.cpp b/vino_core_lib/src/models/head_pose_detection_model.cpp similarity index 97% rename from dynamic_vino_lib/src/models/head_pose_detection_model.cpp rename to vino_core_lib/src/models/head_pose_detection_model.cpp index 2012deb2..ad67c3e3 100644 --- a/dynamic_vino_lib/src/models/head_pose_detection_model.cpp +++ b/vino_core_lib/src/models/head_pose_detection_model.cpp @@ -23,8 +23,8 @@ #include #include -#include "dynamic_vino_lib/models/head_pose_detection_model.h" -#include "dynamic_vino_lib/slog.h" +#include "vino_core_lib/models/head_pose_detection_model.h" +#include "vino_core_lib/slog.h" // Validated Head Pose Network Models::HeadPoseDetectionModel::HeadPoseDetectionModel( diff --git a/dynamic_vino_lib/src/models/object_detection_model.cpp b/vino_core_lib/src/models/object_detection_model.cpp similarity index 98% rename from dynamic_vino_lib/src/models/object_detection_model.cpp rename to vino_core_lib/src/models/object_detection_model.cpp index e16ddc20..0a25c8e6 100644 --- a/dynamic_vino_lib/src/models/object_detection_model.cpp +++ b/vino_core_lib/src/models/object_detection_model.cpp @@ -18,8 +18,8 @@ * @file object_detection_model.cpp */ #include -#include "dynamic_vino_lib/models/object_detection_model.h" -#include "dynamic_vino_lib/slog.h" +#include "vino_core_lib/models/object_detection_model.h" +#include "vino_core_lib/slog.h" // Validated Object Detection Network Models::ObjectDetectionModel::ObjectDetectionModel(const std::string& model_loc, int input_num, int output_num, diff --git a/dynamic_vino_lib/src/models/object_segmentation_model.cpp b/vino_core_lib/src/models/object_segmentation_model.cpp similarity index 96% rename from dynamic_vino_lib/src/models/object_segmentation_model.cpp rename to vino_core_lib/src/models/object_segmentation_model.cpp index 2feb29c7..20dbdb24 100644 --- a/dynamic_vino_lib/src/models/object_segmentation_model.cpp +++ b/vino_core_lib/src/models/object_segmentation_model.cpp @@ -17,8 +17,8 @@ * @file object_detection_model.cpp */ #include -#include "dynamic_vino_lib/models/object_segmentation_model.h" -#include "dynamic_vino_lib/slog.h" +#include "vino_core_lib/models/object_segmentation_model.h" +#include "vino_core_lib/slog.h" // Validated Object Detection Network Models::ObjectSegmentationModel::ObjectSegmentationModel( const std::string & model_loc, diff --git a/dynamic_vino_lib/src/models/person_reidentification_model.cpp b/vino_core_lib/src/models/person_reidentification_model.cpp similarity index 94% rename from dynamic_vino_lib/src/models/person_reidentification_model.cpp rename to vino_core_lib/src/models/person_reidentification_model.cpp index 7367e212..3a147bdf 100644 --- a/dynamic_vino_lib/src/models/person_reidentification_model.cpp +++ b/vino_core_lib/src/models/person_reidentification_model.cpp @@ -17,8 +17,8 @@ * @file person_reidentification_model.cpp */ #include -#include "dynamic_vino_lib/models/person_reidentification_model.h" -#include "dynamic_vino_lib/slog.h" +#include "vino_core_lib/models/person_reidentification_model.h" +#include "vino_core_lib/slog.h" // Validated Object Detection Network Models::PersonReidentificationModel::PersonReidentificationModel( const std::string & model_loc, int input_num, int output_num, int max_batch_size) diff --git a/dynamic_vino_lib/src/outputs/base_output.cpp b/vino_core_lib/src/outputs/base_output.cpp similarity index 90% rename from dynamic_vino_lib/src/outputs/base_output.cpp rename to vino_core_lib/src/outputs/base_output.cpp index a3248c8d..b22192c9 100644 --- a/dynamic_vino_lib/src/outputs/base_output.cpp +++ b/vino_core_lib/src/outputs/base_output.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "dynamic_vino_lib/outputs/base_output.h" -#include "dynamic_vino_lib/pipeline.h" +#include "vino_core_lib/outputs/base_output.h" +#include "vino_core_lib/pipeline.h" void Outputs::BaseOutput::setPipeline(Pipeline* const pipeline) { diff --git a/dynamic_vino_lib/src/outputs/image_window_output.cpp b/vino_core_lib/src/outputs/image_window_output.cpp similarity index 93% rename from dynamic_vino_lib/src/outputs/image_window_output.cpp rename to vino_core_lib/src/outputs/image_window_output.cpp index 3a6f2df1..db74b780 100644 --- a/dynamic_vino_lib/src/outputs/image_window_output.cpp +++ b/vino_core_lib/src/outputs/image_window_output.cpp @@ -19,11 +19,11 @@ * @file image_window_output.cpp */ -#include "dynamic_vino_lib/outputs/image_window_output.h" +#include "vino_core_lib/outputs/image_window_output.h" #include #include #include -#include "dynamic_vino_lib/pipeline.h" +#include "vino_core_lib/pipeline.h" Outputs::ImageWindowOutput::ImageWindowOutput(const std::string& window_name, int focal_length) @@ -49,7 +49,7 @@ void Outputs::ImageWindowOutput::feedFrame(const cv::Mat& frame) } void Outputs::ImageWindowOutput::accept( - const std::vector& results) + const std::vector& results) { // std::cout<<"call face"<& results) + const std::vector& results) { if (outputs_.size() == 0) { @@ -102,7 +102,7 @@ void Outputs::ImageWindowOutput::accept( } void Outputs::ImageWindowOutput::accept( - const std::vector& results) + const std::vector& results) { if (outputs_.size() == 0) { @@ -168,7 +168,7 @@ cv::Mat Outputs::ImageWindowOutput::getRotationTransform(double yaw, } void Outputs::ImageWindowOutput::accept( - const std::vector& results) + const std::vector& results) { if (outputs_.size() == 0) { @@ -203,7 +203,7 @@ void Outputs::ImageWindowOutput::accept( } void Outputs::ImageWindowOutput::accept( - const std::vector& results) + const std::vector& results) { // std::cout<<"call"< & results) + const std::vector & results) { std::map class_color; for (unsigned i = 0; i < results.size(); i++) { @@ -266,7 +266,7 @@ void Outputs::ImageWindowOutput::mergeMask( } void Outputs::ImageWindowOutput::accept( - const std::vector & results) + const std::vector & results) { if (outputs_.size() == 0) { initOutputs(results.size()); @@ -305,7 +305,7 @@ unsigned Outputs::ImageWindowOutput::findOutput( } void Outputs::ImageWindowOutput::accept( - const std::vector & results) + const std::vector & results) { for (unsigned i = 0; i < results.size(); i++) { cv::Rect result_rect = results[i].getLocation(); diff --git a/dynamic_vino_lib/src/outputs/ros_service_output.cpp b/vino_core_lib/src/outputs/ros_service_output.cpp similarity index 98% rename from dynamic_vino_lib/src/outputs/ros_service_output.cpp rename to vino_core_lib/src/outputs/ros_service_output.cpp index 4754d922..4014c46e 100644 --- a/dynamic_vino_lib/src/outputs/ros_service_output.cpp +++ b/vino_core_lib/src/outputs/ros_service_output.cpp @@ -20,7 +20,7 @@ #include #include #include -#include "dynamic_vino_lib/outputs/ros_service_output.h" +#include "vino_core_lib/outputs/ros_service_output.h" #include "cv_bridge/cv_bridge.h" #include // Outputs::RosServiceOutput::RosServiceOutput() diff --git a/dynamic_vino_lib/src/outputs/ros_topic_output.cpp b/vino_core_lib/src/outputs/ros_topic_output.cpp similarity index 93% rename from dynamic_vino_lib/src/outputs/ros_topic_output.cpp rename to vino_core_lib/src/outputs/ros_topic_output.cpp index bf49187b..cbad29fc 100644 --- a/dynamic_vino_lib/src/outputs/ros_topic_output.cpp +++ b/vino_core_lib/src/outputs/ros_topic_output.cpp @@ -19,7 +19,7 @@ * @file ros_topic_output.cpp */ -#include "dynamic_vino_lib/outputs/ros_topic_output.h" +#include "vino_core_lib/outputs/ros_topic_output.h" #include #include #include @@ -55,7 +55,7 @@ void Outputs::RosTopicOutput::feedFrame(const cv::Mat& frame) {} void Outputs::RosTopicOutput::accept( - const std::vector & results) + const std::vector & results) { person_reid_msg_ptr_ = std::make_shared(); vino_people_msgs::Reidentification person; @@ -72,7 +72,7 @@ void Outputs::RosTopicOutput::accept( } void Outputs::RosTopicOutput::accept( - const std::vector & results) + const std::vector & results) { segmented_object_msg_ptr_ = std::make_shared(); vino_people_msgs::ObjectInMask object; @@ -97,7 +97,7 @@ void Outputs::RosTopicOutput::accept( void Outputs::RosTopicOutput::accept( - const std::vector& results) + const std::vector& results) { faces_msg_ptr_ = std::make_shared(); @@ -116,7 +116,7 @@ void Outputs::RosTopicOutput::accept( } void Outputs::RosTopicOutput::accept( - const std::vector& results) + const std::vector& results) { emotions_msg_ptr_ = std::make_shared(); @@ -134,7 +134,7 @@ void Outputs::RosTopicOutput::accept( } void Outputs::RosTopicOutput::accept( - const std::vector& results) + const std::vector& results) { age_gender_msg_ptr_ = std::make_shared(); @@ -163,7 +163,7 @@ void Outputs::RosTopicOutput::accept( } void Outputs::RosTopicOutput::accept( - const std::vector& results) + const std::vector& results) { headpose_msg_ptr_ = std::make_shared(); @@ -183,7 +183,7 @@ void Outputs::RosTopicOutput::accept( } void Outputs::RosTopicOutput::accept( - const std::vector& results) + const std::vector& results) { object_msg_ptr_ = std::make_shared(); diff --git a/dynamic_vino_lib/src/outputs/rviz_output.cpp b/vino_core_lib/src/outputs/rviz_output.cpp similarity index 76% rename from dynamic_vino_lib/src/outputs/rviz_output.cpp rename to vino_core_lib/src/outputs/rviz_output.cpp index 64f99b92..dabd929c 100644 --- a/dynamic_vino_lib/src/outputs/rviz_output.cpp +++ b/vino_core_lib/src/outputs/rviz_output.cpp @@ -22,8 +22,8 @@ #include #include #include "cv_bridge/cv_bridge.h" -#include "dynamic_vino_lib/pipeline.h" -#include "dynamic_vino_lib/outputs/rviz_output.h" +#include "vino_core_lib/pipeline.h" +#include "vino_core_lib/outputs/rviz_output.h" Outputs::RvizOutput::RvizOutput() { @@ -37,37 +37,37 @@ void Outputs::RvizOutput::feedFrame(const cv::Mat & frame) image_window_output_->feedFrame(frame); } -void Outputs::RvizOutput::accept(const std::vector & results) +void Outputs::RvizOutput::accept(const std::vector & results) { image_window_output_->accept(results); } void Outputs::RvizOutput::accept( - const std::vector & results) + const std::vector & results) { image_window_output_->accept(results); } -void Outputs::RvizOutput::accept(const std::vector & results) +void Outputs::RvizOutput::accept(const std::vector & results) { image_window_output_->accept(results); } -void Outputs::RvizOutput::accept(const std::vector & results) +void Outputs::RvizOutput::accept(const std::vector & results) { image_window_output_->accept(results); } -void Outputs::RvizOutput::accept(const std::vector & results) +void Outputs::RvizOutput::accept(const std::vector & results) { image_window_output_->accept(results); } -void Outputs::RvizOutput::accept(const std::vector& results) +void Outputs::RvizOutput::accept(const std::vector& results) { image_window_output_->accept(results); } -void Outputs::RvizOutput::accept(const std::vector & results) +void Outputs::RvizOutput::accept(const std::vector & results) { image_window_output_->accept(results); } diff --git a/dynamic_vino_lib/src/pipeline.cpp b/vino_core_lib/src/pipeline.cpp similarity index 95% rename from dynamic_vino_lib/src/pipeline.cpp rename to vino_core_lib/src/pipeline.cpp index 4da9fea4..17cb2d77 100644 --- a/dynamic_vino_lib/src/pipeline.cpp +++ b/vino_core_lib/src/pipeline.cpp @@ -24,7 +24,7 @@ #include #include -#include "dynamic_vino_lib/pipeline.h" +#include "vino_core_lib/pipeline.h" Pipeline::Pipeline(const std::string& name) { @@ -101,7 +101,7 @@ bool Pipeline::add(const std::string& name, } bool Pipeline::add(const std::string& parent, const std::string& name, - std::shared_ptr inference) + std::shared_ptr inference) { if (name_to_detection_map_.find(parent) == name_to_detection_map_.end() && input_device_name_ != parent) @@ -116,13 +116,13 @@ bool Pipeline::add(const std::string& parent, const std::string& name, } bool Pipeline::add(const std::string& name, - std::shared_ptr inference) { + std::shared_ptr inference) { if (name.empty()) { slog::err << "Item name can't be empty!" << slog::endl; return false; } - std::map>::iterator it = name_to_detection_map_.find(name); + std::map>::iterator it = name_to_detection_map_.find(name); if (it != name_to_detection_map_.end()) { slog::warn << "inferance instance for [" << name << "] already exists, update it with new instance." << slog::endl; @@ -267,7 +267,7 @@ void Pipeline::callback(const std::string& detection_name) auto next_detection_ptr = detection_ptr_iter->second; for (int i = 0; i < detection_ptr->getResultsLength(); ++i) { - const dynamic_vino_lib::Result* prev_result = + const vino_core_lib::Result* prev_result = detection_ptr->getLocationResult(i); auto clippedRect = prev_result->getLocation() & cv::Rect(0, 0, width_, height_); diff --git a/dynamic_vino_lib/src/pipeline_manager.cpp b/vino_core_lib/src/pipeline_manager.cpp similarity index 83% rename from dynamic_vino_lib/src/pipeline_manager.cpp rename to vino_core_lib/src/pipeline_manager.cpp index 0e066d8f..497e863c 100644 --- a/dynamic_vino_lib/src/pipeline_manager.cpp +++ b/vino_core_lib/src/pipeline_manager.cpp @@ -24,27 +24,27 @@ #include #include -#include "dynamic_vino_lib/factory.h" -#include "dynamic_vino_lib/inferences/age_gender_detection.h" -#include "dynamic_vino_lib/inferences/emotions_detection.h" -#include "dynamic_vino_lib/inferences/face_detection.h" -#include "dynamic_vino_lib/inferences/head_pose_detection.h" -#include "dynamic_vino_lib/inputs/image_input.h" -#include "dynamic_vino_lib/inputs/realsense_camera.h" -#include "dynamic_vino_lib/inputs/realsense_camera_topic.h" -#include "dynamic_vino_lib/inputs/standard_camera.h" -#include "dynamic_vino_lib/inputs/video_input.h" -#include "dynamic_vino_lib/models/age_gender_detection_model.h" -#include "dynamic_vino_lib/models/emotion_detection_model.h" -#include "dynamic_vino_lib/models/face_detection_model.h" -#include "dynamic_vino_lib/models/head_pose_detection_model.h" -#include "dynamic_vino_lib/outputs/image_window_output.h" -#include "dynamic_vino_lib/outputs/ros_topic_output.h" -#include "dynamic_vino_lib/outputs/rviz_output.h" -#include "dynamic_vino_lib/outputs/ros_service_output.h" -#include "dynamic_vino_lib/pipeline.h" -#include "dynamic_vino_lib/pipeline_manager.h" -#include "dynamic_vino_lib/pipeline_params.h" +#include "vino_core_lib/factory.h" +#include "vino_core_lib/inferences/age_gender_detection.h" +#include "vino_core_lib/inferences/emotions_detection.h" +#include "vino_core_lib/inferences/face_detection.h" +#include "vino_core_lib/inferences/head_pose_detection.h" +#include "vino_core_lib/inputs/image_input.h" +#include "vino_core_lib/inputs/realsense_camera.h" +#include "vino_core_lib/inputs/realsense_camera_topic.h" +#include "vino_core_lib/inputs/standard_camera.h" +#include "vino_core_lib/inputs/video_input.h" +#include "vino_core_lib/models/age_gender_detection_model.h" +#include "vino_core_lib/models/emotion_detection_model.h" +#include "vino_core_lib/models/face_detection_model.h" +#include "vino_core_lib/models/head_pose_detection_model.h" +#include "vino_core_lib/outputs/image_window_output.h" +#include "vino_core_lib/outputs/ros_topic_output.h" +#include "vino_core_lib/outputs/rviz_output.h" +#include "vino_core_lib/outputs/ros_service_output.h" +#include "vino_core_lib/pipeline.h" +#include "vino_core_lib/pipeline_manager.h" +#include "vino_core_lib/pipeline_params.h" std::shared_ptr PipelineManager::createPipeline( const Params::ParamManager::PipelineParams& params) { @@ -156,7 +156,7 @@ PipelineManager::parseOutput( return outputs; } -std::map> +std::map> PipelineManager::parseInference( const Params::ParamManager::PipelineParams& params) { /**< update plugins for devices >**/ @@ -165,14 +165,14 @@ PipelineManager::parseInference( std::string FLAGS_c = pcommon.custom_cldnn_library; bool FLAGS_pc = pcommon.enable_performance_count; - std::map> + std::map> inferences; for (auto& infer : params.infers) { if (infer.name.empty() || infer.model.empty()) { continue; } slog::info << "Parsing Inference: " << infer.name << slog::endl; - std::shared_ptr object = nullptr; + std::shared_ptr object = nullptr; if (plugins_for_devices_.find(infer.engine) == plugins_for_devices_.end()) { plugins_for_devices_[infer.engine] = *Factory::makePluginByName(infer.engine, FLAGS_l, FLAGS_c, FLAGS_pc); @@ -214,7 +214,7 @@ PipelineManager::parseInference( return inferences; } -std::shared_ptr +std::shared_ptr PipelineManager::createFaceDetection( const Params::ParamManager::InferenceParams& infer) { // TODO: add batch size in param_manager @@ -223,7 +223,7 @@ PipelineManager::createFaceDetection( face_detection_model->modelInit(); auto face_detection_engine = std::make_shared( plugins_for_devices_[infer.engine], face_detection_model); - auto face_inference_ptr = std::make_shared( + auto face_inference_ptr = std::make_shared( 0.5); // TODO: add output_threshold in param_manager face_inference_ptr->loadNetwork(face_detection_model); face_inference_ptr->loadEngine(face_detection_engine); @@ -231,7 +231,7 @@ PipelineManager::createFaceDetection( return face_inference_ptr; } -std::shared_ptr +std::shared_ptr PipelineManager::createAgeGenderRecognition( const Params::ParamManager::InferenceParams& param) { auto model = @@ -239,14 +239,14 @@ PipelineManager::createAgeGenderRecognition( model->modelInit(); auto engine = std::make_shared( plugins_for_devices_[param.engine], model); - auto infer = std::make_shared(); + auto infer = std::make_shared(); infer->loadNetwork(model); infer->loadEngine(engine); return infer; } -std::shared_ptr +std::shared_ptr PipelineManager::createEmotionRecognition( const Params::ParamManager::InferenceParams& param) { auto model = @@ -254,14 +254,14 @@ PipelineManager::createEmotionRecognition( model->modelInit(); auto engine = std::make_shared( plugins_for_devices_[param.engine], model); - auto infer = std::make_shared(); + auto infer = std::make_shared(); infer->loadNetwork(model); infer->loadEngine(engine); return infer; } -std::shared_ptr +std::shared_ptr PipelineManager::createHeadPoseEstimation( const Params::ParamManager::InferenceParams& param) { auto model = @@ -269,14 +269,14 @@ PipelineManager::createHeadPoseEstimation( model->modelInit(); auto engine = std::make_shared( plugins_for_devices_[param.engine], model); - auto infer = std::make_shared(); + auto infer = std::make_shared(); infer->loadNetwork(model); infer->loadEngine(engine); return infer; } -std::shared_ptr +std::shared_ptr PipelineManager::createObjectDetection( const Params::ParamManager::InferenceParams & infer) { @@ -285,7 +285,7 @@ const Params::ParamManager::InferenceParams & infer) object_detection_model->modelInit(); auto object_detection_engine = std::make_shared( plugins_for_devices_[infer.engine], object_detection_model); - auto object_inference_ptr = std::make_shared( + auto object_inference_ptr = std::make_shared( infer.enable_roi_constraint, infer.confidence_threshold); // To-do theshold configuration object_inference_ptr->loadNetwork(object_detection_model); object_inference_ptr->loadEngine(object_detection_engine); @@ -293,7 +293,7 @@ const Params::ParamManager::InferenceParams & infer) return object_inference_ptr; } -std::shared_ptr +std::shared_ptr PipelineManager::createObjectSegmentation(const Params::ParamManager::InferenceParams & infer) { auto obejct_segmentation_model = @@ -301,14 +301,14 @@ PipelineManager::createObjectSegmentation(const Params::ParamManager::InferenceP obejct_segmentation_model->modelInit(); auto obejct_segmentation_engine = std::make_shared( plugins_for_devices_[infer.engine], obejct_segmentation_model); - auto segmentation_inference_ptr = std::make_shared(0.5); + auto segmentation_inference_ptr = std::make_shared(0.5); segmentation_inference_ptr->loadNetwork(obejct_segmentation_model); segmentation_inference_ptr->loadEngine(obejct_segmentation_engine); return segmentation_inference_ptr; } -std::shared_ptr +std::shared_ptr PipelineManager::createPersonReidentification( const Params::ParamManager::InferenceParams & infer) { @@ -318,7 +318,7 @@ PipelineManager::createPersonReidentification( auto person_reidentification_engine = std::make_shared( plugins_for_devices_[infer.engine], person_reidentification_model); auto reidentification_inference_ptr = - std::make_shared(infer.confidence_threshold); + std::make_shared(infer.confidence_threshold); reidentification_inference_ptr->loadNetwork(person_reidentification_model); reidentification_inference_ptr->loadEngine(person_reidentification_engine); diff --git a/dynamic_vino_lib/src/pipeline_params.cpp b/vino_core_lib/src/pipeline_params.cpp similarity index 97% rename from dynamic_vino_lib/src/pipeline_params.cpp rename to vino_core_lib/src/pipeline_params.cpp index 947688a5..f5d3bba1 100644 --- a/dynamic_vino_lib/src/pipeline_params.cpp +++ b/vino_core_lib/src/pipeline_params.cpp @@ -24,7 +24,7 @@ #include #include -#include "dynamic_vino_lib/pipeline_params.h" +#include "vino_core_lib/pipeline_params.h" PipelineParams::PipelineParams(const std::string& name) { params_.name = name; } diff --git a/dynamic_vino_lib/src/services/frame_processing_server.cpp b/vino_core_lib/src/services/frame_processing_server.cpp similarity index 92% rename from dynamic_vino_lib/src/services/frame_processing_server.cpp rename to vino_core_lib/src/services/frame_processing_server.cpp index b823aab3..2f9675f4 100644 --- a/dynamic_vino_lib/src/services/frame_processing_server.cpp +++ b/vino_core_lib/src/services/frame_processing_server.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dynamic_vino_lib/services/frame_processing_server.h" +#include "vino_core_lib/services/frame_processing_server.h" #include #include #include @@ -25,11 +25,11 @@ #include #include -#include "dynamic_vino_lib/pipeline_manager.h" -#include "dynamic_vino_lib/pipeline.h" -#include "dynamic_vino_lib/inputs/base_input.h" -#include "dynamic_vino_lib/inputs/image_input.h" -#include "dynamic_vino_lib/slog.h" +#include "vino_core_lib/pipeline_manager.h" +#include "vino_core_lib/pipeline.h" +#include "vino_core_lib/inputs/base_input.h" +#include "vino_core_lib/inputs/image_input.h" +#include "vino_core_lib/slog.h" namespace vino_service { diff --git a/vino_launch/CMakeLists.txt b/vino_launch/CMakeLists.txt index b463d711..1af2dc8c 100644 --- a/vino_launch/CMakeLists.txt +++ b/vino_launch/CMakeLists.txt @@ -22,9 +22,9 @@ catkin_package( LIBRARIES ${PROJECT_NAME} CATKIN_DEPENDS roslaunch - dynamic_vino_lib + vino_core_lib vino_param_lib - dynamic_vino_sample + vino_sample nodelet ) diff --git a/vino_launch/launch/image_object_server.launch b/vino_launch/launch/image_object_server.launch index d8ed17cd..f1e7c428 100644 --- a/vino_launch/launch/image_object_server.launch +++ b/vino_launch/launch/image_object_server.launch @@ -2,7 +2,7 @@ - diff --git a/vino_launch/launch/image_object_server_oss.launch b/vino_launch/launch/image_object_server_oss.launch index a2698e2b..69ee5972 100644 --- a/vino_launch/launch/image_object_server_oss.launch +++ b/vino_launch/launch/image_object_server_oss.launch @@ -2,7 +2,7 @@ - diff --git a/vino_launch/launch/image_people_server.launch b/vino_launch/launch/image_people_server.launch index eacd85fa..2846803a 100644 --- a/vino_launch/launch/image_people_server.launch +++ b/vino_launch/launch/image_people_server.launch @@ -2,7 +2,7 @@ - diff --git a/vino_launch/launch/image_people_server_oss.launch b/vino_launch/launch/image_people_server_oss.launch index 0d9bcf8b..f26cf97c 100644 --- a/vino_launch/launch/image_people_server_oss.launch +++ b/vino_launch/launch/image_people_server_oss.launch @@ -2,7 +2,7 @@ - diff --git a/vino_launch/launch/image_reidentification_server_oss.launch b/vino_launch/launch/image_reidentification_server_oss.launch index 3ea12149..96576c00 100644 --- a/vino_launch/launch/image_reidentification_server_oss.launch +++ b/vino_launch/launch/image_reidentification_server_oss.launch @@ -2,7 +2,7 @@ - diff --git a/vino_launch/launch/image_segmentation_server.launch b/vino_launch/launch/image_segmentation_server.launch index 8d748249..8e97e01c 100644 --- a/vino_launch/launch/image_segmentation_server.launch +++ b/vino_launch/launch/image_segmentation_server.launch @@ -2,7 +2,7 @@ - diff --git a/vino_launch/launch/pipeline_image.launch b/vino_launch/launch/pipeline_image.launch index ac037862..f2995a25 100644 --- a/vino_launch/launch/pipeline_image.launch +++ b/vino_launch/launch/pipeline_image.launch @@ -3,7 +3,7 @@ - diff --git a/vino_launch/launch/pipeline_image_oss.launch b/vino_launch/launch/pipeline_image_oss.launch index 04d43e8f..20de794c 100644 --- a/vino_launch/launch/pipeline_image_oss.launch +++ b/vino_launch/launch/pipeline_image_oss.launch @@ -2,7 +2,7 @@ - diff --git a/vino_launch/launch/pipeline_object.launch b/vino_launch/launch/pipeline_object.launch index 021ed11b..8debc692 100644 --- a/vino_launch/launch/pipeline_object.launch +++ b/vino_launch/launch/pipeline_object.launch @@ -2,7 +2,7 @@ - diff --git a/vino_launch/launch/pipeline_object_oss.launch b/vino_launch/launch/pipeline_object_oss.launch index 8f450044..bb76808f 100644 --- a/vino_launch/launch/pipeline_object_oss.launch +++ b/vino_launch/launch/pipeline_object_oss.launch @@ -2,7 +2,7 @@ - diff --git a/vino_launch/launch/pipeline_object_oss_topic.launch b/vino_launch/launch/pipeline_object_oss_topic.launch index 5624dfea..121726f3 100644 --- a/vino_launch/launch/pipeline_object_oss_topic.launch +++ b/vino_launch/launch/pipeline_object_oss_topic.launch @@ -11,7 +11,7 @@ - diff --git a/vino_launch/launch/pipeline_object_topic.launch b/vino_launch/launch/pipeline_object_topic.launch index 3e2f0e98..8424ee13 100644 --- a/vino_launch/launch/pipeline_object_topic.launch +++ b/vino_launch/launch/pipeline_object_topic.launch @@ -11,7 +11,7 @@ - diff --git a/vino_launch/launch/pipeline_param.launch b/vino_launch/launch/pipeline_param.launch index 0e2031f8..8236b236 100644 --- a/vino_launch/launch/pipeline_param.launch +++ b/vino_launch/launch/pipeline_param.launch @@ -1,7 +1,7 @@ - diff --git a/vino_launch/launch/pipeline_people_myriad.launch b/vino_launch/launch/pipeline_people_myriad.launch index 2dbc86ca..9b49eddc 100644 --- a/vino_launch/launch/pipeline_people_myriad.launch +++ b/vino_launch/launch/pipeline_people_myriad.launch @@ -2,7 +2,7 @@ - diff --git a/vino_launch/launch/pipeline_people_oss.launch b/vino_launch/launch/pipeline_people_oss.launch index 0d7a2b13..db5e91a5 100644 --- a/vino_launch/launch/pipeline_people_oss.launch +++ b/vino_launch/launch/pipeline_people_oss.launch @@ -2,7 +2,7 @@ - diff --git a/vino_launch/launch/pipeline_reidentification.launch b/vino_launch/launch/pipeline_reidentification.launch index 5461fcc9..c9fd5fed 100644 --- a/vino_launch/launch/pipeline_reidentification.launch +++ b/vino_launch/launch/pipeline_reidentification.launch @@ -2,7 +2,7 @@ - diff --git a/vino_launch/launch/pipeline_reidentification_oss.launch b/vino_launch/launch/pipeline_reidentification_oss.launch index eaa393e3..83828d2a 100644 --- a/vino_launch/launch/pipeline_reidentification_oss.launch +++ b/vino_launch/launch/pipeline_reidentification_oss.launch @@ -2,7 +2,7 @@ - diff --git a/vino_launch/launch/pipeline_segmentation.launch b/vino_launch/launch/pipeline_segmentation.launch index 4a47a9e3..5074e480 100644 --- a/vino_launch/launch/pipeline_segmentation.launch +++ b/vino_launch/launch/pipeline_segmentation.launch @@ -11,7 +11,7 @@ - diff --git a/vino_launch/launch/pipeline_video.launch b/vino_launch/launch/pipeline_video.launch index f74971b7..c0d5fc97 100644 --- a/vino_launch/launch/pipeline_video.launch +++ b/vino_launch/launch/pipeline_video.launch @@ -2,7 +2,7 @@ - diff --git a/vino_launch/package.xml b/vino_launch/package.xml index 27e5b3ab..d78cd8fe 100644 --- a/vino_launch/package.xml +++ b/vino_launch/package.xml @@ -26,16 +26,16 @@ limitations under the License. catkin roslaunch - dynamic_vino_lib + vino_core_lib vino_param_lib - dynamic_vino_sample + vino_sample usb_cam nodelet roslaunch - dynamic_vino_lib + vino_core_lib vino_param_lib - dynamic_vino_sample + vino_sample usb_cam nodelet diff --git a/people_msgs/CMakeLists.txt b/vino_people_msgs/CMakeLists.txt similarity index 100% rename from people_msgs/CMakeLists.txt rename to vino_people_msgs/CMakeLists.txt diff --git a/people_msgs/msg/AgeGender.msg b/vino_people_msgs/msg/AgeGender.msg similarity index 100% rename from people_msgs/msg/AgeGender.msg rename to vino_people_msgs/msg/AgeGender.msg diff --git a/people_msgs/msg/AgeGenderStamped.msg b/vino_people_msgs/msg/AgeGenderStamped.msg similarity index 100% rename from people_msgs/msg/AgeGenderStamped.msg rename to vino_people_msgs/msg/AgeGenderStamped.msg diff --git a/people_msgs/msg/Emotion.msg b/vino_people_msgs/msg/Emotion.msg similarity index 100% rename from people_msgs/msg/Emotion.msg rename to vino_people_msgs/msg/Emotion.msg diff --git a/people_msgs/msg/EmotionsStamped.msg b/vino_people_msgs/msg/EmotionsStamped.msg similarity index 100% rename from people_msgs/msg/EmotionsStamped.msg rename to vino_people_msgs/msg/EmotionsStamped.msg diff --git a/people_msgs/msg/HeadPose.msg b/vino_people_msgs/msg/HeadPose.msg similarity index 100% rename from people_msgs/msg/HeadPose.msg rename to vino_people_msgs/msg/HeadPose.msg diff --git a/people_msgs/msg/HeadPoseStamped.msg b/vino_people_msgs/msg/HeadPoseStamped.msg similarity index 100% rename from people_msgs/msg/HeadPoseStamped.msg rename to vino_people_msgs/msg/HeadPoseStamped.msg diff --git a/people_msgs/msg/ObjectInMask.msg b/vino_people_msgs/msg/ObjectInMask.msg similarity index 100% rename from people_msgs/msg/ObjectInMask.msg rename to vino_people_msgs/msg/ObjectInMask.msg diff --git a/people_msgs/msg/ObjectsInMasks.msg b/vino_people_msgs/msg/ObjectsInMasks.msg similarity index 100% rename from people_msgs/msg/ObjectsInMasks.msg rename to vino_people_msgs/msg/ObjectsInMasks.msg diff --git a/people_msgs/msg/PersonsStamped.msg b/vino_people_msgs/msg/PersonsStamped.msg similarity index 100% rename from people_msgs/msg/PersonsStamped.msg rename to vino_people_msgs/msg/PersonsStamped.msg diff --git a/people_msgs/msg/Reidentification.msg b/vino_people_msgs/msg/Reidentification.msg similarity index 100% rename from people_msgs/msg/Reidentification.msg rename to vino_people_msgs/msg/Reidentification.msg diff --git a/people_msgs/msg/ReidentificationStamped.msg b/vino_people_msgs/msg/ReidentificationStamped.msg similarity index 100% rename from people_msgs/msg/ReidentificationStamped.msg rename to vino_people_msgs/msg/ReidentificationStamped.msg diff --git a/people_msgs/package.xml b/vino_people_msgs/package.xml similarity index 100% rename from people_msgs/package.xml rename to vino_people_msgs/package.xml diff --git a/people_msgs/srv/AgeGenderSrv.srv b/vino_people_msgs/srv/AgeGenderSrv.srv similarity index 100% rename from people_msgs/srv/AgeGenderSrv.srv rename to vino_people_msgs/srv/AgeGenderSrv.srv diff --git a/people_msgs/srv/EmotionSrv.srv b/vino_people_msgs/srv/EmotionSrv.srv similarity index 100% rename from people_msgs/srv/EmotionSrv.srv rename to vino_people_msgs/srv/EmotionSrv.srv diff --git a/people_msgs/srv/HeadPoseSrv.srv b/vino_people_msgs/srv/HeadPoseSrv.srv similarity index 100% rename from people_msgs/srv/HeadPoseSrv.srv rename to vino_people_msgs/srv/HeadPoseSrv.srv diff --git a/people_msgs/srv/ObjectsInMasksSrv.srv b/vino_people_msgs/srv/ObjectsInMasksSrv.srv similarity index 100% rename from people_msgs/srv/ObjectsInMasksSrv.srv rename to vino_people_msgs/srv/ObjectsInMasksSrv.srv diff --git a/people_msgs/srv/PeopleSrv.srv b/vino_people_msgs/srv/PeopleSrv.srv similarity index 100% rename from people_msgs/srv/PeopleSrv.srv rename to vino_people_msgs/srv/PeopleSrv.srv diff --git a/people_msgs/srv/ReidentificationSrv.srv b/vino_people_msgs/srv/ReidentificationSrv.srv similarity index 100% rename from people_msgs/srv/ReidentificationSrv.srv rename to vino_people_msgs/srv/ReidentificationSrv.srv diff --git a/sample/CMakeLists.txt b/vino_sample/CMakeLists.txt similarity index 95% rename from sample/CMakeLists.txt rename to vino_sample/CMakeLists.txt index 6fabba0a..f2cbe305 100644 --- a/sample/CMakeLists.txt +++ b/vino_sample/CMakeLists.txt @@ -14,7 +14,7 @@ cmake_minimum_required(VERSION 2.8.3) -project(dynamic_vino_sample) +project(vino_sample) message(STATUS "Looking for inference engine configuration file at: ${CMAKE_PREFIX_PATH}") find_package(InferenceEngine 1.1) @@ -30,7 +30,7 @@ find_package( object_msgs vino_people_msgs vino_param_lib - dynamic_vino_lib + vino_core_lib ) find_package( @@ -47,7 +47,7 @@ catkin_package( roscpp object_msgs vino_param_lib - dynamic_vino_lib + vino_core_lib ) if (CMAKE_BUILD_TYPE EQUAL "RELEASE") @@ -66,7 +66,7 @@ include_directories ( ${InferenceEngine_INCLUDE_DIRS}/../build/samples/thirdparty/gflags/include ${InferenceEngine_INCLUDE_DIRS}/../samples ${InferenceEngine_DIR}/../src - ${dynamic_vino_lib_INCLUDE_DIRS} + ${vino_core_lib_INCLUDE_DIRS} ${vino_param_lib_INCLUDE_DIRS} ) @@ -104,7 +104,7 @@ add_executable(pipeline_with_params add_dependencies(pipeline_with_params ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS} - ${dynamic_vino_lib_TARGETS} + ${vino_core_lib_TARGETS} ) target_link_libraries(pipeline_with_params @@ -123,7 +123,7 @@ add_executable(image_people_server add_dependencies(image_people_server ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS} - ${dynamic_vino_lib_TARGETS} + ${vino_core_lib_TARGETS} ) target_link_libraries(image_people_server @@ -143,7 +143,7 @@ add_executable(image_people_client add_dependencies(image_people_client ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS} - ${dynamic_vino_lib_TARGETS} + ${vino_core_lib_TARGETS} ) target_link_libraries(image_people_client @@ -162,7 +162,7 @@ add_executable(image_object_server add_dependencies(image_object_server ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS} - ${dynamic_vino_lib_TARGETS} + ${vino_core_lib_TARGETS} ) target_link_libraries(image_object_server @@ -182,7 +182,7 @@ add_executable(image_object_client add_dependencies(image_object_client ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS} - ${dynamic_vino_lib_TARGETS} + ${vino_core_lib_TARGETS} ) target_link_libraries(image_object_client @@ -202,7 +202,7 @@ add_executable(image_segmentation_client add_dependencies(image_segmentation_client ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS} - ${dynamic_vino_lib_TARGETS} + ${vino_core_lib_TARGETS} ) target_link_libraries(image_segmentation_client @@ -221,7 +221,7 @@ add_executable(image_segmentation_server add_dependencies(image_segmentation_server ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS} - ${dynamic_vino_lib_TARGETS} + ${vino_core_lib_TARGETS} ) target_link_libraries(image_segmentation_server @@ -241,7 +241,7 @@ add_executable(image_reidentification_client add_dependencies(image_reidentification_client ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS} - ${dynamic_vino_lib_TARGETS} + ${vino_core_lib_TARGETS} ) target_link_libraries(image_reidentification_client @@ -260,7 +260,7 @@ add_executable(image_reidentification_server add_dependencies(image_reidentification_server ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS} - ${dynamic_vino_lib_TARGETS} + ${vino_core_lib_TARGETS} ) target_link_libraries(image_reidentification_server diff --git a/sample/include/sample/utility.hpp b/vino_sample/include/vino_sample/utility.hpp similarity index 100% rename from sample/include/sample/utility.hpp rename to vino_sample/include/vino_sample/utility.hpp diff --git a/sample/package.xml b/vino_sample/package.xml similarity index 93% rename from sample/package.xml rename to vino_sample/package.xml index 22300c5e..4d6d7fd2 100644 --- a/sample/package.xml +++ b/vino_sample/package.xml @@ -14,7 +14,7 @@ limitations under the License. --> - dynamic_vino_sample + vino_sample 0.3.0 a ROS2 wrapper package for Intel OpenVINO Weizhi Liu @@ -29,7 +29,7 @@ limitations under the License. roscpp roslint std_msgs - dynamic_vino_lib + vino_core_lib vino_param_lib cv_bridge object_msgs @@ -40,7 +40,7 @@ limitations under the License. std_msgs sensor_msgs cv_bridge - dynamic_vino_lib + vino_core_lib vino_param_lib object_msgs vino_people_msgs diff --git a/sample/src/image_object_client.cpp b/vino_sample/src/image_object_client.cpp similarity index 97% rename from sample/src/image_object_client.cpp rename to vino_sample/src/image_object_client.cpp index 1cdddb9a..b377ec5c 100644 --- a/sample/src/image_object_client.cpp +++ b/vino_sample/src/image_object_client.cpp @@ -36,7 +36,7 @@ int main(int argc, char ** argv) ros::NodeHandle n; if (argc != 2) { - ROS_INFO("Usage: rosrun dynamic_vino_sample image_object_client "); + ROS_INFO("Usage: rosrun vino_sample image_object_client "); //You can find a sample image in /opt/openvino_toolkit/ros_openvino_toolkit/data/images/car.png return -1; } diff --git a/sample/src/image_object_server.cpp b/vino_sample/src/image_object_server.cpp similarity index 74% rename from sample/src/image_object_server.cpp rename to vino_sample/src/image_object_server.cpp index 25905814..976f9139 100644 --- a/sample/src/image_object_server.cpp +++ b/vino_sample/src/image_object_server.cpp @@ -40,24 +40,24 @@ #include #include -#include "dynamic_vino_lib/common.h" -#include "dynamic_vino_lib/engines/engine.h" -#include "dynamic_vino_lib/factory.h" -#include "dynamic_vino_lib/inferences/age_gender_detection.h" -#include "dynamic_vino_lib/inferences/base_inference.h" -#include "dynamic_vino_lib/inferences/emotions_detection.h" -#include "dynamic_vino_lib/inferences/face_detection.h" -#include "dynamic_vino_lib/inferences/head_pose_detection.h" -#include "dynamic_vino_lib/inputs/realsense_camera_topic.h" -#include "dynamic_vino_lib/outputs/image_window_output.h" -#include "dynamic_vino_lib/outputs/ros_topic_output.h" -#include "dynamic_vino_lib/outputs/rviz_output.h" -#include "dynamic_vino_lib/pipeline.h" -#include "dynamic_vino_lib/pipeline_manager.h" -#include "dynamic_vino_lib/slog.h" +#include "vino_core_lib/common.h" +#include "vino_core_lib/engines/engine.h" +#include "vino_core_lib/factory.h" +#include "vino_core_lib/inferences/age_gender_detection.h" +#include "vino_core_lib/inferences/base_inference.h" +#include "vino_core_lib/inferences/emotions_detection.h" +#include "vino_core_lib/inferences/face_detection.h" +#include "vino_core_lib/inferences/head_pose_detection.h" +#include "vino_core_lib/inputs/realsense_camera_topic.h" +#include "vino_core_lib/outputs/image_window_output.h" +#include "vino_core_lib/outputs/ros_topic_output.h" +#include "vino_core_lib/outputs/rviz_output.h" +#include "vino_core_lib/pipeline.h" +#include "vino_core_lib/pipeline_manager.h" +#include "vino_core_lib/slog.h" #include "inference_engine.hpp" #include "opencv2/opencv.hpp" -#include "sample/utility.hpp" +#include "vino_sample/utility.hpp" bool parseAndCheckCommandLine(int argc, char** argv) { diff --git a/sample/src/image_people_client.cpp b/vino_sample/src/image_people_client.cpp similarity index 97% rename from sample/src/image_people_client.cpp rename to vino_sample/src/image_people_client.cpp index 1f2f40f1..1b375c80 100644 --- a/sample/src/image_people_client.cpp +++ b/vino_sample/src/image_people_client.cpp @@ -33,7 +33,7 @@ int main(int argc, char ** argv) ros::NodeHandle n; if (argc != 2) { - ROS_INFO( "Usage: rosrun dynamic_vino_sample image_people_client" + ROS_INFO( "Usage: rosrun vino_sample image_people_client" ""); return -1; } diff --git a/sample/src/image_people_server.cpp b/vino_sample/src/image_people_server.cpp similarity index 73% rename from sample/src/image_people_server.cpp rename to vino_sample/src/image_people_server.cpp index 2e799d44..cde7e21d 100644 --- a/sample/src/image_people_server.cpp +++ b/vino_sample/src/image_people_server.cpp @@ -40,24 +40,24 @@ #include #include -#include "dynamic_vino_lib/common.h" -#include "dynamic_vino_lib/engines/engine.h" -#include "dynamic_vino_lib/factory.h" -#include "dynamic_vino_lib/inferences/age_gender_detection.h" -#include "dynamic_vino_lib/inferences/base_inference.h" -#include "dynamic_vino_lib/inferences/emotions_detection.h" -#include "dynamic_vino_lib/inferences/face_detection.h" -#include "dynamic_vino_lib/inferences/head_pose_detection.h" -#include "dynamic_vino_lib/inputs/realsense_camera_topic.h" -#include "dynamic_vino_lib/outputs/image_window_output.h" -#include "dynamic_vino_lib/outputs/ros_topic_output.h" -#include "dynamic_vino_lib/outputs/rviz_output.h" -#include "dynamic_vino_lib/pipeline.h" -#include "dynamic_vino_lib/pipeline_manager.h" -#include "dynamic_vino_lib/slog.h" +#include "vino_core_lib/common.h" +#include "vino_core_lib/engines/engine.h" +#include "vino_core_lib/factory.h" +#include "vino_core_lib/inferences/age_gender_detection.h" +#include "vino_core_lib/inferences/base_inference.h" +#include "vino_core_lib/inferences/emotions_detection.h" +#include "vino_core_lib/inferences/face_detection.h" +#include "vino_core_lib/inferences/head_pose_detection.h" +#include "vino_core_lib/inputs/realsense_camera_topic.h" +#include "vino_core_lib/outputs/image_window_output.h" +#include "vino_core_lib/outputs/ros_topic_output.h" +#include "vino_core_lib/outputs/rviz_output.h" +#include "vino_core_lib/pipeline.h" +#include "vino_core_lib/pipeline_manager.h" +#include "vino_core_lib/slog.h" #include "inference_engine.hpp" #include "opencv2/opencv.hpp" -#include "sample/utility.hpp" +#include "vino_sample/utility.hpp" bool parseAndCheckCommandLine(int argc, char** argv) diff --git a/sample/src/image_reidentification_client.cpp b/vino_sample/src/image_reidentification_client.cpp similarity index 100% rename from sample/src/image_reidentification_client.cpp rename to vino_sample/src/image_reidentification_client.cpp diff --git a/sample/src/image_reidentification_server.cpp b/vino_sample/src/image_reidentification_server.cpp similarity index 75% rename from sample/src/image_reidentification_server.cpp rename to vino_sample/src/image_reidentification_server.cpp index 9d3fb035..3ddb5480 100644 --- a/sample/src/image_reidentification_server.cpp +++ b/vino_sample/src/image_reidentification_server.cpp @@ -40,24 +40,24 @@ #include #include -#include "dynamic_vino_lib/common.h" -#include "dynamic_vino_lib/engines/engine.h" -#include "dynamic_vino_lib/factory.h" -#include "dynamic_vino_lib/inferences/age_gender_detection.h" -#include "dynamic_vino_lib/inferences/base_inference.h" -#include "dynamic_vino_lib/inferences/emotions_detection.h" -#include "dynamic_vino_lib/inferences/face_detection.h" -#include "dynamic_vino_lib/inferences/head_pose_detection.h" -#include "dynamic_vino_lib/inputs/realsense_camera_topic.h" -#include "dynamic_vino_lib/outputs/image_window_output.h" -#include "dynamic_vino_lib/outputs/ros_topic_output.h" -#include "dynamic_vino_lib/outputs/rviz_output.h" -#include "dynamic_vino_lib/pipeline.h" -#include "dynamic_vino_lib/pipeline_manager.h" -#include "dynamic_vino_lib/slog.h" +#include "vino_core_lib/common.h" +#include "vino_core_lib/engines/engine.h" +#include "vino_core_lib/factory.h" +#include "vino_core_lib/inferences/age_gender_detection.h" +#include "vino_core_lib/inferences/base_inference.h" +#include "vino_core_lib/inferences/emotions_detection.h" +#include "vino_core_lib/inferences/face_detection.h" +#include "vino_core_lib/inferences/head_pose_detection.h" +#include "vino_core_lib/inputs/realsense_camera_topic.h" +#include "vino_core_lib/outputs/image_window_output.h" +#include "vino_core_lib/outputs/ros_topic_output.h" +#include "vino_core_lib/outputs/rviz_output.h" +#include "vino_core_lib/pipeline.h" +#include "vino_core_lib/pipeline_manager.h" +#include "vino_core_lib/slog.h" #include "inference_engine.hpp" #include "opencv2/opencv.hpp" -#include "sample/utility.hpp" +#include "vino_sample/utility.hpp" #include diff --git a/sample/src/image_segmentation_client.cpp b/vino_sample/src/image_segmentation_client.cpp similarity index 100% rename from sample/src/image_segmentation_client.cpp rename to vino_sample/src/image_segmentation_client.cpp diff --git a/sample/src/image_segmentation_server.cpp b/vino_sample/src/image_segmentation_server.cpp similarity index 74% rename from sample/src/image_segmentation_server.cpp rename to vino_sample/src/image_segmentation_server.cpp index cbd6ccec..4536ba15 100644 --- a/sample/src/image_segmentation_server.cpp +++ b/vino_sample/src/image_segmentation_server.cpp @@ -40,24 +40,24 @@ #include #include -#include "dynamic_vino_lib/common.h" -#include "dynamic_vino_lib/engines/engine.h" -#include "dynamic_vino_lib/factory.h" -#include "dynamic_vino_lib/inferences/age_gender_detection.h" -#include "dynamic_vino_lib/inferences/base_inference.h" -#include "dynamic_vino_lib/inferences/emotions_detection.h" -#include "dynamic_vino_lib/inferences/face_detection.h" -#include "dynamic_vino_lib/inferences/head_pose_detection.h" -#include "dynamic_vino_lib/inputs/realsense_camera_topic.h" -#include "dynamic_vino_lib/outputs/image_window_output.h" -#include "dynamic_vino_lib/outputs/ros_topic_output.h" -#include "dynamic_vino_lib/outputs/rviz_output.h" -#include "dynamic_vino_lib/pipeline.h" -#include "dynamic_vino_lib/pipeline_manager.h" -#include "dynamic_vino_lib/slog.h" +#include "vino_core_lib/common.h" +#include "vino_core_lib/engines/engine.h" +#include "vino_core_lib/factory.h" +#include "vino_core_lib/inferences/age_gender_detection.h" +#include "vino_core_lib/inferences/base_inference.h" +#include "vino_core_lib/inferences/emotions_detection.h" +#include "vino_core_lib/inferences/face_detection.h" +#include "vino_core_lib/inferences/head_pose_detection.h" +#include "vino_core_lib/inputs/realsense_camera_topic.h" +#include "vino_core_lib/outputs/image_window_output.h" +#include "vino_core_lib/outputs/ros_topic_output.h" +#include "vino_core_lib/outputs/rviz_output.h" +#include "vino_core_lib/pipeline.h" +#include "vino_core_lib/pipeline_manager.h" +#include "vino_core_lib/slog.h" #include "inference_engine.hpp" #include "opencv2/opencv.hpp" -#include "sample/utility.hpp" +#include "vino_sample/utility.hpp" diff --git a/sample/src/pipeline_with_params.cpp b/vino_sample/src/pipeline_with_params.cpp similarity index 79% rename from sample/src/pipeline_with_params.cpp rename to vino_sample/src/pipeline_with_params.cpp index 475d6cb3..e1bb29e1 100644 --- a/sample/src/pipeline_with_params.cpp +++ b/vino_sample/src/pipeline_with_params.cpp @@ -40,24 +40,24 @@ #include #include -#include "dynamic_vino_lib/common.h" -#include "dynamic_vino_lib/engines/engine.h" -#include "dynamic_vino_lib/factory.h" -#include "dynamic_vino_lib/inferences/age_gender_detection.h" -#include "dynamic_vino_lib/inferences/base_inference.h" -#include "dynamic_vino_lib/inferences/emotions_detection.h" -#include "dynamic_vino_lib/inferences/face_detection.h" -#include "dynamic_vino_lib/inferences/head_pose_detection.h" -#include "dynamic_vino_lib/inputs/realsense_camera_topic.h" -#include "dynamic_vino_lib/outputs/image_window_output.h" -#include "dynamic_vino_lib/outputs/ros_topic_output.h" -#include "dynamic_vino_lib/outputs/rviz_output.h" -#include "dynamic_vino_lib/pipeline.h" -#include "dynamic_vino_lib/pipeline_manager.h" -#include "dynamic_vino_lib/slog.h" +#include "vino_core_lib/common.h" +#include "vino_core_lib/engines/engine.h" +#include "vino_core_lib/factory.h" +#include "vino_core_lib/inferences/age_gender_detection.h" +#include "vino_core_lib/inferences/base_inference.h" +#include "vino_core_lib/inferences/emotions_detection.h" +#include "vino_core_lib/inferences/face_detection.h" +#include "vino_core_lib/inferences/head_pose_detection.h" +#include "vino_core_lib/inputs/realsense_camera_topic.h" +#include "vino_core_lib/outputs/image_window_output.h" +#include "vino_core_lib/outputs/ros_topic_output.h" +#include "vino_core_lib/outputs/rviz_output.h" +#include "vino_core_lib/pipeline.h" +#include "vino_core_lib/pipeline_manager.h" +#include "vino_core_lib/slog.h" #include "inference_engine.hpp" #include "opencv2/opencv.hpp" -#include "sample/utility.hpp" +#include "vino_sample/utility.hpp" void signalHandler(int signum) {