diff --git a/README.md b/README.md index 88cad91a..3837e09e 100644 --- a/README.md +++ b/README.md @@ -173,16 +173,16 @@ Specific topic(s) can be generated and published according to the given inferenc |Inference|Published Topic| |---|---| |People Detection|```/ros2_openvino_toolkit/face_detection```([object_msgs:msg:ObjectsInBoxes](https://github.com/intel/ros2_object_msgs/blob/master/msg/ObjectsInBoxes.msg))| -|Emotion Recognition|```/ros2_openvino_toolkit/emotions_recognition```([people_msgs:msg:EmotionsStamped](../../../people_msgs/msg/EmotionsStamped.msg))| -|Age and Gender Recognition|```/ros2_openvino_toolkit/age_genders_Recognition```([people_msgs:msg:AgeGenderStamped](../../../people_msgs/msg/AgeGenderStamped.msg))| -|Head Pose Estimation|```/ros2_openvino_toolkit/headposes_estimation```([people_msgs:msg:HeadPoseStamped](../../../people_msgs/msg/HeadPoseStamped.msg))| +|Emotion Recognition|```/ros2_openvino_toolkit/emotions_recognition```([openvino_people_msgs:msg:EmotionsStamped](../../../openvino_people_msgs/msg/EmotionsStamped.msg))| +|Age and Gender Recognition|```/ros2_openvino_toolkit/age_genders_Recognition```([openvino_people_msgs:msg:AgeGenderStamped](../../../openvino_people_msgs/msg/AgeGenderStamped.msg))| +|Head Pose Estimation|```/ros2_openvino_toolkit/headposes_estimation```([openvino_people_msgs:msg:HeadPoseStamped](../../../openvino_people_msgs/msg/HeadPoseStamped.msg))| |Object Detection|```/ros2_openvino_toolkit/detected_objects```([object_msgs::msg::ObjectsInBoxes](https://github.com/intel/ros2_object_msgs/blob/master/msg/ObjectsInBoxes.msg))| -|Object Segmentation|```/ros2_openvino_toolkit/segmented_obejcts```([people_msgs::msg::ObjectsInMasks](../../../people_msgs/msg/ObjectsInMasks.msg))| -|Object Segmentation Maskrcnn|```/ros2_openvino_toolkit/segmented_obejcts```([people_msgs::msg::ObjectsInMasks](../../../people_msgs/msg/ObjectsInMasks.msg))| -|Person Reidentification|```/ros2_openvino_toolkit/reidentified_persons```([people_msgs::msg::ReidentificationStamped](../../../people_msgs/msg/ReidentificationStamped.msg))| -|Face Reidenfication|```/ros2_openvino_toolkit/reidentified_faces```([people_msgs::msg::ReidentificationStamped](../../../people_msgs/msg/ReidentificationStamped.msg))| -|Vehicle Detection|```/ros2_openvino_toolkit/detected_vehicles_attribs```([people_msgs::msg::VehicleAttribsStamped](../../../people_msgs/msg/PersonAttributeStamped.msg))| -|Vehicle License Detection|```/ros2_openvino_toolkit/detected_license_plates```([people_msgs::msg::LicensePlateStamped](../../../people_msgs/msg/LicensePlateStamped.msg))| +|Object Segmentation|```/ros2_openvino_toolkit/segmented_obejcts```([openvino_people_msgs::msg::ObjectsInMasks](../../../openvino_people_msgs/msg/ObjectsInMasks.msg))| +|Object Segmentation Maskrcnn|```/ros2_openvino_toolkit/segmented_obejcts```([openvino_people_msgs::msg::ObjectsInMasks](../../../openvino_people_msgs/msg/ObjectsInMasks.msg))| +|Person Reidentification|```/ros2_openvino_toolkit/reidentified_persons```([openvino_people_msgs::msg::ReidentificationStamped](../../../openvino_people_msgs/msg/ReidentificationStamped.msg))| +|Face Reidenfication|```/ros2_openvino_toolkit/reidentified_faces```([openvino_people_msgs::msg::ReidentificationStamped](../../../openvino_people_msgs/msg/ReidentificationStamped.msg))| +|Vehicle Detection|```/ros2_openvino_toolkit/detected_vehicles_attribs```([openvino_people_msgs::msg::VehicleAttribsStamped](../../../openvino_people_msgs/msg/PersonAttributeStamped.msg))| +|Vehicle License Detection|```/ros2_openvino_toolkit/detected_license_plates```([openvino_people_msgs::msg::LicensePlateStamped](../../../openvino_people_msgs/msg/LicensePlateStamped.msg))|

@@ -197,9 +197,9 @@ Several ROS2 Services are created, expecting to be used in client/server mode, e |---|---| |Object Detection Service|```/detect_object```([object_msgs::srv::DetectObject](https://github.com/intel/ros2_object_msgs/blob/master/srv/DetectObject.srv))| |Face Detection Service|```/detect_face```([object_msgs::srv::DetectObject](https://github.com/intel/ros2_object_msgs/blob/master/srv/DetectObject.srv))| -|Age Gender Detection Service|```/detect_age_gender```([people_msgs::srv::AgeGender](./people_msgs/srv/AgeGenderSrv.srv))| -|Headpose Detection Service|```/detect_head_pose```([people_msgs::srv::HeadPose](./people_msgs/srv/HeadPoseSrv.srv))| -|Emotion Detection Service|```/detect_emotion```([people_msgs::srv::Emotion](./people_msgs/srv/EmotionSrv.srv))| +|Age Gender Detection Service|```/detect_age_gender```([openvino_people_msgs::srv::AgeGender](./openvino_people_msgs/srv/AgeGenderSrv.srv))| +|Headpose Detection Service|```/detect_head_pose```([openvino_people_msgs::srv::HeadPose](./openvino_people_msgs/srv/HeadPoseSrv.srv))| +|Emotion Detection Service|```/detect_emotion```([openvino_people_msgs::srv::Emotion](./openvino_people_msgs/srv/EmotionSrv.srv))|

diff --git a/doc/quick_start/getting_started_with_ros2_ov2.0.md b/doc/quick_start/getting_started_with_ros2_ov2.0.md index 13b2f4c4..b6ee87bd 100644 --- a/doc/quick_start/getting_started_with_ros2_ov2.0.md +++ b/doc/quick_start/getting_started_with_ros2_ov2.0.md @@ -105,31 +105,31 @@ sudo cp ~/catkin_ws/src/ros2_openvino_toolkit/data/labels/object_detection/vehic * Check the parameter configuration in ros2_openvino_toolkit/sample/param/xxxx.yaml before lauching, make sure parameters such as model_path, label_path and input_path are set correctly. Please refer to the quick start document for [yaml configuration guidance](./yaml_configuration_guide.md) for detailed configuration guidance. * run face detection sample code input from StandardCamera. ``` - ros2 launch dynamic_vino_sample pipeline_people.launch.py + ros2 launch openvino_node pipeline_people.launch.py ``` * run person reidentification sample code input from StandardCamera. ``` - ros2 launch dynamic_vino_sample pipeline_reidentification.launch.py + ros2 launch openvino_node pipeline_reidentification.launch.py ``` * run person face reidentification sample code input from RealSenseCamera. ``` - ros2 launch dynamic_vino_sample pipeline_face_reidentification.launch.py + ros2 launch openvino_node pipeline_face_reidentification.launch.py ``` * run face detection sample code input from Image. ``` - ros2 launch dynamic_vino_sample pipeline_image.launch.py + ros2 launch openvino_node pipeline_image.launch.py ``` * run object segmentation sample code input from RealSenseCameraTopic. ``` - ros2 launch dynamic_vino_sample pipeline_segmentation.launch.py + ros2 launch openvino_node pipeline_segmentation.launch.py ``` * run vehicle detection sample code input from StandardCamera. ``` - ros2 launch dynamic_vino_sample pipeline_vehicle_detection.launch.py + ros2 launch openvino_node pipeline_vehicle_detection.launch.py ``` * run person attributes sample code input from StandardCamera. ``` - ros2 launch dynamic_vino_sample pipeline_person_attributes.launch.py + ros2 launch openvino_node pipeline_person_attributes.launch.py ``` # More Information diff --git a/docker/docker_instructions_ov2.0.md b/docker/docker_instructions_ov2.0.md index 265fc9cb..1fc9e078 100644 --- a/docker/docker_instructions_ov2.0.md +++ b/docker/docker_instructions_ov2.0.md @@ -97,35 +97,35 @@ sudo cp ~/catkin_ws/src/ros2_openvino_toolkit/data/labels/object_detection/vehic * Check the parameter configuration in ros2_openvino_toolkit/sample/param/xxxx.yaml before lauching, make sure parameters such as model_path, label_path and input_path are set correctly. Please refer to the quick start document for [yaml configuration guidance](../doc/quick_start/yaml_configuration_guide.md) for detailed configuration guidance. * run face detection sample code input from StandardCamera. ``` - ros2 launch dynamic_vino_sample pipeline_people.launch.py + ros2 launch openvino_node pipeline_people.launch.py ``` * run person reidentification sample code input from StandardCamera. ``` - ros2 launch dynamic_vino_sample pipeline_reidentification.launch.py + ros2 launch openvino_node pipeline_reidentification.launch.py ``` * run person face reidentification sample code input from RealSenseCamera. ``` - ros2 launch dynamic_vino_sample pipeline_face_reidentification.launch.py + ros2 launch openvino_node pipeline_face_reidentification.launch.py ``` * run face detection sample code input from Image. ``` - ros2 launch dynamic_vino_sample pipeline_image.launch.py + ros2 launch openvino_node pipeline_image.launch.py ``` * run object segmentation sample code input from RealSenseCameraTopic. ``` - ros2 launch dynamic_vino_sample pipeline_segmentation.launch.py + ros2 launch openvino_node pipeline_segmentation.launch.py ``` * run object segmentation sample code input from Image. ``` - ros2 launch dynamic_vino_sample pipeline_segmentation_image.launch.py + ros2 launch openvino_node pipeline_segmentation_image.launch.py ``` * run vehicle detection sample code input from StandardCamera. ``` - ros2 launch dynamic_vino_sample pipeline_vehicle_detection.launch.py + ros2 launch openvino_node pipeline_vehicle_detection.launch.py ``` * run person attributes sample code input from StandardCamera. ``` - ros2 launch dynamic_vino_sample pipeline_person_attributes.launch.py + ros2 launch openvino_node pipeline_person_attributes.launch.py ``` # More Information diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_topic_output.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_topic_output.hpp deleted file mode 100644 index a1bcd980..00000000 --- a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_topic_output.hpp +++ /dev/null @@ -1,183 +0,0 @@ -// Copyright (c) 2018-2022 Intel Corporation -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @brief A header file with declaration for RosTopicOutput Class - * @file ros_topic_output.hpp - */ - -#ifndef DYNAMIC_VINO_LIB__OUTPUTS__ROS_TOPIC_OUTPUT_HPP_ -#define DYNAMIC_VINO_LIB__OUTPUTS__ROS_TOPIC_OUTPUT_HPP_ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "dynamic_vino_lib/inferences/face_detection.hpp" -#include "dynamic_vino_lib/outputs/base_output.hpp" - -namespace Outputs -{ -/** - * @class RosTopicOutput - * @brief This class handles and publish the detection result with ros topic. - */ -class RosTopicOutput : public BaseOutput -{ -public: - explicit RosTopicOutput(std::string output_name_, - const rclcpp::Node::SharedPtr node=nullptr); - /** - * @brief Calculate the camera matrix of a frame. - * @param[in] A frame. - */ - void feedFrame(const cv::Mat &) override; - /** - * @brief Publish all the detected infomations generated by the accept - * functions with ros topic. - */ - void handleOutput() override; - /** - * @brief Generate ros topic infomation according to - * the license plate detection result. - * @param[in] results a bundle of license plate detection results. - */ - void accept(const std::vector &) override; - /** - * @brief Generate ros topic infomation according to - * the vehicle attributes detection result. - * @param[in] results a bundle of vehicle attributes detection results. - */ - void accept(const std::vector &) override; - /** - * @brief Generate ros topic infomation according to - * the face reidentification result. - * @param[in] results a bundle of face reidentification results. - */ - void accept(const std::vector &) override; - /** - * @brief Generate ros topic infomation according to - * the landmarks detection result. - * @param[in] results a bundle of landmarks detection results. - */ - void accept(const std::vector &) override; - /** - * @brief Generate ros topic infomation according to - * the person attributes detection result. - * @param[in] results a bundle of person attributes detection results. - */ - void accept(const std::vector &) override; - /** - * @brief Generate ros topic infomation according to - * the person reidentification result. - * @param[in] results a bundle of person reidentification results. - */ - 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; - /** - * @brief Generate ros topic infomation according to - * the object segmentation result. - * @param[in] results a bundle of object segmentation maskrcnn results. - */ - void accept(const std::vector &) override; - /** - * @brief Generate ros topic infomation according to - * the object detection result. - * @param[in] results a bundle of object detection results. - */ - 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; - /** - * @brief Generate ros topic infomation according to - * the emotion detection result. - * @param[in] An emotion detection result objetc. - */ - 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; - /** - * @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; - -protected: - const std::string topic_name_; - std::shared_ptr node_; - rclcpp::Publisher::SharedPtr pub_license_plate_; - std::shared_ptr license_plate_topic_; - rclcpp::Publisher::SharedPtr pub_vehicle_attribs_; - std::shared_ptr vehicle_attribs_topic_; - rclcpp::Publisher::SharedPtr pub_landmarks_; - std::shared_ptr landmarks_topic_; - rclcpp::Publisher::SharedPtr pub_face_reid_; - std::shared_ptr face_reid_topic_; - rclcpp::Publisher::SharedPtr pub_person_attribs_; - std::shared_ptr person_attribs_topic_; - rclcpp::Publisher::SharedPtr pub_person_reid_; - std::shared_ptr person_reid_topic_; - rclcpp::Publisher::SharedPtr pub_segmented_object_; - std::shared_ptr segmented_objects_topic_; - rclcpp::Publisher::SharedPtr pub_detected_object_; - std::shared_ptr detected_objects_topic_; - rclcpp::Publisher::SharedPtr pub_face_; - std::shared_ptr faces_topic_; - rclcpp::Publisher::SharedPtr pub_emotion_; - std::shared_ptr emotions_topic_; - rclcpp::Publisher::SharedPtr pub_age_gender_; - std::shared_ptr age_gender_topic_; - rclcpp::Publisher::SharedPtr pub_headpose_; - std::shared_ptr headpose_topic_; -}; -} // namespace Outputs -#endif // DYNAMIC_VINO_LIB__OUTPUTS__ROS_TOPIC_OUTPUT_HPP_ diff --git a/pipeline_srv_msgs/CMakeLists.txt b/openvino_msgs/CMakeLists.txt similarity index 98% rename from pipeline_srv_msgs/CMakeLists.txt rename to openvino_msgs/CMakeLists.txt index eaa0cd1c..30b70b83 100644 --- a/pipeline_srv_msgs/CMakeLists.txt +++ b/openvino_msgs/CMakeLists.txt @@ -14,7 +14,7 @@ cmake_minimum_required(VERSION 3.5) -project(pipeline_srv_msgs) +project(openvino_msgs) if(NOT CMAKE_CXX_STANDARD) set(CMAKE_CXX_STANDARD 14) diff --git a/pipeline_srv_msgs/msg/Connection.msg b/openvino_msgs/msg/Connection.msg similarity index 100% rename from pipeline_srv_msgs/msg/Connection.msg rename to openvino_msgs/msg/Connection.msg diff --git a/pipeline_srv_msgs/msg/Pipeline.msg b/openvino_msgs/msg/Pipeline.msg similarity index 100% rename from pipeline_srv_msgs/msg/Pipeline.msg rename to openvino_msgs/msg/Pipeline.msg diff --git a/pipeline_srv_msgs/msg/PipelineRequest.msg b/openvino_msgs/msg/PipelineRequest.msg similarity index 100% rename from pipeline_srv_msgs/msg/PipelineRequest.msg rename to openvino_msgs/msg/PipelineRequest.msg diff --git a/pipeline_srv_msgs/package.xml b/openvino_msgs/package.xml similarity index 98% rename from pipeline_srv_msgs/package.xml rename to openvino_msgs/package.xml index 802a2b12..85d579d0 100644 --- a/pipeline_srv_msgs/package.xml +++ b/openvino_msgs/package.xml @@ -14,7 +14,7 @@ limitations under the License. --> - pipeline_srv_msgs + openvino_msgs 0.9.0 A package containing pipeline service message definitions. Yang Lu diff --git a/pipeline_srv_msgs/srv/PipelineSrv.srv b/openvino_msgs/srv/PipelineSrv.srv similarity index 100% rename from pipeline_srv_msgs/srv/PipelineSrv.srv rename to openvino_msgs/srv/PipelineSrv.srv diff --git a/vino_param_lib/CMakeLists.txt b/openvino_param_lib/CMakeLists.txt similarity index 99% rename from vino_param_lib/CMakeLists.txt rename to openvino_param_lib/CMakeLists.txt index 36cbde88..8a78469a 100644 --- a/vino_param_lib/CMakeLists.txt +++ b/openvino_param_lib/CMakeLists.txt @@ -13,7 +13,7 @@ # limitations under the License. cmake_minimum_required(VERSION 3.5) -project(vino_param_lib) +project(openvino_param_lib) find_package(ament_cmake REQUIRED) find_package(yaml_cpp_vendor REQUIRED) diff --git a/vino_param_lib/include/vino_param_lib/param_manager.hpp b/openvino_param_lib/include/openvino_param_lib/param_manager.hpp similarity index 96% rename from vino_param_lib/include/vino_param_lib/param_manager.hpp rename to openvino_param_lib/include/openvino_param_lib/param_manager.hpp index 912d8ed6..558d9359 100644 --- a/vino_param_lib/include/vino_param_lib/param_manager.hpp +++ b/openvino_param_lib/include/openvino_param_lib/param_manager.hpp @@ -16,8 +16,8 @@ * @brief A header file with declaration for parameter management * @file param_manager.hpp */ -#ifndef VINO_PARAM_LIB__PARAM_MANAGER_HPP_ -#define VINO_PARAM_LIB__PARAM_MANAGER_HPP_ +#ifndef OPENVINO_PARAM_LIB__PARAM_MANAGER_HPP_ +#define OPENVINO_PARAM_LIB__PARAM_MANAGER_HPP_ #include #include @@ -148,4 +148,4 @@ class ParamManager // singleton }; } // namespace Params -#endif // VINO_PARAM_LIB__PARAM_MANAGER_HPP_ +#endif // OPENVINO_PARAM_LIB__PARAM_MANAGER_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/slog.hpp b/openvino_param_lib/include/openvino_param_lib/slog.hpp similarity index 97% rename from dynamic_vino_lib/include/dynamic_vino_lib/slog.hpp rename to openvino_param_lib/include/openvino_param_lib/slog.hpp index fef20a70..bf350394 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/slog.hpp +++ b/openvino_param_lib/include/openvino_param_lib/slog.hpp @@ -16,8 +16,8 @@ * @brief a header file with logging facility for common samples * @file slog.hpp */ -#ifndef DYNAMIC_VINO_LIB__SLOG_HPP_ -#define DYNAMIC_VINO_LIB__SLOG_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__SLOG_HPP_ +#define OPENVINO_WRAPPER_LIB__SLOG_HPP_ #pragma once @@ -172,4 +172,4 @@ static LogStream warn("WARNING", std::cout, YELLOW); static LogStream err("ERROR", std::cerr, RED); } // namespace slog -#endif // DYNAMIC_VINO_LIB__SLOG_HPP_ +#endif // OPENVINO_WRAPPER_LIB__SLOG_HPP_ diff --git a/vino_param_lib/package.xml b/openvino_param_lib/package.xml similarity index 97% rename from vino_param_lib/package.xml rename to openvino_param_lib/package.xml index 7f0ec3ab..6484dd58 100644 --- a/vino_param_lib/package.xml +++ b/openvino_param_lib/package.xml @@ -17,7 +17,7 @@ limitations under the License. --> - vino_param_lib + openvino_param_lib 0.9.0 Library for ROS2 OpenVINO parameter management Weizhi Liu diff --git a/vino_param_lib/param/pipeline.yaml b/openvino_param_lib/param/pipeline.yaml similarity index 100% rename from vino_param_lib/param/pipeline.yaml rename to openvino_param_lib/param/pipeline.yaml diff --git a/vino_param_lib/src/param_manager.cpp b/openvino_param_lib/src/param_manager.cpp similarity index 98% rename from vino_param_lib/src/param_manager.cpp rename to openvino_param_lib/src/param_manager.cpp index 037756a4..89527c95 100644 --- a/vino_param_lib/src/param_manager.cpp +++ b/openvino_param_lib/src/param_manager.cpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "vino_param_lib/param_manager.hpp" -#include +#include "openvino_param_lib/param_manager.hpp" +#include #include #include #include diff --git a/people_msgs/CMakeLists.txt b/openvino_people_msgs/CMakeLists.txt similarity index 98% rename from people_msgs/CMakeLists.txt rename to openvino_people_msgs/CMakeLists.txt index f7832982..d3257b00 100644 --- a/people_msgs/CMakeLists.txt +++ b/openvino_people_msgs/CMakeLists.txt @@ -14,7 +14,7 @@ cmake_minimum_required(VERSION 3.5) -project(people_msgs) +project(openvino_people_msgs) if(NOT CMAKE_CXX_STANDARD) set(CMAKE_CXX_STANDARD 14) diff --git a/people_msgs/msg/AgeGender.msg b/openvino_people_msgs/msg/AgeGender.msg similarity index 100% rename from people_msgs/msg/AgeGender.msg rename to openvino_people_msgs/msg/AgeGender.msg diff --git a/people_msgs/msg/AgeGenderStamped.msg b/openvino_people_msgs/msg/AgeGenderStamped.msg similarity index 93% rename from people_msgs/msg/AgeGenderStamped.msg rename to openvino_people_msgs/msg/AgeGenderStamped.msg index 56fb2828..25217127 100644 --- a/people_msgs/msg/AgeGenderStamped.msg +++ b/openvino_people_msgs/msg/AgeGenderStamped.msg @@ -13,4 +13,4 @@ # limitations under the License. std_msgs/Header header -people_msgs/AgeGender[] objects +openvino_people_msgs/AgeGender[] objects diff --git a/people_msgs/msg/Emotion.msg b/openvino_people_msgs/msg/Emotion.msg similarity index 100% rename from people_msgs/msg/Emotion.msg rename to openvino_people_msgs/msg/Emotion.msg diff --git a/people_msgs/msg/EmotionsStamped.msg b/openvino_people_msgs/msg/EmotionsStamped.msg similarity index 93% rename from people_msgs/msg/EmotionsStamped.msg rename to openvino_people_msgs/msg/EmotionsStamped.msg index 689db83f..78914367 100644 --- a/people_msgs/msg/EmotionsStamped.msg +++ b/openvino_people_msgs/msg/EmotionsStamped.msg @@ -13,4 +13,4 @@ # limitations under the License. std_msgs/Header header -people_msgs/Emotion[] emotions +openvino_people_msgs/Emotion[] emotions diff --git a/people_msgs/msg/HeadPose.msg b/openvino_people_msgs/msg/HeadPose.msg similarity index 100% rename from people_msgs/msg/HeadPose.msg rename to openvino_people_msgs/msg/HeadPose.msg diff --git a/people_msgs/msg/HeadPoseStamped.msg b/openvino_people_msgs/msg/HeadPoseStamped.msg similarity index 93% rename from people_msgs/msg/HeadPoseStamped.msg rename to openvino_people_msgs/msg/HeadPoseStamped.msg index 57468423..de80904a 100644 --- a/people_msgs/msg/HeadPoseStamped.msg +++ b/openvino_people_msgs/msg/HeadPoseStamped.msg @@ -13,4 +13,4 @@ # limitations under the License. std_msgs/Header header -people_msgs/HeadPose[] headposes \ No newline at end of file +openvino_people_msgs/HeadPose[] headposes \ No newline at end of file diff --git a/people_msgs/msg/Landmark.msg b/openvino_people_msgs/msg/Landmark.msg similarity index 100% rename from people_msgs/msg/Landmark.msg rename to openvino_people_msgs/msg/Landmark.msg diff --git a/people_msgs/msg/LandmarkStamped.msg b/openvino_people_msgs/msg/LandmarkStamped.msg similarity index 100% rename from people_msgs/msg/LandmarkStamped.msg rename to openvino_people_msgs/msg/LandmarkStamped.msg diff --git a/people_msgs/msg/LicensePlate.msg b/openvino_people_msgs/msg/LicensePlate.msg similarity index 100% rename from people_msgs/msg/LicensePlate.msg rename to openvino_people_msgs/msg/LicensePlate.msg diff --git a/people_msgs/msg/LicensePlateStamped.msg b/openvino_people_msgs/msg/LicensePlateStamped.msg similarity index 93% rename from people_msgs/msg/LicensePlateStamped.msg rename to openvino_people_msgs/msg/LicensePlateStamped.msg index f2982b5c..04406dac 100644 --- a/people_msgs/msg/LicensePlateStamped.msg +++ b/openvino_people_msgs/msg/LicensePlateStamped.msg @@ -13,4 +13,4 @@ # limitations under the License. std_msgs/Header header -people_msgs/LicensePlate[] licenses \ No newline at end of file +openvino_people_msgs/LicensePlate[] licenses \ No newline at end of file diff --git a/people_msgs/msg/ObjectInMask.msg b/openvino_people_msgs/msg/ObjectInMask.msg similarity index 100% rename from people_msgs/msg/ObjectInMask.msg rename to openvino_people_msgs/msg/ObjectInMask.msg diff --git a/people_msgs/msg/ObjectsInMasks.msg b/openvino_people_msgs/msg/ObjectsInMasks.msg similarity index 100% rename from people_msgs/msg/ObjectsInMasks.msg rename to openvino_people_msgs/msg/ObjectsInMasks.msg diff --git a/people_msgs/msg/PersonAttribute.msg b/openvino_people_msgs/msg/PersonAttribute.msg similarity index 100% rename from people_msgs/msg/PersonAttribute.msg rename to openvino_people_msgs/msg/PersonAttribute.msg diff --git a/people_msgs/msg/PersonAttributeStamped.msg b/openvino_people_msgs/msg/PersonAttributeStamped.msg similarity index 100% rename from people_msgs/msg/PersonAttributeStamped.msg rename to openvino_people_msgs/msg/PersonAttributeStamped.msg diff --git a/people_msgs/msg/PersonsStamped.msg b/openvino_people_msgs/msg/PersonsStamped.msg similarity index 83% rename from people_msgs/msg/PersonsStamped.msg rename to openvino_people_msgs/msg/PersonsStamped.msg index 85fee95b..f8ee471f 100644 --- a/people_msgs/msg/PersonsStamped.msg +++ b/openvino_people_msgs/msg/PersonsStamped.msg @@ -14,6 +14,6 @@ std_msgs/Header header object_msgs/ObjectInBox[] faces -people_msgs/Emotion[] emotions -people_msgs/AgeGender[] agegenders -people_msgs/HeadPose[] headposes +openvino_people_msgs/Emotion[] emotions +openvino_people_msgs/AgeGender[] agegenders +openvino_people_msgs/HeadPose[] headposes diff --git a/people_msgs/msg/Reidentification.msg b/openvino_people_msgs/msg/Reidentification.msg similarity index 100% rename from people_msgs/msg/Reidentification.msg rename to openvino_people_msgs/msg/Reidentification.msg diff --git a/people_msgs/msg/ReidentificationStamped.msg b/openvino_people_msgs/msg/ReidentificationStamped.msg similarity index 100% rename from people_msgs/msg/ReidentificationStamped.msg rename to openvino_people_msgs/msg/ReidentificationStamped.msg diff --git a/people_msgs/msg/VehicleAttribs.msg b/openvino_people_msgs/msg/VehicleAttribs.msg similarity index 100% rename from people_msgs/msg/VehicleAttribs.msg rename to openvino_people_msgs/msg/VehicleAttribs.msg diff --git a/people_msgs/msg/VehicleAttribsStamped.msg b/openvino_people_msgs/msg/VehicleAttribsStamped.msg similarity index 92% rename from people_msgs/msg/VehicleAttribsStamped.msg rename to openvino_people_msgs/msg/VehicleAttribsStamped.msg index 97cbd3c6..4e97859a 100644 --- a/people_msgs/msg/VehicleAttribsStamped.msg +++ b/openvino_people_msgs/msg/VehicleAttribsStamped.msg @@ -13,4 +13,4 @@ # limitations under the License. std_msgs/Header header -people_msgs/VehicleAttribs[] vehicles +openvino_people_msgs/VehicleAttribs[] vehicles diff --git a/people_msgs/package.xml b/openvino_people_msgs/package.xml similarity index 98% rename from people_msgs/package.xml rename to openvino_people_msgs/package.xml index f7357e00..6e59ce10 100644 --- a/people_msgs/package.xml +++ b/openvino_people_msgs/package.xml @@ -14,7 +14,7 @@ limitations under the License. --> - people_msgs + openvino_people_msgs 0.9.0 A package containing people message definitions. Weizhi Liu diff --git a/people_msgs/srv/AgeGenderSrv.srv b/openvino_people_msgs/srv/AgeGenderSrv.srv similarity index 100% rename from people_msgs/srv/AgeGenderSrv.srv rename to openvino_people_msgs/srv/AgeGenderSrv.srv diff --git a/people_msgs/srv/EmotionSrv.srv b/openvino_people_msgs/srv/EmotionSrv.srv similarity index 100% rename from people_msgs/srv/EmotionSrv.srv rename to openvino_people_msgs/srv/EmotionSrv.srv diff --git a/people_msgs/srv/HeadPoseSrv.srv b/openvino_people_msgs/srv/HeadPoseSrv.srv similarity index 100% rename from people_msgs/srv/HeadPoseSrv.srv rename to openvino_people_msgs/srv/HeadPoseSrv.srv diff --git a/people_msgs/srv/People.srv b/openvino_people_msgs/srv/People.srv similarity index 100% rename from people_msgs/srv/People.srv rename to openvino_people_msgs/srv/People.srv diff --git a/dynamic_vino_lib/CMakeLists.txt b/openvino_wrapper_lib/CMakeLists.txt similarity index 97% rename from dynamic_vino_lib/CMakeLists.txt rename to openvino_wrapper_lib/CMakeLists.txt index 5b13e8b7..4afcbc37 100644 --- a/dynamic_vino_lib/CMakeLists.txt +++ b/openvino_wrapper_lib/CMakeLists.txt @@ -14,7 +14,7 @@ cmake_minimum_required(VERSION 3.5) -project(dynamic_vino_lib) +project(openvino_wrapper_lib) #################################### ## to use C++17 @@ -62,11 +62,11 @@ find_package(rmw REQUIRED) find_package(std_msgs REQUIRED) find_package(sensor_msgs REQUIRED) find_package(object_msgs REQUIRED) -find_package(people_msgs REQUIRED) -find_package(pipeline_srv_msgs REQUIRED) +find_package(openvino_people_msgs REQUIRED) +find_package(openvino_msgs REQUIRED) find_package(class_loader REQUIRED) find_package(cv_bridge REQUIRED) -find_package(vino_param_lib REQUIRED) +find_package(openvino_param_lib REQUIRED) find_package(yaml_cpp_vendor REQUIRED) if("${CMAKE_BUILD_TYPE}" STREQUAL "") @@ -233,13 +233,13 @@ ament_target_dependencies(${PROJECT_NAME} "std_msgs" "sensor_msgs" "object_msgs" - "people_msgs" - "pipeline_srv_msgs" + "openvino_people_msgs" + "openvino_msgs" "ament_index_cpp" "class_loader" "realsense2" "cv_bridge" - "vino_param_lib" + "openvino_param_lib" "yaml_cpp_vendor" ) diff --git a/dynamic_vino_lib/Doxyfile b/openvino_wrapper_lib/Doxyfile similarity index 100% rename from dynamic_vino_lib/Doxyfile rename to openvino_wrapper_lib/Doxyfile diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/engines/engine.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/engines/engine.hpp similarity index 90% rename from dynamic_vino_lib/include/dynamic_vino_lib/engines/engine.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/engines/engine.hpp index a3db05c1..b576af7e 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/engines/engine.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/engines/engine.hpp @@ -16,12 +16,12 @@ * @brief A header file with declaration for Inference Engine class * @file engine.hpp */ -#ifndef DYNAMIC_VINO_LIB__ENGINES__ENGINE_HPP_ -#define DYNAMIC_VINO_LIB__ENGINES__ENGINE_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__ENGINES__ENGINE_HPP_ +#define OPENVINO_WRAPPER_LIB__ENGINES__ENGINE_HPP_ #pragma once -#include "dynamic_vino_lib/models/base_model.hpp" +#include "openvino_wrapper_lib/models/base_model.hpp" #include "openvino/openvino.hpp" namespace Engines @@ -72,4 +72,4 @@ class Engine }; } // namespace Engines -#endif // DYNAMIC_VINO_LIB__ENGINES__ENGINE_HPP_ +#endif // OPENVINO_WRAPPER_LIB__ENGINES__ENGINE_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/engines/engine_manager.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/engines/engine_manager.hpp similarity index 86% rename from dynamic_vino_lib/include/dynamic_vino_lib/engines/engine_manager.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/engines/engine_manager.hpp index a8a9a976..2583316b 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/engines/engine_manager.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/engines/engine_manager.hpp @@ -16,13 +16,13 @@ * @brief A header file with declaration for NetworkEngine class * @file engine.h */ -#ifndef DYNAMIC_VINO_LIB__ENGINES__ENGINE_MANAGER_HPP_ -#define DYNAMIC_VINO_LIB__ENGINES__ENGINE_MANAGER_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__ENGINES__ENGINE_MANAGER_HPP_ +#define OPENVINO_WRAPPER_LIB__ENGINES__ENGINE_MANAGER_HPP_ #pragma once -#include "dynamic_vino_lib/models/base_model.hpp" -#include "dynamic_vino_lib/engines/engine.hpp" +#include "openvino_wrapper_lib/models/base_model.hpp" +#include "openvino_wrapper_lib/engines/engine.hpp" #include "openvino/openvino.hpp" namespace Engines @@ -58,4 +58,4 @@ class EngineManager }; } // namespace Engines -#endif // DYNAMIC_VINO_LIB__ENGINES__ENGINE_MANAGER_HPP_ +#endif // OPENVINO_WRAPPER_LIB__ENGINES__ENGINE_MANAGER_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/age_gender_detection.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/age_gender_detection.hpp similarity index 83% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/age_gender_detection.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/age_gender_detection.hpp index b982d1fb..4b5b2e40 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/age_gender_detection.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/age_gender_detection.hpp @@ -16,17 +16,17 @@ * @brief A header file with declaration for AgeGenderDetection Class * @file age_gender_recignition.h */ -#ifndef DYNAMIC_VINO_LIB__INFERENCES__AGE_GENDER_DETECTION_HPP_ -#define DYNAMIC_VINO_LIB__INFERENCES__AGE_GENDER_DETECTION_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INFERENCES__AGE_GENDER_DETECTION_HPP_ +#define OPENVINO_WRAPPER_LIB__INFERENCES__AGE_GENDER_DETECTION_HPP_ -#include -#include +#include +#include #include #include #include -#include "dynamic_vino_lib/engines/engine.hpp" -#include "dynamic_vino_lib/inferences/base_inference.hpp" -#include "dynamic_vino_lib/models/age_gender_detection_model.hpp" +#include "openvino_wrapper_lib/engines/engine.hpp" +#include "openvino_wrapper_lib/inferences/base_inference.hpp" +#include "openvino_wrapper_lib/models/age_gender_detection_model.hpp" #include "openvino/openvino.hpp" #include "opencv2/opencv.hpp" @@ -34,7 +34,7 @@ namespace Outputs { class BaseOuput; } -namespace dynamic_vino_lib +namespace openvino_wrapper_lib { /** * @class AgeGenderResult @@ -74,7 +74,7 @@ class AgeGenderResult : public Result class AgeGenderDetection : public BaseInference { public: - using Result = dynamic_vino_lib::AgeGenderResult; + using Result = openvino_wrapper_lib::AgeGenderResult; AgeGenderDetection(); ~AgeGenderDetection() override; /** @@ -112,7 +112,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 openvino_wrapper_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 openvino_wrapper_lib -#endif // DYNAMIC_VINO_LIB__INFERENCES__AGE_GENDER_DETECTION_HPP_ +#endif // OPENVINO_WRAPPER_LIB__INFERENCES__AGE_GENDER_DETECTION_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_filter.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/base_filter.hpp similarity index 95% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_filter.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/base_filter.hpp index 62c2d560..b5aca1f2 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_filter.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/base_filter.hpp @@ -16,16 +16,16 @@ * @brief A header file with declaration for BaseFilter Class * @file base_filter.hpp */ -#ifndef DYNAMIC_VINO_LIB__INFERENCES__BASE_FILTER_HPP_ -#define DYNAMIC_VINO_LIB__INFERENCES__BASE_FILTER_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INFERENCES__BASE_FILTER_HPP_ +#define OPENVINO_WRAPPER_LIB__INFERENCES__BASE_FILTER_HPP_ #include #include #include #include -#include "dynamic_vino_lib/inferences/base_inference.hpp" +#include "openvino_wrapper_lib/inferences/base_inference.hpp" -namespace dynamic_vino_lib +namespace openvino_wrapper_lib { /** @@ -190,6 +190,6 @@ class BaseFilter std::vector relation_operators_ = {"==", "!=", "<=", ">=", "<", ">"}; std::vector logic_operators_ = {"&&", "||"}; }; -} // namespace dynamic_vino_lib +} // namespace openvino_wrapper_lib -#endif // DYNAMIC_VINO_LIB__INFERENCES__BASE_FILTER_HPP_ +#endif // OPENVINO_WRAPPER_LIB__INFERENCES__BASE_FILTER_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_inference.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/base_inference.hpp similarity index 92% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_inference.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/base_inference.hpp index e036ee9d..318fbeac 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_inference.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/base_inference.hpp @@ -16,15 +16,15 @@ * @brief A header file with declaration for BaseInference Class * @file base_inference.h */ -#ifndef DYNAMIC_VINO_LIB__INFERENCES__BASE_INFERENCE_HPP_ -#define DYNAMIC_VINO_LIB__INFERENCES__BASE_INFERENCE_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INFERENCES__BASE_INFERENCE_HPP_ +#define OPENVINO_WRAPPER_LIB__INFERENCES__BASE_INFERENCE_HPP_ #include #include #include -#include "dynamic_vino_lib/engines/engine.hpp" -#include "dynamic_vino_lib/models/base_model.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/engines/engine.hpp" +#include "openvino_wrapper_lib/models/base_model.hpp" +#include "openvino_wrapper_lib/slog.hpp" #include "openvino/openvino.hpp" #include "opencv2/opencv.hpp" @@ -66,7 +66,7 @@ void matU8ToBlob( } } -namespace dynamic_vino_lib +namespace openvino_wrapper_lib { /** * @class Result @@ -165,7 +165,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 openvino_wrapper_lib::Result * getLocationResult(int idx) const = 0; /** * @brief Get the name of the Inference instance. * @return The name of the Inference instance. @@ -208,6 +208,6 @@ class BaseInference int enqueued_frames_ = 0; bool results_fetched_ = false; }; -} // namespace dynamic_vino_lib +} // namespace openvino_wrapper_lib -#endif // DYNAMIC_VINO_LIB__INFERENCES__BASE_INFERENCE_HPP_ +#endif // OPENVINO_WRAPPER_LIB__INFERENCES__BASE_INFERENCE_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_reidentification.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/base_reidentification.hpp similarity index 91% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_reidentification.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/base_reidentification.hpp index feb97d7d..44285be3 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_reidentification.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/base_reidentification.hpp @@ -16,8 +16,8 @@ * @brief A header file with declaration for BaseReidentification Class * @file base_reidentification.hpp */ -#ifndef DYNAMIC_VINO_LIB__INFERENCES__BASE_REIDENTIFICATION_HPP_ -#define DYNAMIC_VINO_LIB__INFERENCES__BASE_REIDENTIFICATION_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INFERENCES__BASE_REIDENTIFICATION_HPP_ +#define OPENVINO_WRAPPER_LIB__INFERENCES__BASE_REIDENTIFICATION_HPP_ #include #include #include @@ -26,7 +26,7 @@ #include // namespace -namespace dynamic_vino_lib +namespace openvino_wrapper_lib { /** * @class Tracker @@ -96,5 +96,5 @@ class Tracker std::unordered_map recorded_tracks_; }; -} // namespace dynamic_vino_lib -#endif // DYNAMIC_VINO_LIB__INFERENCES__BASE_REIDENTIFICATION_HPP_ +} // namespace openvino_wrapper_lib +#endif // OPENVINO_WRAPPER_LIB__INFERENCES__BASE_REIDENTIFICATION_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/emotions_detection.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/emotions_detection.hpp similarity index 85% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/emotions_detection.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/emotions_detection.hpp index 07e07d00..38d50fbe 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/emotions_detection.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/emotions_detection.hpp @@ -15,24 +15,24 @@ * @brief A header file with declaration for EmotionsDetection Class * @file emotions_detection.hpp */ -#ifndef DYNAMIC_VINO_LIB__INFERENCES__EMOTIONS_DETECTION_HPP_ -#define DYNAMIC_VINO_LIB__INFERENCES__EMOTIONS_DETECTION_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INFERENCES__EMOTIONS_DETECTION_HPP_ +#define OPENVINO_WRAPPER_LIB__INFERENCES__EMOTIONS_DETECTION_HPP_ #include #include #include -#include "dynamic_vino_lib/engines/engine.hpp" -#include "dynamic_vino_lib/inferences/base_inference.hpp" +#include "openvino_wrapper_lib/engines/engine.hpp" +#include "openvino_wrapper_lib/inferences/base_inference.hpp" #include "openvino/openvino.hpp" #include "opencv2/opencv.hpp" -#include "dynamic_vino_lib/models/emotion_detection_model.hpp" +#include "openvino_wrapper_lib/models/emotion_detection_model.hpp" namespace Outputs { class BaseOuput; } -namespace dynamic_vino_lib +namespace openvino_wrapper_lib { /** * @class EmotionResult @@ -64,7 +64,7 @@ class EmotionsResult : public Result class EmotionsDetection : public BaseInference { public: - using Result = dynamic_vino_lib::EmotionsResult; + using Result = openvino_wrapper_lib::EmotionsResult; EmotionsDetection(); ~EmotionsDetection() override; /** @@ -102,7 +102,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 openvino_wrapper_lib::Result * getLocationResult(int idx) const override; /** * @brief Get the name of the Inference instance. * @return The name of the Inference instance. @@ -125,6 +125,6 @@ class EmotionsDetection : public BaseInference std::shared_ptr valid_model_; std::vector results_; }; -} // namespace dynamic_vino_lib +} // namespace openvino_wrapper_lib -#endif // DYNAMIC_VINO_LIB__INFERENCES__EMOTIONS_DETECTION_HPP_ +#endif // OPENVINO_WRAPPER_LIB__INFERENCES__EMOTIONS_DETECTION_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/face_detection.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/face_detection.hpp similarity index 76% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/face_detection.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/face_detection.hpp index b4c37db1..6c18adbe 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/face_detection.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/face_detection.hpp @@ -16,8 +16,8 @@ * @brief A header file with declaration for FaceDetection Class * @file face_detection.h */ -#ifndef DYNAMIC_VINO_LIB__INFERENCES__FACE_DETECTION_HPP_ -#define DYNAMIC_VINO_LIB__INFERENCES__FACE_DETECTION_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INFERENCES__FACE_DETECTION_HPP_ +#define OPENVINO_WRAPPER_LIB__INFERENCES__FACE_DETECTION_HPP_ #include #include @@ -28,13 +28,13 @@ #include #include -#include "dynamic_vino_lib/models/face_detection_model.hpp" -#include "dynamic_vino_lib/engines/engine.hpp" -#include "dynamic_vino_lib/inferences/object_detection.hpp" +#include "openvino_wrapper_lib/models/face_detection_model.hpp" +#include "openvino_wrapper_lib/engines/engine.hpp" +#include "openvino_wrapper_lib/inferences/object_detection.hpp" #include "opencv2/opencv.hpp" // namespace -namespace dynamic_vino_lib +namespace openvino_wrapper_lib { /** * @class FaceDetectionResult @@ -55,5 +55,5 @@ class FaceDetection : public ObjectDetection public: explicit FaceDetection(bool, double); }; -} // namespace dynamic_vino_lib -#endif // DYNAMIC_VINO_LIB__INFERENCES__FACE_DETECTION_HPP_ +} // namespace openvino_wrapper_lib +#endif // OPENVINO_WRAPPER_LIB__INFERENCES__FACE_DETECTION_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/face_reidentification.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/face_reidentification.hpp similarity index 81% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/face_reidentification.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/face_reidentification.hpp index e0f6f9ac..7175f3be 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/face_reidentification.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/face_reidentification.hpp @@ -16,20 +16,20 @@ * @brief A header file with declaration for FaceReidentification Class * @file face_reidentification.hpp */ -#ifndef DYNAMIC_VINO_LIB__INFERENCES__FACE_REIDENTIFICATION_HPP_ -#define DYNAMIC_VINO_LIB__INFERENCES__FACE_REIDENTIFICATION_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INFERENCES__FACE_REIDENTIFICATION_HPP_ +#define OPENVINO_WRAPPER_LIB__INFERENCES__FACE_REIDENTIFICATION_HPP_ #include #include #include #include -#include "dynamic_vino_lib/models/face_reidentification_model.hpp" -#include "dynamic_vino_lib/engines/engine.hpp" -#include "dynamic_vino_lib/inferences/base_inference.hpp" -#include "dynamic_vino_lib/inferences/base_reidentification.hpp" +#include "openvino_wrapper_lib/models/face_reidentification_model.hpp" +#include "openvino_wrapper_lib/engines/engine.hpp" +#include "openvino_wrapper_lib/inferences/base_inference.hpp" +#include "openvino_wrapper_lib/inferences/base_reidentification.hpp" #include "openvino/openvino.hpp" #include "opencv2/opencv.hpp" // namespace -namespace dynamic_vino_lib +namespace openvino_wrapper_lib { /** * @class FaceReidentificationResult @@ -53,7 +53,7 @@ class FaceReidentificationResult : public Result class FaceReidentification : public BaseInference { public: - using Result = dynamic_vino_lib::FaceReidentificationResult; + using Result = openvino_wrapper_lib::FaceReidentificationResult; explicit FaceReidentification(double); ~FaceReidentification() override; /** @@ -91,7 +91,7 @@ class FaceReidentification : 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 openvino_wrapper_lib::Result * getLocationResult(int idx) const override; /** * @brief Show the observed reidentification result either through image window or ROS topic. @@ -108,7 +108,7 @@ class FaceReidentification : public BaseInference private: std::shared_ptr valid_model_; std::vector results_; - std::shared_ptr face_tracker_; + std::shared_ptr face_tracker_; }; -} // namespace dynamic_vino_lib -#endif // DYNAMIC_VINO_LIB__INFERENCES__FACE_REIDENTIFICATION_HPP_ +} // namespace openvino_wrapper_lib +#endif // OPENVINO_WRAPPER_LIB__INFERENCES__FACE_REIDENTIFICATION_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/head_pose_detection.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/head_pose_detection.hpp similarity index 86% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/head_pose_detection.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/head_pose_detection.hpp index f5d5390f..1a0ebc4f 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/head_pose_detection.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/head_pose_detection.hpp @@ -16,20 +16,20 @@ * @brief A header file with declaration for FaceDetection Class * @file head_pose_detection.hpp */ -#ifndef DYNAMIC_VINO_LIB__INFERENCES__HEAD_POSE_DETECTION_HPP_ -#define DYNAMIC_VINO_LIB__INFERENCES__HEAD_POSE_DETECTION_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INFERENCES__HEAD_POSE_DETECTION_HPP_ +#define OPENVINO_WRAPPER_LIB__INFERENCES__HEAD_POSE_DETECTION_HPP_ #include #include #include -#include "dynamic_vino_lib/engines/engine.hpp" -#include "dynamic_vino_lib/inferences/base_inference.hpp" -#include "dynamic_vino_lib/models/head_pose_detection_model.hpp" +#include "openvino_wrapper_lib/engines/engine.hpp" +#include "openvino_wrapper_lib/inferences/base_inference.hpp" +#include "openvino_wrapper_lib/models/head_pose_detection_model.hpp" #include "openvino/openvino.hpp" #include "opencv2/opencv.hpp" -namespace dynamic_vino_lib +namespace openvino_wrapper_lib { /** * @class HeadPoseResult @@ -78,7 +78,7 @@ class HeadPoseResult : public Result class HeadPoseDetection : public BaseInference { public: - using Result = dynamic_vino_lib::HeadPoseResult; + using Result = openvino_wrapper_lib::HeadPoseResult; HeadPoseDetection(); ~HeadPoseDetection() override; /** @@ -116,7 +116,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 openvino_wrapper_lib::Result * getLocationResult(int idx) const override; /** * @brief Get the name of the Inference instance. * @return The name of the Inference instance. @@ -139,5 +139,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_HPP_ +} // namespace openvino_wrapper_lib +#endif // OPENVINO_WRAPPER_LIB__INFERENCES__HEAD_POSE_DETECTION_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/inference_manager.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/inference_manager.hpp similarity index 78% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/inference_manager.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/inference_manager.hpp index b9f7bb94..1f2c9881 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/inference_manager.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/inference_manager.hpp @@ -16,10 +16,10 @@ * @brief a header file with declaration of Inference Manager class * @file inference_manager.hpp */ -#ifndef DYNAMIC_VINO_LIB__INFERENCES__INFERENCE_MANAGER_HPP_ -#define DYNAMIC_VINO_LIB__INFERENCES__INFERENCE_MANAGER_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INFERENCES__INFERENCE_MANAGER_HPP_ +#define OPENVINO_WRAPPER_LIB__INFERENCES__INFERENCE_MANAGER_HPP_ -#include +#include #include #include #include @@ -28,7 +28,7 @@ #include #include #include -#include "dynamic_vino_lib/pipeline.hpp" +#include "openvino_wrapper_lib/pipeline.hpp" /** * @class InferenceManager @@ -84,20 +84,20 @@ class InferenceManager parseInputDevice(const Params::ParamManager::PipelineRawData & params); std::map> parseOutput( const Params::ParamManager::PipelineRawData & params); - std::map> + std::map> parseInference(const Params::ParamManager::PipelineRawData & 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::map pipelines_; }; -#endif // DYNAMIC_VINO_LIB__INFERENCES__INFERENCE_MANAGER_HPP_ +#endif // OPENVINO_WRAPPER_LIB__INFERENCES__INFERENCE_MANAGER_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/landmarks_detection.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/landmarks_detection.hpp similarity index 84% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/landmarks_detection.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/landmarks_detection.hpp index 30dbf28e..fe7a34e6 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/landmarks_detection.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/landmarks_detection.hpp @@ -16,18 +16,18 @@ * @brief A header file with declaration for LandmarksDetection Class * @file landmarks_detection.hpp */ -#ifndef DYNAMIC_VINO_LIB__INFERENCES__LANDMARKS_DETECTION_HPP_ -#define DYNAMIC_VINO_LIB__INFERENCES__LANDMARKS_DETECTION_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INFERENCES__LANDMARKS_DETECTION_HPP_ +#define OPENVINO_WRAPPER_LIB__INFERENCES__LANDMARKS_DETECTION_HPP_ #include #include #include #include -#include "dynamic_vino_lib/models/landmarks_detection_model.hpp" -#include "dynamic_vino_lib/engines/engine.hpp" -#include "dynamic_vino_lib/inferences/base_inference.hpp" +#include "openvino_wrapper_lib/models/landmarks_detection_model.hpp" +#include "openvino_wrapper_lib/engines/engine.hpp" +#include "openvino_wrapper_lib/inferences/base_inference.hpp" #include "opencv2/opencv.hpp" // namespace -namespace dynamic_vino_lib +namespace openvino_wrapper_lib { /** * @class LandmarksDetectionResult @@ -53,7 +53,7 @@ class LandmarksDetectionResult : public Result class LandmarksDetection : public BaseInference { public: - using Result = dynamic_vino_lib::LandmarksDetectionResult; + using Result = openvino_wrapper_lib::LandmarksDetectionResult; LandmarksDetection(); ~LandmarksDetection() override; /** @@ -91,7 +91,7 @@ class LandmarksDetection : 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 openvino_wrapper_lib::Result * getLocationResult(int idx) const override; /** * @brief Show the observed detection result either through image window or ROS topic. @@ -109,5 +109,5 @@ class LandmarksDetection : public BaseInference std::shared_ptr valid_model_; std::vector results_; }; -} // namespace dynamic_vino_lib -#endif // DYNAMIC_VINO_LIB__INFERENCES__LANDMARKS_DETECTION_HPP_ +} // namespace openvino_wrapper_lib +#endif // OPENVINO_WRAPPER_LIB__INFERENCES__LANDMARKS_DETECTION_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/license_plate_detection.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/license_plate_detection.hpp similarity index 86% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/license_plate_detection.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/license_plate_detection.hpp index b3adec0e..1d9ef900 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/license_plate_detection.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/license_plate_detection.hpp @@ -16,18 +16,18 @@ * @brief A header file with declaration for LicensePlateDetection Class * @file license_plate_detection.hpp */ -#ifndef DYNAMIC_VINO_LIB__INFERENCES__LICENSE_PLATE_DETECTION_HPP_ -#define DYNAMIC_VINO_LIB__INFERENCES__LICENSE_PLATE_DETECTION_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INFERENCES__LICENSE_PLATE_DETECTION_HPP_ +#define OPENVINO_WRAPPER_LIB__INFERENCES__LICENSE_PLATE_DETECTION_HPP_ #include #include #include #include -#include "dynamic_vino_lib/models/license_plate_detection_model.hpp" -#include "dynamic_vino_lib/engines/engine.hpp" -#include "dynamic_vino_lib/inferences/base_inference.hpp" +#include "openvino_wrapper_lib/models/license_plate_detection_model.hpp" +#include "openvino_wrapper_lib/engines/engine.hpp" +#include "openvino_wrapper_lib/inferences/base_inference.hpp" #include "opencv2/opencv.hpp" // namespace -namespace dynamic_vino_lib +namespace openvino_wrapper_lib { /** * @class LicensePlateDetectionResult @@ -53,7 +53,7 @@ class LicensePlateDetectionResult : public Result class LicensePlateDetection : public BaseInference { public: - using Result = dynamic_vino_lib::LicensePlateDetectionResult; + using Result = openvino_wrapper_lib::LicensePlateDetectionResult; LicensePlateDetection(); ~LicensePlateDetection() override; /** @@ -95,7 +95,7 @@ class LicensePlateDetection : 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 openvino_wrapper_lib::Result * getLocationResult(int idx) const override; /** * @brief Show the observed detection result either through image window or ROS topic. @@ -128,5 +128,5 @@ class LicensePlateDetection : public BaseInference "U", "V", "W", "X", "Y", "Z" }; }; -} // namespace dynamic_vino_lib -#endif // DYNAMIC_VINO_LIB__INFERENCES__LICENSE_PLATE_DETECTION_HPP_ +} // namespace openvino_wrapper_lib +#endif // OPENVINO_WRAPPER_LIB__INFERENCES__LICENSE_PLATE_DETECTION_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_detection.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/object_detection.hpp similarity index 89% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_detection.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/object_detection.hpp index a83a7926..47b7cc68 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_detection.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/object_detection.hpp @@ -16,8 +16,8 @@ * @brief A header file with declaration for ObjectDetection Class * @file object_detection.hpp */ -#ifndef DYNAMIC_VINO_LIB__INFERENCES__OBJECT_DETECTION_HPP_ -#define DYNAMIC_VINO_LIB__INFERENCES__OBJECT_DETECTION_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INFERENCES__OBJECT_DETECTION_HPP_ +#define OPENVINO_WRAPPER_LIB__INFERENCES__OBJECT_DETECTION_HPP_ #include #include #include @@ -27,13 +27,13 @@ #include #include #include -#include "dynamic_vino_lib/models/base_model.hpp" -#include "dynamic_vino_lib/engines/engine.hpp" -#include "dynamic_vino_lib/inferences/base_inference.hpp" -#include "dynamic_vino_lib/inferences/base_filter.hpp" +#include "openvino_wrapper_lib/models/base_model.hpp" +#include "openvino_wrapper_lib/engines/engine.hpp" +#include "openvino_wrapper_lib/inferences/base_inference.hpp" +#include "openvino_wrapper_lib/inferences/base_filter.hpp" #include "opencv2/opencv.hpp" // namespace -namespace dynamic_vino_lib +namespace openvino_wrapper_lib { /** * @class ObjectDetectionResult @@ -84,7 +84,7 @@ class ObjectDetectionResult : public Result class ObjectDetectionResultFilter : public BaseFilter { public: - using Result = dynamic_vino_lib::ObjectDetectionResult; + using Result = openvino_wrapper_lib::ObjectDetectionResult; ObjectDetectionResultFilter(); @@ -140,8 +140,8 @@ class ObjectDetectionResultFilter : public BaseFilter class ObjectDetection : public BaseInference { public: - using Result = dynamic_vino_lib::ObjectDetectionResult; - using Filter = dynamic_vino_lib::ObjectDetectionResultFilter; + using Result = openvino_wrapper_lib::ObjectDetectionResult; + using Filter = openvino_wrapper_lib::ObjectDetectionResultFilter; explicit ObjectDetection(bool, double); ~ObjectDetection() override; /** @@ -206,5 +206,5 @@ class ObjectDetection : public BaseInference double show_output_thresh_ = 0; bool enable_roi_constraint_ = false; }; -} // namespace dynamic_vino_lib -#endif // DYNAMIC_VINO_LIB__INFERENCES__OBJECT_DETECTION_HPP_ +} // namespace openvino_wrapper_lib +#endif // OPENVINO_WRAPPER_LIB__INFERENCES__OBJECT_DETECTION_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_segmentation.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/object_segmentation.hpp similarity index 87% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_segmentation.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/object_segmentation.hpp index 081af67f..a450c567 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_segmentation.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/object_segmentation.hpp @@ -16,8 +16,8 @@ * @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 OPENVINO_WRAPPER_LIB__INFERENCES__OBJECT_SEGMENTATION_HPP_ +#define OPENVINO_WRAPPER_LIB__INFERENCES__OBJECT_SEGMENTATION_HPP_ #include #include #include @@ -25,13 +25,13 @@ #include #include #include -#include "dynamic_vino_lib/models/object_segmentation_model.hpp" -#include "dynamic_vino_lib/engines/engine.hpp" -#include "dynamic_vino_lib/inferences/base_inference.hpp" +#include "openvino_wrapper_lib/models/object_segmentation_model.hpp" +#include "openvino_wrapper_lib/engines/engine.hpp" +#include "openvino_wrapper_lib/inferences/base_inference.hpp" #include "openvino/openvino.hpp" #include "opencv2/opencv.hpp" // namespace -namespace dynamic_vino_lib +namespace openvino_wrapper_lib { /** * @class ObjectSegmentationResult @@ -71,7 +71,7 @@ class ObjectSegmentationResult : public Result class ObjectSegmentation : public BaseInference { public: - using Result = dynamic_vino_lib::ObjectSegmentationResult; + using Result = openvino_wrapper_lib::ObjectSegmentationResult; explicit ObjectSegmentation(double); ~ObjectSegmentation() override; /** @@ -113,7 +113,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 openvino_wrapper_lib::Result * getLocationResult(int idx) const override; /** * @brief Show the observed detection result either through image window or ROS topic. @@ -142,5 +142,5 @@ class ObjectSegmentation : public BaseInference {81, 0, 81} }; }; -} // namespace dynamic_vino_lib -#endif // DYNAMIC_VINO_LIB__INFERENCES__OBJECT_SEGMENTATION_HPP_ +} // namespace openvino_wrapper_lib +#endif // OPENVINO_WRAPPER_LIB__INFERENCES__OBJECT_SEGMENTATION_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_segmentation_maskrcnn.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/object_segmentation_maskrcnn.hpp similarity index 87% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_segmentation_maskrcnn.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/object_segmentation_maskrcnn.hpp index 67de05fb..7954157b 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_segmentation_maskrcnn.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/object_segmentation_maskrcnn.hpp @@ -16,8 +16,8 @@ * @brief A header file with declaration for ObjectSegmentation Class * @file object_detection.hpp */ -#ifndef DYNAMIC_VINO_LIB__INFERENCES__OBJECT_SEGMENTATION_MASKRCNN_HPP_ -#define DYNAMIC_VINO_LIB__INFERENCES__OBJECT_SEGMENTATION_MASKRCNN_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INFERENCES__OBJECT_SEGMENTATION_MASKRCNN_HPP_ +#define OPENVINO_WRAPPER_LIB__INFERENCES__OBJECT_SEGMENTATION_MASKRCNN_HPP_ #include #include #include @@ -25,13 +25,13 @@ #include #include #include -#include "dynamic_vino_lib/models/object_segmentation_maskrcnn_model.hpp" -#include "dynamic_vino_lib/engines/engine.hpp" -#include "dynamic_vino_lib/inferences/base_inference.hpp" +#include "openvino_wrapper_lib/models/object_segmentation_maskrcnn_model.hpp" +#include "openvino_wrapper_lib/engines/engine.hpp" +#include "openvino_wrapper_lib/inferences/base_inference.hpp" #include "openvino/openvino.hpp" #include "opencv2/opencv.hpp" // namespace -namespace dynamic_vino_lib +namespace openvino_wrapper_lib { /** * @class ObjectSegmentationMaskrcnnResult @@ -71,7 +71,7 @@ class ObjectSegmentationMaskrcnnResult : public Result class ObjectSegmentationMaskrcnn : public BaseInference { public: - using Result = dynamic_vino_lib::ObjectSegmentationMaskrcnnResult; + using Result = openvino_wrapper_lib::ObjectSegmentationMaskrcnnResult; explicit ObjectSegmentationMaskrcnn(double); ~ObjectSegmentationMaskrcnn() override; /** @@ -113,7 +113,7 @@ class ObjectSegmentationMaskrcnn : 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 openvino_wrapper_lib::Result * getLocationResult(int idx) const override; /** * @brief Show the observed detection result either through image window or ROS topic. @@ -142,5 +142,5 @@ class ObjectSegmentationMaskrcnn : public BaseInference {81, 0, 81} }; }; -} // namespace dynamic_vino_lib -#endif // DYNAMIC_VINO_LIB__INFERENCES__OBJECT_SEGMENTATION_HPP_ +} // namespace openvino_wrapper_lib +#endif // OPENVINO_WRAPPER_LIB__INFERENCES__OBJECT_SEGMENTATION_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/person_attribs_detection.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/person_attribs_detection.hpp similarity index 86% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/person_attribs_detection.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/person_attribs_detection.hpp index 17287f49..f5a3c100 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/person_attribs_detection.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/person_attribs_detection.hpp @@ -16,19 +16,19 @@ * @brief A header file with declaration for PersonAttribsDetection Class * @file person_attribs_detection.hpp */ -#ifndef DYNAMIC_VINO_LIB__INFERENCES__PERSON_ATTRIBS_DETECTION_HPP_ -#define DYNAMIC_VINO_LIB__INFERENCES__PERSON_ATTRIBS_DETECTION_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INFERENCES__PERSON_ATTRIBS_DETECTION_HPP_ +#define OPENVINO_WRAPPER_LIB__INFERENCES__PERSON_ATTRIBS_DETECTION_HPP_ #include #include #include #include -#include "dynamic_vino_lib/models/person_attribs_detection_model.hpp" -#include "dynamic_vino_lib/engines/engine.hpp" -#include "dynamic_vino_lib/inferences/base_inference.hpp" +#include "openvino_wrapper_lib/models/person_attribs_detection_model.hpp" +#include "openvino_wrapper_lib/engines/engine.hpp" +#include "openvino_wrapper_lib/inferences/base_inference.hpp" #include "openvino/openvino.hpp" #include "opencv2/opencv.hpp" // namespace -namespace dynamic_vino_lib +namespace openvino_wrapper_lib { /** * @class PersonAttribsDetectionResult @@ -71,7 +71,7 @@ class PersonAttribsDetectionResult : public Result class PersonAttribsDetection : public BaseInference { public: - using Result = dynamic_vino_lib::PersonAttribsDetectionResult; + using Result = openvino_wrapper_lib::PersonAttribsDetectionResult; explicit PersonAttribsDetection(double); ~PersonAttribsDetection() override; /** @@ -109,7 +109,7 @@ class PersonAttribsDetection : 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 openvino_wrapper_lib::Result * getLocationResult(int idx) const override; /** * @brief Show the observed detection result either through image window or ROS topic. @@ -137,5 +137,5 @@ class PersonAttribsDetection : public BaseInference "has longhair", "has coat_jacket"}; }; -} // namespace dynamic_vino_lib -#endif // DYNAMIC_VINO_LIB__INFERENCES__PERSON_ATTRIBS_DETECTION_HPP_ +} // namespace openvino_wrapper_lib +#endif // OPENVINO_WRAPPER_LIB__INFERENCES__PERSON_ATTRIBS_DETECTION_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/person_reidentification.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/person_reidentification.hpp similarity index 81% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/person_reidentification.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/person_reidentification.hpp index 048484ef..be6d55f8 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/person_reidentification.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/person_reidentification.hpp @@ -16,19 +16,19 @@ * @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 OPENVINO_WRAPPER_LIB__INFERENCES__PERSON_REIDENTIFICATION_HPP_ +#define OPENVINO_WRAPPER_LIB__INFERENCES__PERSON_REIDENTIFICATION_HPP_ #include #include #include #include -#include "dynamic_vino_lib/models/person_reidentification_model.hpp" -#include "dynamic_vino_lib/engines/engine.hpp" -#include "dynamic_vino_lib/inferences/base_inference.hpp" -#include "dynamic_vino_lib/inferences/base_reidentification.hpp" +#include "openvino_wrapper_lib/models/person_reidentification_model.hpp" +#include "openvino_wrapper_lib/engines/engine.hpp" +#include "openvino_wrapper_lib/inferences/base_inference.hpp" +#include "openvino_wrapper_lib/inferences/base_reidentification.hpp" #include "opencv2/opencv.hpp" // namespace -namespace dynamic_vino_lib +namespace openvino_wrapper_lib { /** * @class PersonReidentificationResult @@ -51,7 +51,7 @@ class PersonReidentificationResult : public Result class PersonReidentification : public BaseInference { public: - using Result = dynamic_vino_lib::PersonReidentificationResult; + using Result = openvino_wrapper_lib::PersonReidentificationResult; explicit PersonReidentification(double); ~PersonReidentification() override; /** @@ -89,7 +89,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 openvino_wrapper_lib::Result * getLocationResult(int idx) const override; /** * @brief Show the observed detection result either through image window or ROS topic. @@ -106,7 +106,7 @@ class PersonReidentification : public BaseInference private: std::shared_ptr valid_model_; std::vector results_; - std::shared_ptr person_tracker_; + std::shared_ptr person_tracker_; }; -} // namespace dynamic_vino_lib -#endif // DYNAMIC_VINO_LIB__INFERENCES__PERSON_REIDENTIFICATION_HPP_ +} // namespace openvino_wrapper_lib +#endif // OPENVINO_WRAPPER_LIB__INFERENCES__PERSON_REIDENTIFICATION_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/vehicle_attribs_detection.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/vehicle_attribs_detection.hpp similarity index 85% rename from dynamic_vino_lib/include/dynamic_vino_lib/inferences/vehicle_attribs_detection.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/vehicle_attribs_detection.hpp index 5f40fbd8..575e99d1 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/vehicle_attribs_detection.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/vehicle_attribs_detection.hpp @@ -16,18 +16,18 @@ * @brief A header file with declaration for VehicleAttribsDetection Class * @file vehicle_attribs_detection.hpp */ -#ifndef DYNAMIC_VINO_LIB__INFERENCES__VEHICLE_ATTRIBS_DETECTION_HPP_ -#define DYNAMIC_VINO_LIB__INFERENCES__VEHICLE_ATTRIBS_DETECTION_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INFERENCES__VEHICLE_ATTRIBS_DETECTION_HPP_ +#define OPENVINO_WRAPPER_LIB__INFERENCES__VEHICLE_ATTRIBS_DETECTION_HPP_ #include #include #include #include -#include "dynamic_vino_lib/models/vehicle_attribs_detection_model.hpp" -#include "dynamic_vino_lib/engines/engine.hpp" -#include "dynamic_vino_lib/inferences/base_inference.hpp" +#include "openvino_wrapper_lib/models/vehicle_attribs_detection_model.hpp" +#include "openvino_wrapper_lib/engines/engine.hpp" +#include "openvino_wrapper_lib/inferences/base_inference.hpp" #include "opencv2/opencv.hpp" // namespace -namespace dynamic_vino_lib +namespace openvino_wrapper_lib { /** * @class VehicleAttribsDetectionResult @@ -58,7 +58,7 @@ class VehicleAttribsDetectionResult : public Result class VehicleAttribsDetection : public BaseInference { public: - using Result = dynamic_vino_lib::VehicleAttribsDetectionResult; + using Result = openvino_wrapper_lib::VehicleAttribsDetectionResult; VehicleAttribsDetection(); ~VehicleAttribsDetection() override; /** @@ -96,7 +96,7 @@ class VehicleAttribsDetection : 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 openvino_wrapper_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 VehicleAttribsDetection : public BaseInference const std::vector colors_ = { "white", "gray", "yellow", "red", "green", "blue", "black"}; }; -} // namespace dynamic_vino_lib -#endif // DYNAMIC_VINO_LIB__INFERENCES__VEHICLE_ATTRIBS_DETECTION_HPP_ +} // namespace openvino_wrapper_lib +#endif // OPENVINO_WRAPPER_LIB__INFERENCES__VEHICLE_ATTRIBS_DETECTION_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/base_input.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/base_input.hpp similarity index 93% rename from dynamic_vino_lib/include/dynamic_vino_lib/inputs/base_input.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/base_input.hpp index f01fd22d..79350653 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/base_input.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/base_input.hpp @@ -16,8 +16,8 @@ * @brief A header file with declaration for BaseInput Class * @file base_input.h */ -#ifndef DYNAMIC_VINO_LIB__INPUTS__BASE_INPUT_HPP_ -#define DYNAMIC_VINO_LIB__INPUTS__BASE_INPUT_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INPUTS__BASE_INPUT_HPP_ +#define OPENVINO_WRAPPER_LIB__INPUTS__BASE_INPUT_HPP_ #include #include @@ -25,7 +25,7 @@ #include #include #include -#include "dynamic_vino_lib/inputs/ros2_handler.hpp" +#include "openvino_wrapper_lib/inputs/ros2_handler.hpp" /** * @class BaseInputDevice @@ -121,4 +121,4 @@ class BaseInputDevice : public Ros2Handler bool is_init_ = false; }; } // namespace Input -#endif // DYNAMIC_VINO_LIB__INPUTS__BASE_INPUT_HPP_ +#endif // OPENVINO_WRAPPER_LIB__INPUTS__BASE_INPUT_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/image_input.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/image_input.hpp similarity index 88% rename from dynamic_vino_lib/include/dynamic_vino_lib/inputs/image_input.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/image_input.hpp index e3c0d837..e1a7b6c9 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/image_input.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/image_input.hpp @@ -16,12 +16,12 @@ * @brief A header file with declaration for Image class * @file file_input.h */ -#ifndef DYNAMIC_VINO_LIB__INPUTS__IMAGE_INPUT_HPP_ -#define DYNAMIC_VINO_LIB__INPUTS__IMAGE_INPUT_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INPUTS__IMAGE_INPUT_HPP_ +#define OPENVINO_WRAPPER_LIB__INPUTS__IMAGE_INPUT_HPP_ #include #include -#include "dynamic_vino_lib/inputs/base_input.hpp" +#include "openvino_wrapper_lib/inputs/base_input.hpp" namespace Input { @@ -62,4 +62,4 @@ class Image : public BaseInputDevice }; } // namespace Input -#endif // DYNAMIC_VINO_LIB__INPUTS__IMAGE_INPUT_HPP_ +#endif // OPENVINO_WRAPPER_LIB__INPUTS__IMAGE_INPUT_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/image_topic.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/image_topic.hpp similarity index 83% rename from dynamic_vino_lib/include/dynamic_vino_lib/inputs/image_topic.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/image_topic.hpp index a5b25f18..cc5274fd 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/image_topic.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/image_topic.hpp @@ -17,15 +17,15 @@ * @file image_topic.h */ -#ifndef DYNAMIC_VINO_LIB__INPUTS__IMAGE_TOPIC_HPP_ -#define DYNAMIC_VINO_LIB__INPUTS__IMAGE_TOPIC_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INPUTS__IMAGE_TOPIC_HPP_ +#define OPENVINO_WRAPPER_LIB__INPUTS__IMAGE_TOPIC_HPP_ #include #include #include #include -#include "dynamic_vino_lib/utils/mutex_counter.hpp" -#include "dynamic_vino_lib/inputs/base_input.hpp" +#include "openvino_wrapper_lib/utils/mutex_counter.hpp" +#include "openvino_wrapper_lib/inputs/base_input.hpp" namespace Input { @@ -51,4 +51,4 @@ class ImageTopic : public BaseInputDevice }; } // namespace Input -#endif // DYNAMIC_VINO_LIB__INPUTS__IMAGE_TOPIC_HPP_ +#endif // OPENVINO_WRAPPER_LIB__INPUTS__IMAGE_TOPIC_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/ip_camera.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/ip_camera.hpp similarity index 88% rename from dynamic_vino_lib/include/dynamic_vino_lib/inputs/ip_camera.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/ip_camera.hpp index 11dc2dd5..c497cf85 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/ip_camera.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/ip_camera.hpp @@ -17,12 +17,12 @@ * @file ip_camera.hpp */ -#ifndef DYNAMIC_VINO_LIB__INPUTS__IP_CAMERA_HPP_ -#define DYNAMIC_VINO_LIB__INPUTS__IP_CAMERA_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INPUTS__IP_CAMERA_HPP_ +#define OPENVINO_WRAPPER_LIB__INPUTS__IP_CAMERA_HPP_ #include #include -#include "dynamic_vino_lib/inputs/base_input.hpp" +#include "openvino_wrapper_lib/inputs/base_input.hpp" namespace Input { @@ -57,4 +57,4 @@ class IpCamera : public BaseInputDevice std::string ip_uri_; }; } // namespace Input -#endif // DYNAMIC_VINO_LIB__INPUTS__IP_CAMERA_HPP_ +#endif // OPENVINO_WRAPPER_LIB__INPUTS__IP_CAMERA_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/realsense_camera.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/realsense_camera.hpp similarity index 87% rename from dynamic_vino_lib/include/dynamic_vino_lib/inputs/realsense_camera.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/realsense_camera.hpp index ff06fce8..8752289c 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/realsense_camera.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/realsense_camera.hpp @@ -17,12 +17,12 @@ * @file realsense_camera.h */ -#ifndef DYNAMIC_VINO_LIB__INPUTS__REALSENSE_CAMERA_HPP_ -#define DYNAMIC_VINO_LIB__INPUTS__REALSENSE_CAMERA_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INPUTS__REALSENSE_CAMERA_HPP_ +#define OPENVINO_WRAPPER_LIB__INPUTS__REALSENSE_CAMERA_HPP_ #include #include -#include "dynamic_vino_lib/inputs/base_input.hpp" +#include "openvino_wrapper_lib/inputs/base_input.hpp" namespace Input { @@ -61,4 +61,4 @@ class RealSenseCamera : public BaseInputDevice }; } // namespace Input -#endif // DYNAMIC_VINO_LIB__INPUTS__REALSENSE_CAMERA_HPP_ +#endif // OPENVINO_WRAPPER_LIB__INPUTS__REALSENSE_CAMERA_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/realsense_camera_topic.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/realsense_camera_topic.hpp similarity index 79% rename from dynamic_vino_lib/include/dynamic_vino_lib/inputs/realsense_camera_topic.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/realsense_camera_topic.hpp index 7e06bab3..8d9de35c 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/realsense_camera_topic.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/realsense_camera_topic.hpp @@ -17,10 +17,10 @@ * @file realsense_camera.h */ -#ifndef DYNAMIC_VINO_LIB__INPUTS__REALSENSE_CAMERA_TOPIC_HPP_ -#define DYNAMIC_VINO_LIB__INPUTS__REALSENSE_CAMERA_TOPIC_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INPUTS__REALSENSE_CAMERA_TOPIC_HPP_ +#define OPENVINO_WRAPPER_LIB__INPUTS__REALSENSE_CAMERA_TOPIC_HPP_ -#include "dynamic_vino_lib/inputs/image_topic.hpp" +#include "openvino_wrapper_lib/inputs/image_topic.hpp" namespace Input { @@ -34,4 +34,4 @@ typedef ImageTopic RealSenseCameraTopic; } // namespace Input -#endif // DYNAMIC_VINO_LIB__INPUTS__REALSENSE_CAMERA_TOPIC_HPP_ +#endif // OPENVINO_WRAPPER_LIB__INPUTS__REALSENSE_CAMERA_TOPIC_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/ros2_handler.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/ros2_handler.hpp similarity index 92% rename from dynamic_vino_lib/include/dynamic_vino_lib/inputs/ros2_handler.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/ros2_handler.hpp index 7630a00e..c2d31778 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/ros2_handler.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/ros2_handler.hpp @@ -17,8 +17,8 @@ * @file ros_handler.h */ -#ifndef DYNAMIC_VINO_LIB__INPUTS__ROS2_HANDLER_HPP_ -#define DYNAMIC_VINO_LIB__INPUTS__ROS2_HANDLER_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INPUTS__ROS2_HANDLER_HPP_ +#define OPENVINO_WRAPPER_LIB__INPUTS__ROS2_HANDLER_HPP_ #include #include @@ -84,4 +84,4 @@ class Ros2Handler } // namespace Input -#endif // DYNAMIC_VINO_LIB__INPUTS__ROS2_HANDLER_HPP_ +#endif // OPENVINO_WRAPPER_LIB__INPUTS__ROS2_HANDLER_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/standard_camera.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/standard_camera.hpp similarity index 88% rename from dynamic_vino_lib/include/dynamic_vino_lib/inputs/standard_camera.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/standard_camera.hpp index 04b2a993..d5924551 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/standard_camera.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/standard_camera.hpp @@ -17,13 +17,13 @@ * @file standard_camera.h */ -#ifndef DYNAMIC_VINO_LIB__INPUTS__STANDARD_CAMERA_HPP_ -#define DYNAMIC_VINO_LIB__INPUTS__STANDARD_CAMERA_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INPUTS__STANDARD_CAMERA_HPP_ +#define OPENVINO_WRAPPER_LIB__INPUTS__STANDARD_CAMERA_HPP_ #include -#include "dynamic_vino_lib/inputs/base_input.hpp" +#include "openvino_wrapper_lib/inputs/base_input.hpp" #include #include #include @@ -64,4 +64,4 @@ class StandardCamera : public BaseInputDevice int camera_id_ = -1; }; } // namespace Input -#endif // DYNAMIC_VINO_LIB__INPUTS__STANDARD_CAMERA_HPP_ +#endif // OPENVINO_WRAPPER_LIB__INPUTS__STANDARD_CAMERA_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/video_input.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/video_input.hpp similarity index 87% rename from dynamic_vino_lib/include/dynamic_vino_lib/inputs/video_input.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/video_input.hpp index d751209a..c4ee9b10 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/video_input.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inputs/video_input.hpp @@ -16,12 +16,12 @@ * @brief A header file with declaration for Video class * @file video_input.h */ -#ifndef DYNAMIC_VINO_LIB__INPUTS__VIDEO_INPUT_HPP_ -#define DYNAMIC_VINO_LIB__INPUTS__VIDEO_INPUT_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__INPUTS__VIDEO_INPUT_HPP_ +#define OPENVINO_WRAPPER_LIB__INPUTS__VIDEO_INPUT_HPP_ #include #include -#include "dynamic_vino_lib/inputs/base_input.hpp" +#include "openvino_wrapper_lib/inputs/base_input.hpp" namespace Input { @@ -57,4 +57,4 @@ class Video : public BaseInputDevice }; } // namespace Input -#endif // DYNAMIC_VINO_LIB__INPUTS__VIDEO_INPUT_HPP_ +#endif // OPENVINO_WRAPPER_LIB__INPUTS__VIDEO_INPUT_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/age_gender_detection_model.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/age_gender_detection_model.hpp similarity index 86% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/age_gender_detection_model.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/models/age_gender_detection_model.hpp index 6ef8af7b..564f93a3 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/age_gender_detection_model.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/age_gender_detection_model.hpp @@ -17,11 +17,11 @@ * @file age_gender_detection_model.h */ -#ifndef DYNAMIC_VINO_LIB__MODELS__AGE_GENDER_DETECTION_MODEL_HPP_ -#define DYNAMIC_VINO_LIB__MODELS__AGE_GENDER_DETECTION_MODEL_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__MODELS__AGE_GENDER_DETECTION_MODEL_HPP_ +#define OPENVINO_WRAPPER_LIB__MODELS__AGE_GENDER_DETECTION_MODEL_HPP_ #include -#include "dynamic_vino_lib/models/base_model.hpp" +#include "openvino_wrapper_lib/models/base_model.hpp" namespace Models { @@ -65,4 +65,4 @@ class AgeGenderDetectionModel : public BaseModel }; } // namespace Models -#endif // DYNAMIC_VINO_LIB__MODELS__AGE_GENDER_DETECTION_MODEL_HPP_ +#endif // OPENVINO_WRAPPER_LIB__MODELS__AGE_GENDER_DETECTION_MODEL_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/attributes/base_attribute.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/attributes/base_attribute.hpp similarity index 95% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/attributes/base_attribute.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/models/attributes/base_attribute.hpp index d404b888..e439e9f0 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/attributes/base_attribute.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/attributes/base_attribute.hpp @@ -17,8 +17,8 @@ * @file base_attribute.hpp */ -#ifndef DYNAMIC_VINO_LIB__MODELS__ATTRIBUTES_BASE_ATTRIBUTE_HPP_ -#define DYNAMIC_VINO_LIB__MODELS__ATTRIBUTES_BASE_ATTRIBUTE_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__MODELS__ATTRIBUTES_BASE_ATTRIBUTE_HPP_ +#define OPENVINO_WRAPPER_LIB__MODELS__ATTRIBUTES_BASE_ATTRIBUTE_HPP_ #include #include @@ -27,7 +27,7 @@ #include #include "openvino/openvino.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/slog.hpp" namespace Models { @@ -195,4 +195,4 @@ class SSDModelAttr : public ModelAttribute } // namespace Models -#endif // DYNAMIC_VINO_LIB__MODELS__ATTRIBUTES_BASE_ATTRIBUTE_HPP_ \ No newline at end of file +#endif // OPENVINO_WRAPPER_LIB__MODELS__ATTRIBUTES_BASE_ATTRIBUTE_HPP_ \ No newline at end of file diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/base_model.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/base_model.hpp similarity index 91% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/base_model.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/models/base_model.hpp index 64d9c89e..ce0a0ac0 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/base_model.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/base_model.hpp @@ -17,8 +17,8 @@ * @file base_model.h */ -#ifndef DYNAMIC_VINO_LIB__MODELS__BASE_MODEL_HPP_ -#define DYNAMIC_VINO_LIB__MODELS__BASE_MODEL_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__MODELS__BASE_MODEL_HPP_ +#define OPENVINO_WRAPPER_LIB__MODELS__BASE_MODEL_HPP_ #include @@ -30,15 +30,15 @@ #include #include -#include "dynamic_vino_lib/slog.hpp" -#include "dynamic_vino_lib/models/attributes/base_attribute.hpp" +#include "openvino_wrapper_lib/slog.hpp" +#include "openvino_wrapper_lib/models/attributes/base_attribute.hpp" namespace Engines { class Engine; } -namespace dynamic_vino_lib +namespace openvino_wrapper_lib { class ObjectDetectionResult; } @@ -132,7 +132,7 @@ namespace Models ObjectDetectionModel(const std::string& label_loc, const std::string& model_loc, int batch_size = 1); virtual bool fetchResults( const std::shared_ptr &engine, - std::vector &result, + std::vector &result, const float &confidence_thresh = 0.3, const bool &enable_roi_constraint = false) = 0; virtual bool matToBlob( @@ -142,4 +142,4 @@ namespace Models } // namespace Models -#endif // DYNAMIC_VINO_LIB__MODELS__BASE_MODEL_HPP_ +#endif // OPENVINO_WRAPPER_LIB__MODELS__BASE_MODEL_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/emotion_detection_model.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/emotion_detection_model.hpp similarity index 83% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/emotion_detection_model.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/models/emotion_detection_model.hpp index c5abd257..56c73665 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/emotion_detection_model.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/emotion_detection_model.hpp @@ -17,11 +17,11 @@ * @file emotion_detection_model.h */ -#ifndef DYNAMIC_VINO_LIB__MODELS__EMOTION_DETECTION_MODEL_HPP_ -#define DYNAMIC_VINO_LIB__MODELS__EMOTION_DETECTION_MODEL_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__MODELS__EMOTION_DETECTION_MODEL_HPP_ +#define OPENVINO_WRAPPER_LIB__MODELS__EMOTION_DETECTION_MODEL_HPP_ #include -#include "dynamic_vino_lib/models/base_model.hpp" +#include "openvino_wrapper_lib/models/base_model.hpp" namespace Models { @@ -43,4 +43,4 @@ class EmotionDetectionModel : public BaseModel }; } // namespace Models -#endif // DYNAMIC_VINO_LIB__MODELS__EMOTION_DETECTION_MODEL_HPP_ +#endif // OPENVINO_WRAPPER_LIB__MODELS__EMOTION_DETECTION_MODEL_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/face_detection_model.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/face_detection_model.hpp similarity index 83% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/face_detection_model.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/models/face_detection_model.hpp index 868417e4..c4923a36 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/face_detection_model.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/face_detection_model.hpp @@ -17,11 +17,11 @@ * @file face_detection_model.h */ -#ifndef DYNAMIC_VINO_LIB__MODELS__FACE_DETECTION_MODEL_HPP_ -#define DYNAMIC_VINO_LIB__MODELS__FACE_DETECTION_MODEL_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__MODELS__FACE_DETECTION_MODEL_HPP_ +#define OPENVINO_WRAPPER_LIB__MODELS__FACE_DETECTION_MODEL_HPP_ #include -#include "dynamic_vino_lib/models/base_model.hpp" +#include "openvino_wrapper_lib/models/base_model.hpp" namespace Models { @@ -42,4 +42,4 @@ class FaceDetectionModel : public ObjectDetectionModel }; } // namespace Models -#endif // DYNAMIC_VINO_LIB__MODELS__FACE_DETECTION_MODEL_HPP_ +#endif // OPENVINO_WRAPPER_LIB__MODELS__FACE_DETECTION_MODEL_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/face_reidentification_model.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/face_reidentification_model.hpp similarity index 83% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/face_reidentification_model.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/models/face_reidentification_model.hpp index b526777c..4eda2755 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/face_reidentification_model.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/face_reidentification_model.hpp @@ -16,10 +16,10 @@ * @brief A header file with declaration for FaceReidentificationModel Class * @file person_reidentification_model.h */ -#ifndef DYNAMIC_VINO_LIB__MODELS__FACE_REIDENTIFICATION_MODEL_HPP_ -#define DYNAMIC_VINO_LIB__MODELS__FACE_REIDENTIFICATION_MODEL_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__MODELS__FACE_REIDENTIFICATION_MODEL_HPP_ +#define OPENVINO_WRAPPER_LIB__MODELS__FACE_REIDENTIFICATION_MODEL_HPP_ #include -#include "dynamic_vino_lib/models/base_model.hpp" +#include "openvino_wrapper_lib/models/base_model.hpp" namespace Models { @@ -44,4 +44,4 @@ class FaceReidentificationModel : public BaseModel std::string output_; }; } // namespace Models -#endif // DYNAMIC_VINO_LIB__MODELS__FACE_REIDENTIFICATION_MODEL_HPP_ +#endif // OPENVINO_WRAPPER_LIB__MODELS__FACE_REIDENTIFICATION_MODEL_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/head_pose_detection_model.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/head_pose_detection_model.hpp similarity index 87% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/head_pose_detection_model.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/models/head_pose_detection_model.hpp index 2878eb51..d815f125 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/head_pose_detection_model.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/head_pose_detection_model.hpp @@ -17,11 +17,11 @@ * @file head_pose_detection_model.h */ -#ifndef DYNAMIC_VINO_LIB__MODELS__HEAD_POSE_DETECTION_MODEL_HPP_ -#define DYNAMIC_VINO_LIB__MODELS__HEAD_POSE_DETECTION_MODEL_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__MODELS__HEAD_POSE_DETECTION_MODEL_HPP_ +#define OPENVINO_WRAPPER_LIB__MODELS__HEAD_POSE_DETECTION_MODEL_HPP_ #include -#include "dynamic_vino_lib/models/base_model.hpp" +#include "openvino_wrapper_lib/models/base_model.hpp" namespace Models { @@ -73,4 +73,4 @@ class HeadPoseDetectionModel : public BaseModel }; } // namespace Models -#endif // DYNAMIC_VINO_LIB__MODELS__HEAD_POSE_DETECTION_MODEL_HPP_ +#endif // OPENVINO_WRAPPER_LIB__MODELS__HEAD_POSE_DETECTION_MODEL_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/landmarks_detection_model.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/landmarks_detection_model.hpp similarity index 83% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/landmarks_detection_model.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/models/landmarks_detection_model.hpp index 164d2ea7..71a7244f 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/landmarks_detection_model.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/landmarks_detection_model.hpp @@ -16,10 +16,10 @@ * @brief A header file with declaration for LandmarksDetectionModel Class * @file landmarks_detection_model.h */ -#ifndef DYNAMIC_VINO_LIB__MODELS__LANDMARKS_DETECTION_MODEL_HPP_ -#define DYNAMIC_VINO_LIB__MODELS__LANDMARKS_DETECTION_MODEL_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__MODELS__LANDMARKS_DETECTION_MODEL_HPP_ +#define OPENVINO_WRAPPER_LIB__MODELS__LANDMARKS_DETECTION_MODEL_HPP_ #include -#include "dynamic_vino_lib/models/base_model.hpp" +#include "openvino_wrapper_lib/models/base_model.hpp" namespace Models { /** @@ -43,4 +43,4 @@ class LandmarksDetectionModel : public BaseModel std::string output_; }; } // namespace Models -#endif // DYNAMIC_VINO_LIB__MODELS__LANDMARKS_DETECTION_MODEL_HPP_ +#endif // OPENVINO_WRAPPER_LIB__MODELS__LANDMARKS_DETECTION_MODEL_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/license_plate_detection_model.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/license_plate_detection_model.hpp similarity index 85% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/license_plate_detection_model.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/models/license_plate_detection_model.hpp index 868fafc1..76c2deed 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/license_plate_detection_model.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/license_plate_detection_model.hpp @@ -16,10 +16,10 @@ * @brief A header file with declaration for LicensePlateDetectionModel Class * @file vehicle_attribs_detection_model.h */ -#ifndef DYNAMIC_VINO_LIB__MODELS__LICENSE_PLATE_DETECTION_MODEL_HPP_ -#define DYNAMIC_VINO_LIB__MODELS__LICENSE_PLATE_DETECTION_MODEL_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__MODELS__LICENSE_PLATE_DETECTION_MODEL_HPP_ +#define OPENVINO_WRAPPER_LIB__MODELS__LICENSE_PLATE_DETECTION_MODEL_HPP_ #include -#include "dynamic_vino_lib/models/base_model.hpp" +#include "openvino_wrapper_lib/models/base_model.hpp" namespace Models { /** @@ -48,4 +48,4 @@ class LicensePlateDetectionModel : public BaseModel std::string output_; }; } // namespace Models -#endif // DYNAMIC_VINO_LIB__MODELS__LICENSE_PLATE_DETECTION_MODEL_HPP_ +#endif // OPENVINO_WRAPPER_LIB__MODELS__LICENSE_PLATE_DETECTION_MODEL_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/object_detection_ssd_model.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/object_detection_ssd_model.hpp similarity index 81% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/object_detection_ssd_model.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/models/object_detection_ssd_model.hpp index 622e866b..818414dd 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/object_detection_ssd_model.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/object_detection_ssd_model.hpp @@ -15,12 +15,12 @@ * @brief A header file with declaration for ObjectDetectionModel Class * @file face_detection_model.h */ -#ifndef DYNAMIC_VINO_LIB__MODELS__OBJECT_DETECTION_SSD_MODEL_HPP_ -#define DYNAMIC_VINO_LIB__MODELS__OBJECT_DETECTION_SSD_MODEL_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__MODELS__OBJECT_DETECTION_SSD_MODEL_HPP_ +#define OPENVINO_WRAPPER_LIB__MODELS__OBJECT_DETECTION_SSD_MODEL_HPP_ #include #include #include -#include "dynamic_vino_lib/models/base_model.hpp" +#include "openvino_wrapper_lib/models/base_model.hpp" namespace Models { /** @@ -29,14 +29,14 @@ namespace Models */ class ObjectDetectionSSDModel : public ObjectDetectionModel { - using Result = dynamic_vino_lib::ObjectDetectionResult; + using Result = openvino_wrapper_lib::ObjectDetectionResult; public: ObjectDetectionSSDModel(const std::string& label_loc, const std::string & model_loc, int batch_size = 1); bool fetchResults( const std::shared_ptr & engine, - std::vector & results, + std::vector & results, const float & confidence_thresh = 0.3, const bool & enable_roi_constraint = false) override; @@ -59,4 +59,4 @@ class ObjectDetectionSSDModel : public ObjectDetectionModel }; } // namespace Models -#endif // DYNAMIC_VINO_LIB__MODELS__OBJECT_DETECTION_SSD_MODEL_HPP_ +#endif // OPENVINO_WRAPPER_LIB__MODELS__OBJECT_DETECTION_SSD_MODEL_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/object_detection_yolov5_model.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/object_detection_yolov5_model.hpp similarity index 83% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/object_detection_yolov5_model.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/models/object_detection_yolov5_model.hpp index f9e2b040..8e2f177e 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/object_detection_yolov5_model.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/object_detection_yolov5_model.hpp @@ -15,12 +15,12 @@ * @brief A header file with declaration for ObjectDetectionModel Class * @file face_detection_model.h */ -#ifndef DYNAMIC_VINO_LIB__MODELS__OBJECT_DETECTION_YOLOV5_MODEL_HPP_ -#define DYNAMIC_VINO_LIB__MODELS__OBJECT_DETECTION_YOLOV5_MODEL_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__MODELS__OBJECT_DETECTION_YOLOV5_MODEL_HPP_ +#define OPENVINO_WRAPPER_LIB__MODELS__OBJECT_DETECTION_YOLOV5_MODEL_HPP_ #include #include #include -#include "dynamic_vino_lib/models/base_model.hpp" +#include "openvino_wrapper_lib/models/base_model.hpp" namespace Models { /** @@ -37,14 +37,14 @@ namespace Models class ObjectDetectionYolov5Model : public ObjectDetectionModel { - using Result = dynamic_vino_lib::ObjectDetectionResult; + using Result = openvino_wrapper_lib::ObjectDetectionResult; public: ObjectDetectionYolov5Model(const std::string& label_loc, const std::string & model_loc, int batch_size = 1); bool fetchResults( const std::shared_ptr & engine, - std::vector & results, + std::vector & results, const float & confidence_thresh = 0.3, const bool & enable_roi_constraint = false) override; @@ -70,4 +70,4 @@ class ObjectDetectionYolov5Model : public ObjectDetectionModel }; } // namespace Models -#endif // DYNAMIC_VINO_LIB__MODELS__OBJECT_DETECTION_YOLOV5_MODEL_HPP_ +#endif // OPENVINO_WRAPPER_LIB__MODELS__OBJECT_DETECTION_YOLOV5_MODEL_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/object_segmentation_maskrcnn_model.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/object_segmentation_maskrcnn_model.hpp similarity index 85% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/object_segmentation_maskrcnn_model.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/models/object_segmentation_maskrcnn_model.hpp index e0c64600..49940225 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/object_segmentation_maskrcnn_model.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/object_segmentation_maskrcnn_model.hpp @@ -15,11 +15,11 @@ * @brief A header file with declaration for ObjectSegmentationMaskrcnnModel Class * @file face_detection_model.h */ -#ifndef DYNAMIC_VINO_LIB__MODELS__OBJECT_SEGMENTATION_MASKRCNN_MODEL_HPP_ -#define DYNAMIC_VINO_LIB__MODELS__OBJECT_SEGMENTATION_MASKRCNN_MODEL_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__MODELS__OBJECT_SEGMENTATION_MASKRCNN_MODEL_HPP_ +#define OPENVINO_WRAPPER_LIB__MODELS__OBJECT_SEGMENTATION_MASKRCNN_MODEL_HPP_ #include #include -#include "dynamic_vino_lib/models/base_model.hpp" +#include "openvino_wrapper_lib/models/base_model.hpp" namespace Models { /** @@ -58,4 +58,4 @@ class ObjectSegmentationMaskrcnnModel : public BaseModel int object_size_; }; } // namespace Models -#endif // DYNAMIC_VINO_LIB__MODELS__OBJECT_SEGMENTATION_MASKRCNN_MODEL_HPP_ +#endif // OPENVINO_WRAPPER_LIB__MODELS__OBJECT_SEGMENTATION_MASKRCNN_MODEL_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/object_segmentation_model.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/object_segmentation_model.hpp similarity index 86% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/object_segmentation_model.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/models/object_segmentation_model.hpp index 5a527651..217ec132 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/object_segmentation_model.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/object_segmentation_model.hpp @@ -15,11 +15,11 @@ * @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 OPENVINO_WRAPPER_LIB__MODELS__OBJECT_SEGMENTATION_MODEL_HPP_ +#define OPENVINO_WRAPPER_LIB__MODELS__OBJECT_SEGMENTATION_MODEL_HPP_ #include #include -#include "dynamic_vino_lib/models/base_model.hpp" +#include "openvino_wrapper_lib/models/base_model.hpp" namespace Models { /** @@ -58,4 +58,4 @@ class ObjectSegmentationModel : public BaseModel int object_size_; }; } // namespace Models -#endif // DYNAMIC_VINO_LIB__MODELS__OBJECT_SEGMENTATION_MODEL_HPP_ +#endif // OPENVINO_WRAPPER_LIB__MODELS__OBJECT_SEGMENTATION_MODEL_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/person_attribs_detection_model.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/person_attribs_detection_model.hpp similarity index 82% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/person_attribs_detection_model.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/models/person_attribs_detection_model.hpp index 1e253098..d22e6a2d 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/person_attribs_detection_model.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/person_attribs_detection_model.hpp @@ -16,10 +16,10 @@ * @brief A header file with declaration for PersonAttribsDetectionModel Class * @file person_attribs_detection_model.h */ -#ifndef DYNAMIC_VINO_LIB__MODELS__PERSON_ATTRIBS_DETECTION_MODEL_HPP_ -#define DYNAMIC_VINO_LIB__MODELS__PERSON_ATTRIBS_DETECTION_MODEL_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__MODELS__PERSON_ATTRIBS_DETECTION_MODEL_HPP_ +#define OPENVINO_WRAPPER_LIB__MODELS__PERSON_ATTRIBS_DETECTION_MODEL_HPP_ #include -#include "dynamic_vino_lib/models/base_model.hpp" +#include "openvino_wrapper_lib/models/base_model.hpp" namespace Models { /** @@ -42,4 +42,4 @@ class PersonAttribsDetectionModel : public BaseModel std::string output_; }; } // namespace Models -#endif // DYNAMIC_VINO_LIB__MODELS__PERSON_ATTRIBS_DETECTION_MODEL_HPP_ +#endif // OPENVINO_WRAPPER_LIB__MODELS__PERSON_ATTRIBS_DETECTION_MODEL_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/person_reidentification_model.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/person_reidentification_model.hpp similarity index 84% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/person_reidentification_model.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/models/person_reidentification_model.hpp index afbb4dcb..4b2937ff 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/person_reidentification_model.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/person_reidentification_model.hpp @@ -16,10 +16,10 @@ * @brief A header file with declaration for PersonReidentificationModel Class * @file person_reidentification_model.h */ -#ifndef DYNAMIC_VINO_LIB__MODELS__PERSON_REIDENTIFICATION_MODEL_HPP_ -#define DYNAMIC_VINO_LIB__MODELS__PERSON_REIDENTIFICATION_MODEL_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__MODELS__PERSON_REIDENTIFICATION_MODEL_HPP_ +#define OPENVINO_WRAPPER_LIB__MODELS__PERSON_REIDENTIFICATION_MODEL_HPP_ #include -#include "dynamic_vino_lib/models/base_model.hpp" +#include "openvino_wrapper_lib/models/base_model.hpp" namespace Models { /** @@ -44,4 +44,4 @@ class PersonReidentificationModel : public BaseModel std::string output_; }; } // namespace Models -#endif // DYNAMIC_VINO_LIB__MODELS__PERSON_REIDENTIFICATION_MODEL_HPP_ +#endif // OPENVINO_WRAPPER_LIB__MODELS__PERSON_REIDENTIFICATION_MODEL_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/vehicle_attribs_detection_model.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/vehicle_attribs_detection_model.hpp similarity index 84% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/vehicle_attribs_detection_model.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/models/vehicle_attribs_detection_model.hpp index ff230f1d..8012bd68 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/vehicle_attribs_detection_model.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/models/vehicle_attribs_detection_model.hpp @@ -16,10 +16,10 @@ * @brief A header file with declaration for VehicleAttribsDetectionModel Class * @file vehicle_attribs_detection_model.h */ -#ifndef DYNAMIC_VINO_LIB__MODELS__VEHICLE_ATTRIBS_DETECTION_MODEL_HPP_ -#define DYNAMIC_VINO_LIB__MODELS__VEHICLE_ATTRIBS_DETECTION_MODEL_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__MODELS__VEHICLE_ATTRIBS_DETECTION_MODEL_HPP_ +#define OPENVINO_WRAPPER_LIB__MODELS__VEHICLE_ATTRIBS_DETECTION_MODEL_HPP_ #include -#include "dynamic_vino_lib/models/base_model.hpp" +#include "openvino_wrapper_lib/models/base_model.hpp" namespace Models { /** @@ -45,4 +45,4 @@ class VehicleAttribsDetectionModel : public BaseModel std::string type_output_; }; } // namespace Models -#endif // DYNAMIC_VINO_LIB__MODELS__VEHICLE_ATTRIBS_DETECTION_MODEL_HPP_ +#endif // OPENVINO_WRAPPER_LIB__MODELS__VEHICLE_ATTRIBS_DETECTION_MODEL_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/base_output.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/outputs/base_output.hpp similarity index 53% rename from dynamic_vino_lib/include/dynamic_vino_lib/outputs/base_output.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/outputs/base_output.hpp index c9267db8..97ac56b1 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/base_output.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/outputs/base_output.hpp @@ -17,40 +17,40 @@ * @file head_pose_detection_model.h */ -#ifndef DYNAMIC_VINO_LIB__OUTPUTS__BASE_OUTPUT_HPP_ -#define DYNAMIC_VINO_LIB__OUTPUTS__BASE_OUTPUT_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__OUTPUTS__BASE_OUTPUT_HPP_ +#define OPENVINO_WRAPPER_LIB__OUTPUTS__BASE_OUTPUT_HPP_ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include "dynamic_vino_lib/inferences/age_gender_detection.hpp" -#include "dynamic_vino_lib/inferences/base_inference.hpp" -#include "dynamic_vino_lib/inferences/emotions_detection.hpp" -#include "dynamic_vino_lib/inferences/face_detection.hpp" -#include "dynamic_vino_lib/inferences/head_pose_detection.hpp" -#include "dynamic_vino_lib/inferences/object_detection.hpp" -#include "dynamic_vino_lib/inferences/object_segmentation.hpp" -#include "dynamic_vino_lib/inferences/person_reidentification.hpp" -#include "dynamic_vino_lib/inferences/person_attribs_detection.hpp" -#include "dynamic_vino_lib/inferences/landmarks_detection.hpp" -#include "dynamic_vino_lib/inferences/face_reidentification.hpp" -#include "dynamic_vino_lib/inferences/vehicle_attribs_detection.hpp" -#include "dynamic_vino_lib/inferences/license_plate_detection.hpp" -#include "dynamic_vino_lib/inferences/object_segmentation_maskrcnn.hpp" +#include "openvino_wrapper_lib/inferences/age_gender_detection.hpp" +#include "openvino_wrapper_lib/inferences/base_inference.hpp" +#include "openvino_wrapper_lib/inferences/emotions_detection.hpp" +#include "openvino_wrapper_lib/inferences/face_detection.hpp" +#include "openvino_wrapper_lib/inferences/head_pose_detection.hpp" +#include "openvino_wrapper_lib/inferences/object_detection.hpp" +#include "openvino_wrapper_lib/inferences/object_segmentation.hpp" +#include "openvino_wrapper_lib/inferences/person_reidentification.hpp" +#include "openvino_wrapper_lib/inferences/person_attribs_detection.hpp" +#include "openvino_wrapper_lib/inferences/landmarks_detection.hpp" +#include "openvino_wrapper_lib/inferences/face_reidentification.hpp" +#include "openvino_wrapper_lib/inferences/vehicle_attribs_detection.hpp" +#include "openvino_wrapper_lib/inferences/license_plate_detection.hpp" +#include "openvino_wrapper_lib/inferences/object_segmentation_maskrcnn.hpp" #include "opencv2/opencv.hpp" class Pipeline; @@ -70,80 +70,80 @@ class BaseOutput /** * @brief Generate output content according to the license plate detection result. */ - virtual void accept(const std::vector &) + virtual void accept(const std::vector &) { } /** * @brief Generate output content according to the vehicle attributes detection result. */ - virtual void accept(const std::vector &) + virtual void accept(const std::vector &) { } /** * @brief Generate output content according to the face reidentification result. */ - virtual void accept(const std::vector &) + virtual void accept(const std::vector &) { } /** * @brief Generate output content according to the landmarks detection 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 &) { } /** * @brief Generate output content according to the person reidentification 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 object segmentation maskrcnn result. */ - virtual void accept(const std::vector &) + virtual void accept(const std::vector &) { } /** * @brief Generate output content according to the object detection result. */ - virtual void accept(const std::vector &) + virtual void accept(const std::vector &) { } /** * @brief Generate output content according to the face detection result. */ - virtual void accept(const std::vector &) + virtual void accept(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 &) { } /** @@ -164,13 +164,13 @@ class BaseOutput virtual void setServiceResponseForFace( std::shared_ptr response) {} virtual void setServiceResponse( - std::shared_ptr response) {} + std::shared_ptr response) {} virtual void setServiceResponse( - std::shared_ptr response) {} + std::shared_ptr response) {} virtual void setServiceResponse( - std::shared_ptr response) {} + std::shared_ptr response) {} virtual void setServiceResponse( - std::shared_ptr response) {} + std::shared_ptr response) {} Pipeline * getPipeline() const; cv::Mat getFrame() const; virtual void clearData() {} @@ -181,4 +181,4 @@ class BaseOutput std::string output_name_; }; } // namespace Outputs -#endif // DYNAMIC_VINO_LIB__OUTPUTS__BASE_OUTPUT_HPP_ +#endif // OPENVINO_WRAPPER_LIB__OUTPUTS__BASE_OUTPUT_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/image_window_output.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/outputs/image_window_output.hpp similarity index 78% rename from dynamic_vino_lib/include/dynamic_vino_lib/outputs/image_window_output.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/outputs/image_window_output.hpp index 22f9b704..d7c39ea1 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/image_window_output.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/outputs/image_window_output.hpp @@ -17,12 +17,12 @@ * @file image_window_output.h */ -#ifndef DYNAMIC_VINO_LIB__OUTPUTS__IMAGE_WINDOW_OUTPUT_HPP_ -#define DYNAMIC_VINO_LIB__OUTPUTS__IMAGE_WINDOW_OUTPUT_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__OUTPUTS__IMAGE_WINDOW_OUTPUT_HPP_ +#define OPENVINO_WRAPPER_LIB__OUTPUTS__IMAGE_WINDOW_OUTPUT_HPP_ #include #include -#include "dynamic_vino_lib/outputs/base_output.hpp" +#include "openvino_wrapper_lib/outputs/base_output.hpp" namespace Outputs { @@ -56,84 +56,84 @@ class ImageWindowOutput : public BaseOutput * @param[in] A license plate detection result objetc. */ void accept( - const std::vector &) override; + const std::vector &) override; /** * @brief Generate image window output content according to * the vehicle attributes detection result. * @param[in] A vehicle attributes detection result objetc. */ void accept( - const std::vector &) override; + const std::vector &) override; /** * @brief Generate image window output content according to * the face reidentification result. * @param[in] A face reidentification result objetc. */ void accept( - const std::vector &) override; + const std::vector &) override; /** * @brief Generate image window output content according to * the landmarks detection result. * @param[in] A landmarks detection result objetc. */ void accept( - const std::vector &) override; + const std::vector &) override; /** * @brief Generate image window output content according to * the person attributes detection result. * @param[in] A person attributes detection result objetc. */ void accept( - const std::vector &) override; + const std::vector &) override; /** * @brief Generate image window output content according to * the person reidentification result. * @param[in] A person reidentification result objetc. */ void accept( - const std::vector &) override; + const std::vector &) override; /** * @brief Generate image window output content according to * the object segmentation result. * @param[in] An obejct segmentation 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 maskrcnn result. * @param[in] An obejct segmentation result objetc. */ - void accept(const std::vector &) override; + void accept(const std::vector &) override; /** * @brief Generate image window output content according to * 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 image window 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 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; private: unsigned findOutput(const cv::Rect &); @@ -150,8 +150,8 @@ class ImageWindowOutput : public BaseOutput */ cv::Mat getRotationTransform(double yaw, double pitch, double roll); - void mergeMask(const std::vector &); - void mergeMask(const std::vector &); + void mergeMask(const std::vector &); + void mergeMask(const std::vector &); struct OutputData { @@ -180,4 +180,4 @@ class ImageWindowOutput : public BaseOutput }; }; } // namespace Outputs -#endif // DYNAMIC_VINO_LIB__OUTPUTS__IMAGE_WINDOW_OUTPUT_HPP_ +#endif // OPENVINO_WRAPPER_LIB__OUTPUTS__IMAGE_WINDOW_OUTPUT_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_service_output.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/outputs/ros_service_output.hpp similarity index 61% rename from dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_service_output.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/outputs/ros_service_output.hpp index da27197b..8cdfabad 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_service_output.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/outputs/ros_service_output.hpp @@ -17,18 +17,18 @@ * @file ros_topic_output.hpp */ -#ifndef DYNAMIC_VINO_LIB__OUTPUTS__ROS_SERVICE_OUTPUT_HPP_ -#define DYNAMIC_VINO_LIB__OUTPUTS__ROS_SERVICE_OUTPUT_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__OUTPUTS__ROS_SERVICE_OUTPUT_HPP_ +#define OPENVINO_WRAPPER_LIB__OUTPUTS__ROS_SERVICE_OUTPUT_HPP_ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -36,8 +36,8 @@ #include #include -#include "dynamic_vino_lib/inferences/face_detection.hpp" -#include "dynamic_vino_lib/outputs/ros_topic_output.hpp" +#include "openvino_wrapper_lib/inferences/face_detection.hpp" +#include "openvino_wrapper_lib/outputs/ros_topic_output.hpp" namespace Outputs { @@ -60,13 +60,13 @@ class RosServiceOutput : public RosTopicOutput void setServiceResponse(std::shared_ptr response); void setResponseForFace(std::shared_ptr response); - void setServiceResponse(std::shared_ptr response); - void setServiceResponse(std::shared_ptr response); - void setServiceResponse(std::shared_ptr response); - void setServiceResponse(std::shared_ptr response); + void setServiceResponse(std::shared_ptr response); + void setServiceResponse(std::shared_ptr response); + void setServiceResponse(std::shared_ptr response); + void setServiceResponse(std::shared_ptr response); private: const std::string service_name_; }; } // namespace Outputs -#endif // DYNAMIC_VINO_LIB__OUTPUTS__ROS_SERVICE_OUTPUT_HPP_ +#endif // OPENVINO_WRAPPER_LIB__OUTPUTS__ROS_SERVICE_OUTPUT_HPP_ diff --git a/openvino_wrapper_lib/include/openvino_wrapper_lib/outputs/ros_topic_output.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/outputs/ros_topic_output.hpp new file mode 100644 index 00000000..b2fcfcec --- /dev/null +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/outputs/ros_topic_output.hpp @@ -0,0 +1,183 @@ +// Copyright (c) 2018-2022 Intel Corporation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/** + * @brief A header file with declaration for RosTopicOutput Class + * @file ros_topic_output.hpp + */ + +#ifndef OPENVINO_WRAPPER_LIB__OUTPUTS__ROS_TOPIC_OUTPUT_HPP_ +#define OPENVINO_WRAPPER_LIB__OUTPUTS__ROS_TOPIC_OUTPUT_HPP_ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include "openvino_wrapper_lib/inferences/face_detection.hpp" +#include "openvino_wrapper_lib/outputs/base_output.hpp" + +namespace Outputs +{ +/** + * @class RosTopicOutput + * @brief This class handles and publish the detection result with ros topic. + */ +class RosTopicOutput : public BaseOutput +{ +public: + explicit RosTopicOutput(std::string output_name_, + const rclcpp::Node::SharedPtr node=nullptr); + /** + * @brief Calculate the camera matrix of a frame. + * @param[in] A frame. + */ + void feedFrame(const cv::Mat &) override; + /** + * @brief Publish all the detected infomations generated by the accept + * functions with ros topic. + */ + void handleOutput() override; + /** + * @brief Generate ros topic infomation according to + * the license plate detection result. + * @param[in] results a bundle of license plate detection results. + */ + void accept(const std::vector &) override; + /** + * @brief Generate ros topic infomation according to + * the vehicle attributes detection result. + * @param[in] results a bundle of vehicle attributes detection results. + */ + void accept(const std::vector &) override; + /** + * @brief Generate ros topic infomation according to + * the face reidentification result. + * @param[in] results a bundle of face reidentification results. + */ + void accept(const std::vector &) override; + /** + * @brief Generate ros topic infomation according to + * the landmarks detection result. + * @param[in] results a bundle of landmarks detection results. + */ + void accept(const std::vector &) override; + /** + * @brief Generate ros topic infomation according to + * the person attributes detection result. + * @param[in] results a bundle of person attributes detection results. + */ + void accept(const std::vector &) override; + /** + * @brief Generate ros topic infomation according to + * the person reidentification result. + * @param[in] results a bundle of person reidentification results. + */ + 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; + /** + * @brief Generate ros topic infomation according to + * the object segmentation result. + * @param[in] results a bundle of object segmentation maskrcnn results. + */ + void accept(const std::vector &) override; + /** + * @brief Generate ros topic infomation according to + * the object detection result. + * @param[in] results a bundle of object detection results. + */ + 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; + /** + * @brief Generate ros topic infomation according to + * the emotion detection result. + * @param[in] An emotion detection result objetc. + */ + 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; + /** + * @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; + +protected: + const std::string topic_name_; + std::shared_ptr node_; + rclcpp::Publisher::SharedPtr pub_license_plate_; + std::shared_ptr license_plate_topic_; + rclcpp::Publisher::SharedPtr pub_vehicle_attribs_; + std::shared_ptr vehicle_attribs_topic_; + rclcpp::Publisher::SharedPtr pub_landmarks_; + std::shared_ptr landmarks_topic_; + rclcpp::Publisher::SharedPtr pub_face_reid_; + std::shared_ptr face_reid_topic_; + rclcpp::Publisher::SharedPtr pub_person_attribs_; + std::shared_ptr person_attribs_topic_; + rclcpp::Publisher::SharedPtr pub_person_reid_; + std::shared_ptr person_reid_topic_; + rclcpp::Publisher::SharedPtr pub_segmented_object_; + std::shared_ptr segmented_objects_topic_; + rclcpp::Publisher::SharedPtr pub_detected_object_; + std::shared_ptr detected_objects_topic_; + rclcpp::Publisher::SharedPtr pub_face_; + std::shared_ptr faces_topic_; + rclcpp::Publisher::SharedPtr pub_emotion_; + std::shared_ptr emotions_topic_; + rclcpp::Publisher::SharedPtr pub_age_gender_; + std::shared_ptr age_gender_topic_; + rclcpp::Publisher::SharedPtr pub_headpose_; + std::shared_ptr headpose_topic_; +}; +} // namespace Outputs +#endif // OPENVINO_WRAPPER_LIB__OUTPUTS__ROS_TOPIC_OUTPUT_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/rviz_output.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/outputs/rviz_output.hpp similarity index 73% rename from dynamic_vino_lib/include/dynamic_vino_lib/outputs/rviz_output.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/outputs/rviz_output.hpp index f1cc0f4e..6711fab6 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/rviz_output.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/outputs/rviz_output.hpp @@ -17,8 +17,8 @@ * @file rviz_output.h */ -#ifndef DYNAMIC_VINO_LIB__OUTPUTS__RVIZ_OUTPUT_HPP_ -#define DYNAMIC_VINO_LIB__OUTPUTS__RVIZ_OUTPUT_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__OUTPUTS__RVIZ_OUTPUT_HPP_ +#define OPENVINO_WRAPPER_LIB__OUTPUTS__RVIZ_OUTPUT_HPP_ #include #include @@ -26,8 +26,8 @@ #include #include -#include "dynamic_vino_lib/outputs/base_output.hpp" -#include "dynamic_vino_lib/outputs/image_window_output.hpp" +#include "openvino_wrapper_lib/outputs/base_output.hpp" +#include "openvino_wrapper_lib/outputs/image_window_output.hpp" namespace Outputs { @@ -54,67 +54,67 @@ class RvizOutput : public BaseOutput * the face reidentification result. * @param[in] A face reidentification result objetc. */ - void accept(const std::vector &) override; + void accept(const std::vector &) override; /** * @brief Generate rviz output content according to * the landmarks detection result. * @param[in] A landmarks detection result objetc. */ - void accept(const std::vector &) override; + void accept(const std::vector &) override; /** * @brief Generate rviz output content according to * the person attributes detection result. * @param[in] A person attributes detection result objetc. */ - void accept(const std::vector &) override; + void accept(const std::vector &) override; /** * @brief Generate rviz output content according to * the person reidentification result. * @param[in] A person reidentification result objetc. */ - void accept(const std::vector &) override; + void accept(const std::vector &) override; /** * @brief Generate rviz output content according to * 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 object segmentation result. * @param[in] results A bundle of object segmentation maskrcnn results. */ - void accept(const std::vector &) override; + void accept(const std::vector &) override; /** * @brief Generate rviz 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 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; private: std::shared_ptr node_; @@ -123,4 +123,4 @@ class RvizOutput : public BaseOutput std::shared_ptr image_window_output_; }; } // namespace Outputs -#endif // DYNAMIC_VINO_LIB__OUTPUTS__RVIZ_OUTPUT_HPP_ +#endif // OPENVINO_WRAPPER_LIB__OUTPUTS__RVIZ_OUTPUT_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/pipeline.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/pipeline.hpp similarity index 88% rename from dynamic_vino_lib/include/dynamic_vino_lib/pipeline.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/pipeline.hpp index 913bcc6b..a80c15b3 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/pipeline.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/pipeline.hpp @@ -16,8 +16,8 @@ * @brief a header file with declaration of Pipeline class * @file pipeline.h */ -#ifndef DYNAMIC_VINO_LIB__PIPELINE_HPP_ -#define DYNAMIC_VINO_LIB__PIPELINE_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__PIPELINE_HPP_ +#define OPENVINO_WRAPPER_LIB__PIPELINE_HPP_ #include #include @@ -27,10 +27,10 @@ #include #include -#include "dynamic_vino_lib/inferences/base_inference.hpp" -#include "dynamic_vino_lib/inputs/standard_camera.hpp" -#include "dynamic_vino_lib/outputs/base_output.hpp" -#include "dynamic_vino_lib/pipeline_params.hpp" +#include "openvino_wrapper_lib/inferences/base_inference.hpp" +#include "openvino_wrapper_lib/inputs/standard_camera.hpp" +#include "openvino_wrapper_lib/outputs/base_output.hpp" +#include "openvino_wrapper_lib/pipeline_params.hpp" #include "opencv2/opencv.hpp" /** @@ -59,7 +59,7 @@ class Pipeline */ bool add( const std::string & parent, 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. @@ -77,7 +77,7 @@ class Pipeline // { // filters_.add(filters); // } - bool add(const std::string & name, std::shared_ptr inference); + bool add(const std::string & name, std::shared_ptr inference); /** * @brief Add inference network-output device edge to the pipeline. * @param[in] parent name of the parent inference. @@ -154,7 +154,7 @@ class Pipeline std::shared_ptr input_device_; std::string input_device_name_; std::multimap next_; - std::map> name_to_detection_map_; + std::map> name_to_detection_map_; std::map> name_to_output_map_; int total_inference_ = 0; std::set output_names_; @@ -170,4 +170,4 @@ class Pipeline std::chrono::time_point t_start_; }; -#endif // DYNAMIC_VINO_LIB__PIPELINE_HPP_ +#endif // OPENVINO_WRAPPER_LIB__PIPELINE_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/pipeline_manager.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/pipeline_manager.hpp similarity index 79% rename from dynamic_vino_lib/include/dynamic_vino_lib/pipeline_manager.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/pipeline_manager.hpp index 3b4e210c..e4a3d485 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/pipeline_manager.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/pipeline_manager.hpp @@ -16,10 +16,10 @@ * @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 OPENVINO_WRAPPER_LIB__PIPELINE_MANAGER_HPP_ +#define OPENVINO_WRAPPER_LIB__PIPELINE_MANAGER_HPP_ -#include +#include #include #include #include @@ -28,8 +28,8 @@ #include #include #include -#include "dynamic_vino_lib/pipeline.hpp" -#include "dynamic_vino_lib/engines/engine_manager.hpp" +#include "openvino_wrapper_lib/pipeline.hpp" +#include "openvino_wrapper_lib/engines/engine_manager.hpp" /** * @class PipelineManager @@ -110,37 +110,37 @@ class PipelineManager parseInputDevice(const PipelineData & params); std::map> parseOutput(const PipelineData & pdata); - std::map> + std::map> parseInference(const Params::ParamManager::PipelineRawData & params); - std::shared_ptr + std::shared_ptr createFaceDetection(const Params::ParamManager::InferenceRawData & infer); - std::shared_ptr + std::shared_ptr createAgeGenderRecognition(const Params::ParamManager::InferenceRawData & infer); - std::shared_ptr + std::shared_ptr createEmotionRecognition(const Params::ParamManager::InferenceRawData & infer); - std::shared_ptr + std::shared_ptr createHeadPoseEstimation(const Params::ParamManager::InferenceRawData & infer); - std::shared_ptr + std::shared_ptr createObjectDetection(const Params::ParamManager::InferenceRawData & infer); - std::shared_ptr + std::shared_ptr createObjectSegmentation(const Params::ParamManager::InferenceRawData & infer); - std::shared_ptr + std::shared_ptr createObjectSegmentationMaskrcnn(const Params::ParamManager::InferenceRawData & infer); - std::shared_ptr + std::shared_ptr createPersonReidentification(const Params::ParamManager::InferenceRawData & infer); - std::shared_ptr + std::shared_ptr createPersonAttribsDetection(const Params::ParamManager::InferenceRawData & infer); - std::shared_ptr + std::shared_ptr createLandmarksDetection(const Params::ParamManager::InferenceRawData & infer); - std::shared_ptr + std::shared_ptr createFaceReidentification(const Params::ParamManager::InferenceRawData & infer); - std::shared_ptr + std::shared_ptr createVehicleAttribsDetection(const Params::ParamManager::InferenceRawData & infer); - std::shared_ptr + std::shared_ptr createLicensePlateDetection(const Params::ParamManager::InferenceRawData & infer); std::map pipelines_; ServiceData service_; Engines::EngineManager engine_manager_; }; -#endif // DYNAMIC_VINO_LIB__PIPELINE_MANAGER_HPP_ +#endif // OPENVINO_WRAPPER_LIB__PIPELINE_MANAGER_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/pipeline_params.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/pipeline_params.hpp similarity index 89% rename from dynamic_vino_lib/include/dynamic_vino_lib/pipeline_params.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/pipeline_params.hpp index f0deba59..bcb2991a 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/pipeline_params.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/pipeline_params.hpp @@ -16,10 +16,10 @@ * @brief a header file with declaration of Pipeline class * @file pipeline_params.hpp */ -#ifndef DYNAMIC_VINO_LIB__PIPELINE_PARAMS_HPP_ -#define DYNAMIC_VINO_LIB__PIPELINE_PARAMS_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__PIPELINE_PARAMS_HPP_ +#define OPENVINO_WRAPPER_LIB__PIPELINE_PARAMS_HPP_ -#include +#include #include #include #include @@ -28,9 +28,9 @@ #include #include -#include "dynamic_vino_lib/inferences/base_inference.hpp" -#include "dynamic_vino_lib/inputs/standard_camera.hpp" -#include "dynamic_vino_lib/outputs/base_output.hpp" +#include "openvino_wrapper_lib/inferences/base_inference.hpp" +#include "openvino_wrapper_lib/inputs/standard_camera.hpp" +#include "openvino_wrapper_lib/outputs/base_output.hpp" #include "opencv2/opencv.hpp" const char kInputType_Image[] = "Image"; @@ -85,4 +85,4 @@ class PipelineParams Params::ParamManager::PipelineRawData params_; }; -#endif // DYNAMIC_VINO_LIB__PIPELINE_PARAMS_HPP_ +#endif // OPENVINO_WRAPPER_LIB__PIPELINE_PARAMS_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/services/frame_processing_server.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/services/frame_processing_server.hpp similarity index 67% rename from dynamic_vino_lib/include/dynamic_vino_lib/services/frame_processing_server.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/services/frame_processing_server.hpp index 7c77cbf8..e5e5eb82 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/services/frame_processing_server.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/services/frame_processing_server.hpp @@ -11,22 +11,22 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DYNAMIC_VINO_LIB__SERVICES__FRAME_PROCESSING_SERVER_HPP_ -#define DYNAMIC_VINO_LIB__SERVICES__FRAME_PROCESSING_SERVER_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__SERVICES__FRAME_PROCESSING_SERVER_HPP_ +#define OPENVINO_WRAPPER_LIB__SERVICES__FRAME_PROCESSING_SERVER_HPP_ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include -#include -#include +#include +#include +#include #include #include @@ -56,4 +56,4 @@ class FrameProcessingServer : public rclcpp::Node std::string config_path_; }; } // namespace vino_service -#endif // DYNAMIC_VINO_LIB__SERVICES__FRAME_PROCESSING_SERVER_HPP_ +#endif // OPENVINO_WRAPPER_LIB__SERVICES__FRAME_PROCESSING_SERVER_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/services/pipeline_processing_server.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/services/pipeline_processing_server.hpp similarity index 75% rename from dynamic_vino_lib/include/dynamic_vino_lib/services/pipeline_processing_server.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/services/pipeline_processing_server.hpp index d9b55d8c..ed5e1dc2 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/services/pipeline_processing_server.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/services/pipeline_processing_server.hpp @@ -11,14 +11,14 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DYNAMIC_VINO_LIB__SERVICES__PIPELINE_PROCESSING_SERVER_HPP_ -#define DYNAMIC_VINO_LIB__SERVICES__PIPELINE_PROCESSING_SERVER_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__SERVICES__PIPELINE_PROCESSING_SERVER_HPP_ +#define OPENVINO_WRAPPER_LIB__SERVICES__PIPELINE_PROCESSING_SERVER_HPP_ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -51,4 +51,4 @@ class PipelineProcessingServer : public rclcpp::Node std::string service_name_; }; } // namespace vino_service -#endif // DYNAMIC_VINO_LIB__SERVICES__PIPELINE_PROCESSING_SERVER_HPP_ +#endif // OPENVINO_WRAPPER_LIB__SERVICES__PIPELINE_PROCESSING_SERVER_HPP_ diff --git a/openvino_wrapper_lib/include/openvino_wrapper_lib/slog.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/slog.hpp new file mode 100644 index 00000000..bf350394 --- /dev/null +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/slog.hpp @@ -0,0 +1,175 @@ +// Copyright (c) 2018-2022 Intel Corporation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/** + * @brief a header file with logging facility for common samples + * @file slog.hpp + */ +#ifndef OPENVINO_WRAPPER_LIB__SLOG_HPP_ +#define OPENVINO_WRAPPER_LIB__SLOG_HPP_ + +#pragma once + +#include +#include + +namespace slog +{ +#if 1 + enum COLOR { + RESET = 0, + BLUE = 1, + GREEN = 2, + YELLOW = 3, + RED = 4, + }; + +#else +//the following are UBUNTU/LINUX ONLY terminal color codes. +#define RESET "\033[0m" +#define BLACK "\033[30m" /* Black */ +#define RED "\033[31m" /* Red */ +#define GREEN "\033[32m" /* Green */ +#define YELLOW "\033[33m" /* Yellow */ +#define BLUE "\033[34m" /* Blue */ +#define MAGENTA "\033[35m" /* Magenta */ +#define CYAN "\033[36m" /* Cyan */ +#define WHITE "\033[37m" /* White */ +#define BOLDBLACK "\033[1m\033[30m" /* Bold Black */ +#define BOLDRED "\033[1m\033[31m" /* Bold Red */ +#define BOLDGREEN "\033[1m\033[32m" /* Bold Green */ +#define BOLDYELLOW "\033[1m\033[33m" /* Bold Yellow */ +#define BOLDBLUE "\033[1m\033[34m" /* Bold Blue */ +#define BOLDMAGENTA "\033[1m\033[35m" /* Bold Magenta */ +#define BOLDCYAN "\033[1m\033[36m" /* Bold Cyan */ +#define BOLDWHITE "\033[1m\033[37m" /* Bold White */ +#endif + +/** + * @class LogStreamEndLine + * @brief The LogStreamEndLine class implements an end line marker for a log + * stream + */ +class LogStreamEndLine +{ +}; + +static constexpr LogStreamEndLine endl; + +/** + * @class LogStream + * @brief The LogStream class implements a stream for sample logging + */ +class LogStream +{ + std::string _prefix; + std::ostream * _log_stream; + bool _new_line; + int _color_id; + +public: + /** + * @brief A constructor. Creates an LogStream object + * @param prefix The prefix to print + */ + LogStream(const std::string & prefix, std::ostream & log_stream, + const int color_id = -1) + : _prefix(prefix), _new_line(true), _color_id(color_id) + { + _log_stream = &log_stream; + } + + /** + * @brief A stream output operator to be used within the logger + * @param arg Object for serialization in the logger message + */ + template + LogStream & operator<<(const T & arg) + { + if (_new_line) { + setLineColor(); + (*_log_stream) << "[ " << _prefix << " ] "; + _new_line = false; + } + + (*_log_stream) << arg; + return *this; + } + + // Specializing for LogStreamEndLine to support slog::endl + LogStream & operator<<(const LogStreamEndLine & arg) + { + _new_line = true; + resetLineColor(); + (*_log_stream) << std::endl; + return *this; + } + + void setLineColor() + { + switch(_color_id){ + case BLUE: + (*_log_stream) << "\033[34m"; + break; + case GREEN: + (*_log_stream) << "\033[32m"; + break; + case YELLOW: + (*_log_stream) << "\033[33m"; + break; + case RED: + (*_log_stream) << "\033[31m"; + break; + default: + break; + } + } + + void resetLineColor() + { + if(_color_id > 0){ + (*_log_stream) << "\033[0m"; //RESET + } + } +}; + +class NullStream +{ +public: + NullStream(){} + + NullStream(const std::string & prefix, std::ostream & log_stream) + { + (void)prefix; + (void)log_stream; + } + + template + NullStream & operator<<(const T & arg) + { + return *this; + } +}; + +#ifdef LOG_LEVEL_DEBUG + static LogStream debug("DEBUG", std::cout, GREEN); +#else + static NullStream debug; +#endif +static LogStream info("INFO", std::cout, BLUE); +static LogStream warn("WARNING", std::cout, YELLOW); +static LogStream err("ERROR", std::cerr, RED); + +} // namespace slog +#endif // OPENVINO_WRAPPER_LIB__SLOG_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/utils/mutex_counter.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/utils/mutex_counter.hpp similarity index 87% rename from dynamic_vino_lib/include/dynamic_vino_lib/utils/mutex_counter.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/utils/mutex_counter.hpp index bf1bc718..f0da93a3 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/utils/mutex_counter.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/utils/mutex_counter.hpp @@ -17,8 +17,8 @@ // @file mutex_counter.hpp // -#ifndef DYNAMIC_VINO_LIB__UTILS__MUTEX_COUNTER_HPP_ -#define DYNAMIC_VINO_LIB__UTILS__MUTEX_COUNTER_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__UTILS__MUTEX_COUNTER_HPP_ +#define OPENVINO_WRAPPER_LIB__UTILS__MUTEX_COUNTER_HPP_ #include @@ -54,4 +54,4 @@ class MutexCounter std::condition_variable cv_; }; -#endif // DYNAMIC_VINO_LIB__UTILS__MUTEX_COUNTER_HPP_ +#endif // OPENVINO_WRAPPER_LIB__UTILS__MUTEX_COUNTER_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/utils/version_info.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/utils/version_info.hpp similarity index 94% rename from dynamic_vino_lib/include/dynamic_vino_lib/utils/version_info.hpp rename to openvino_wrapper_lib/include/openvino_wrapper_lib/utils/version_info.hpp index 88a31e9e..fa3f32e1 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/utils/version_info.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/utils/version_info.hpp @@ -17,8 +17,8 @@ // @file version_info.hpp // -#ifndef DYNAMIC_VINO_LIB__UTILS__VERSION_INFO_HPP_ -#define DYNAMIC_VINO_LIB__UTILS__VERSION_INFO_HPP_ +#ifndef OPENVINO_WRAPPER_LIB__UTILS__VERSION_INFO_HPP_ +#define OPENVINO_WRAPPER_LIB__UTILS__VERSION_INFO_HPP_ #if(defined(USE_OLD_E_PLUGIN_API)) #include @@ -122,4 +122,4 @@ inline void printPluginVersion(InferenceEngine::InferenceEnginePluginPtr ptr, st } #endif // (defined(USE_OLD_E_PLUGIN_API)) -#endif // DYNAMIC_VINO_LIB__UTILS__VERSION_INFO_HPP_ +#endif // OPENVINO_WRAPPER_LIB__UTILS__VERSION_INFO_HPP_ diff --git a/dynamic_vino_lib/package.xml b/openvino_wrapper_lib/package.xml similarity index 88% rename from dynamic_vino_lib/package.xml rename to openvino_wrapper_lib/package.xml index b975b4e8..e1e4fbf3 100644 --- a/dynamic_vino_lib/package.xml +++ b/openvino_wrapper_lib/package.xml @@ -14,7 +14,7 @@ limitations under the License. --> - dynamic_vino_lib + openvino_wrapper_lib 0.9.0 a ROS2 wrapper package for Intel OpenVINO Weizhi Liu @@ -37,9 +37,9 @@ limitations under the License. class_loader cv_bridge object_msgs - people_msgs - pipeline_srv_msgs - vino_param_lib + openvino_people_msgs + openvino_msgs + openvino_param_lib realsense2 openvino_common @@ -54,9 +54,9 @@ limitations under the License. class_loader cv_bridge object_msgs - people_msgs - pipeline_srv_msgs - vino_param_lib + openvino_people_msgs + openvino_msgs + openvino_param_lib realsense2 ament_lint_auto diff --git a/dynamic_vino_lib/src/engines/engine.cpp b/openvino_wrapper_lib/src/engines/engine.cpp similarity index 91% rename from dynamic_vino_lib/src/engines/engine.cpp rename to openvino_wrapper_lib/src/engines/engine.cpp index 6f22b406..ab8704d4 100644 --- a/dynamic_vino_lib/src/engines/engine.cpp +++ b/openvino_wrapper_lib/src/engines/engine.cpp @@ -16,8 +16,8 @@ * @brief a header file with definition of Engine class * @file engine.cpp */ -#include "dynamic_vino_lib/engines/engine.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/engines/engine.hpp" +#include "openvino_wrapper_lib/slog.hpp" #if(defined(USE_OLD_E_PLUGIN_API)) Engines::Engine::Engine( diff --git a/dynamic_vino_lib/src/engines/engine_manager.cpp b/openvino_wrapper_lib/src/engines/engine_manager.cpp similarity index 93% rename from dynamic_vino_lib/src/engines/engine_manager.cpp rename to openvino_wrapper_lib/src/engines/engine_manager.cpp index 11c25cce..f3906838 100644 --- a/dynamic_vino_lib/src/engines/engine_manager.cpp +++ b/openvino_wrapper_lib/src/engines/engine_manager.cpp @@ -16,12 +16,12 @@ * @brief a header file with definition of Engine class * @file engine.cpp */ -#include "dynamic_vino_lib/engines/engine_manager.hpp" -#include "dynamic_vino_lib/engines/engine.hpp" -#include "dynamic_vino_lib/slog.hpp" -#include "dynamic_vino_lib/models/base_model.hpp" -#include "dynamic_vino_lib/utils/version_info.hpp" -#include +#include "openvino_wrapper_lib/engines/engine_manager.hpp" +#include "openvino_wrapper_lib/engines/engine.hpp" +#include "openvino_wrapper_lib/slog.hpp" +#include "openvino_wrapper_lib/models/base_model.hpp" +#include "openvino_wrapper_lib/utils/version_info.hpp" +#include #include #if(defined(USE_OLD_E_PLUGIN_API)) #include diff --git a/dynamic_vino_lib/src/inferences/age_gender_detection.cpp b/openvino_wrapper_lib/src/inferences/age_gender_detection.cpp similarity index 66% rename from dynamic_vino_lib/src/inferences/age_gender_detection.cpp rename to openvino_wrapper_lib/src/inferences/age_gender_detection.cpp index 41d3be08..59138e3a 100644 --- a/dynamic_vino_lib/src/inferences/age_gender_detection.cpp +++ b/openvino_wrapper_lib/src/inferences/age_gender_detection.cpp @@ -21,38 +21,38 @@ #include #include #include -#include "dynamic_vino_lib/inferences/age_gender_detection.hpp" -#include "dynamic_vino_lib/outputs/base_output.hpp" +#include "openvino_wrapper_lib/inferences/age_gender_detection.hpp" +#include "openvino_wrapper_lib/outputs/base_output.hpp" // AgeGenderResult -dynamic_vino_lib::AgeGenderResult::AgeGenderResult(const cv::Rect & location) +openvino_wrapper_lib::AgeGenderResult::AgeGenderResult(const cv::Rect & location) : Result(location) { } // AgeGender Detection -dynamic_vino_lib::AgeGenderDetection::AgeGenderDetection() -: dynamic_vino_lib::BaseInference() +openvino_wrapper_lib::AgeGenderDetection::AgeGenderDetection() +: openvino_wrapper_lib::BaseInference() { } -dynamic_vino_lib::AgeGenderDetection::~AgeGenderDetection() = default; +openvino_wrapper_lib::AgeGenderDetection::~AgeGenderDetection() = default; -void dynamic_vino_lib::AgeGenderDetection::loadNetwork( +void openvino_wrapper_lib::AgeGenderDetection::loadNetwork( std::shared_ptr network) { valid_model_ = network; setMaxBatchSize(network->getMaxBatchSize()); } -bool dynamic_vino_lib::AgeGenderDetection::enqueue( +bool openvino_wrapper_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 = openvino_wrapper_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 openvino_wrapper_lib::AgeGenderDetection::submitRequest() { - return dynamic_vino_lib::BaseInference::submitRequest(); + return openvino_wrapper_lib::BaseInference::submitRequest(); } -bool dynamic_vino_lib::AgeGenderDetection::fetchResults() +bool openvino_wrapper_lib::AgeGenderDetection::fetchResults() { - bool can_fetch = dynamic_vino_lib::BaseInference::fetchResults(); + bool can_fetch = openvino_wrapper_lib::BaseInference::fetchResults(); if (!can_fetch) { return false; } @@ -84,23 +84,23 @@ bool dynamic_vino_lib::AgeGenderDetection::fetchResults() return true; } -int dynamic_vino_lib::AgeGenderDetection::getResultsLength() const +int openvino_wrapper_lib::AgeGenderDetection::getResultsLength() const { return static_cast(results_.size()); } -const dynamic_vino_lib::Result * -dynamic_vino_lib::AgeGenderDetection::getLocationResult(int idx) const +const openvino_wrapper_lib::Result * +openvino_wrapper_lib::AgeGenderDetection::getLocationResult(int idx) const { return &(results_[idx]); } -const std::string dynamic_vino_lib::AgeGenderDetection::getName() const +const std::string openvino_wrapper_lib::AgeGenderDetection::getName() const { return valid_model_->getModelCategory(); } -void dynamic_vino_lib::AgeGenderDetection::observeOutput( +void openvino_wrapper_lib::AgeGenderDetection::observeOutput( const std::shared_ptr & output) { if (output != nullptr) { @@ -108,7 +108,7 @@ void dynamic_vino_lib::AgeGenderDetection::observeOutput( } } -const std::vector dynamic_vino_lib::AgeGenderDetection::getFilteredROIs( +const std::vector openvino_wrapper_lib::AgeGenderDetection::getFilteredROIs( const std::string filter_conditions) const { if (!filter_conditions.empty()) { diff --git a/dynamic_vino_lib/src/inferences/base_filter.cpp b/openvino_wrapper_lib/src/inferences/base_filter.cpp similarity index 83% rename from dynamic_vino_lib/src/inferences/base_filter.cpp rename to openvino_wrapper_lib/src/inferences/base_filter.cpp index 6a3bb1f3..5b4d381a 100644 --- a/dynamic_vino_lib/src/inferences/base_filter.cpp +++ b/openvino_wrapper_lib/src/inferences/base_filter.cpp @@ -17,20 +17,20 @@ * @file base_filter.cpp */ -#include "dynamic_vino_lib/inferences/base_filter.hpp" +#include "openvino_wrapper_lib/inferences/base_filter.hpp" #include #include #include -dynamic_vino_lib::BaseFilter::BaseFilter() {} +openvino_wrapper_lib::BaseFilter::BaseFilter() {} -bool dynamic_vino_lib::BaseFilter::isValidFilterConditions( +bool openvino_wrapper_lib::BaseFilter::isValidFilterConditions( const std::string & filter_conditions) { return strip(filter_conditions) != ""; } -void dynamic_vino_lib::BaseFilter::acceptFilterConditions( +void openvino_wrapper_lib::BaseFilter::acceptFilterConditions( const std::string & filter_conditions) { striped_conditions_ = strip(filter_conditions); @@ -38,7 +38,7 @@ void dynamic_vino_lib::BaseFilter::acceptFilterConditions( infixToSuffix(infix_conditions); } -bool dynamic_vino_lib::BaseFilter::isRelationOperator(const std::string & str) +bool openvino_wrapper_lib::BaseFilter::isRelationOperator(const std::string & str) { if (std::find(relation_operators_.begin(), relation_operators_.end(), str) != relation_operators_.end()) @@ -48,7 +48,7 @@ bool dynamic_vino_lib::BaseFilter::isRelationOperator(const std::string & str) return false; } -bool dynamic_vino_lib::BaseFilter::isLogicOperator(const std::string & str) +bool openvino_wrapper_lib::BaseFilter::isLogicOperator(const std::string & str) { if (std::find(logic_operators_.begin(), logic_operators_.end(), str) != logic_operators_.end()) @@ -58,7 +58,7 @@ bool dynamic_vino_lib::BaseFilter::isLogicOperator(const std::string & str) return false; } -bool dynamic_vino_lib::BaseFilter::isPriorTo( +bool openvino_wrapper_lib::BaseFilter::isPriorTo( const std::string & operator1, const std::string & operator2) { if (isRelationOperator(operator1) && isLogicOperator(operator2)) { @@ -67,13 +67,13 @@ bool dynamic_vino_lib::BaseFilter::isPriorTo( return false; } -std::string dynamic_vino_lib::BaseFilter::boolToStr(bool value) +std::string openvino_wrapper_lib::BaseFilter::boolToStr(bool value) { if (value) {return "true";} return "false"; } -bool dynamic_vino_lib::BaseFilter::strToBool(const std::string & value) +bool openvino_wrapper_lib::BaseFilter::strToBool(const std::string & value) { if (!value.compare("true")) {return true;} else if (!value.compare("false")) { return false; @@ -84,12 +84,12 @@ bool dynamic_vino_lib::BaseFilter::strToBool(const std::string & value) } const std::vector & -dynamic_vino_lib::BaseFilter::getSuffixConditions() const +openvino_wrapper_lib::BaseFilter::getSuffixConditions() const { return suffix_conditons_; } -bool dynamic_vino_lib::BaseFilter::logicOperation( +bool openvino_wrapper_lib::BaseFilter::logicOperation( const std::string & logic1, const std::string & op, const std::string & logic2) { if (!op.compare("&&")) { @@ -102,7 +102,7 @@ bool dynamic_vino_lib::BaseFilter::logicOperation( } } -bool dynamic_vino_lib::BaseFilter::stringCompare( +bool openvino_wrapper_lib::BaseFilter::stringCompare( const std::string & candidate, const std::string & op, const std::string & target) { if (!op.compare("==")) { @@ -115,7 +115,7 @@ bool dynamic_vino_lib::BaseFilter::stringCompare( } } -bool dynamic_vino_lib::BaseFilter::floatCompare( +bool openvino_wrapper_lib::BaseFilter::floatCompare( float candidate, const std::string & op, float target) { if (!op.compare("<=")) { @@ -132,7 +132,7 @@ bool dynamic_vino_lib::BaseFilter::floatCompare( } } -float dynamic_vino_lib::BaseFilter::stringToFloat(const std::string & candidate) +float openvino_wrapper_lib::BaseFilter::stringToFloat(const std::string & candidate) { float result = 0; try { @@ -143,7 +143,7 @@ float dynamic_vino_lib::BaseFilter::stringToFloat(const std::string & candidate) return result; } -std::vector dynamic_vino_lib::BaseFilter::split( +std::vector openvino_wrapper_lib::BaseFilter::split( const std::string & filter_conditions) { std::vector seperators; @@ -174,7 +174,7 @@ std::vector dynamic_vino_lib::BaseFilter::split( return infix_conditions; } -void dynamic_vino_lib::BaseFilter::infixToSuffix( +void openvino_wrapper_lib::BaseFilter::infixToSuffix( std::vector & infix_conditions) { std::stack operator_stack; @@ -206,7 +206,7 @@ void dynamic_vino_lib::BaseFilter::infixToSuffix( } } -std::string dynamic_vino_lib::BaseFilter::strip(const std::string & str) +std::string openvino_wrapper_lib::BaseFilter::strip(const std::string & str) { std::string stripped_string = ""; for (auto character : str) { diff --git a/dynamic_vino_lib/src/inferences/base_inference.cpp b/openvino_wrapper_lib/src/inferences/base_inference.cpp similarity index 69% rename from dynamic_vino_lib/src/inferences/base_inference.cpp rename to openvino_wrapper_lib/src/inferences/base_inference.cpp index f0b6cc49..52138e5c 100644 --- a/dynamic_vino_lib/src/inferences/base_inference.cpp +++ b/openvino_wrapper_lib/src/inferences/base_inference.cpp @@ -19,26 +19,26 @@ #include -#include "dynamic_vino_lib/inferences/base_inference.hpp" -#include "dynamic_vino_lib/models/base_model.hpp" +#include "openvino_wrapper_lib/inferences/base_inference.hpp" +#include "openvino_wrapper_lib/models/base_model.hpp" // Result -dynamic_vino_lib::Result::Result(const cv::Rect & location) +openvino_wrapper_lib::Result::Result(const cv::Rect & location) { location_ = location; } // BaseInference -dynamic_vino_lib::BaseInference::BaseInference() = default; +openvino_wrapper_lib::BaseInference::BaseInference() = default; -dynamic_vino_lib::BaseInference::~BaseInference() = default; +openvino_wrapper_lib::BaseInference::~BaseInference() = default; -void dynamic_vino_lib::BaseInference::loadEngine(const std::shared_ptr engine) +void openvino_wrapper_lib::BaseInference::loadEngine(const std::shared_ptr engine) { engine_ = engine; } -bool dynamic_vino_lib::BaseInference::submitRequest() +bool openvino_wrapper_lib::BaseInference::submitRequest() { if (!engine_->getRequest()) { return false; @@ -53,7 +53,7 @@ bool dynamic_vino_lib::BaseInference::submitRequest() return true; } -bool dynamic_vino_lib::BaseInference::SynchronousRequest() +bool openvino_wrapper_lib::BaseInference::SynchronousRequest() { if (!engine_->getRequest()) { return false; @@ -67,7 +67,7 @@ bool dynamic_vino_lib::BaseInference::SynchronousRequest() return true; } -bool dynamic_vino_lib::BaseInference::fetchResults() +bool openvino_wrapper_lib::BaseInference::fetchResults() { if (results_fetched_) { return false; @@ -76,7 +76,7 @@ bool dynamic_vino_lib::BaseInference::fetchResults() return true; } -void dynamic_vino_lib::BaseInference::addCandidatedModel(std::shared_ptr model) +void openvino_wrapper_lib::BaseInference::addCandidatedModel(std::shared_ptr model) { slog::info << "TESTING in addCandidatedModel()" << slog::endl; if (model != nullptr) { diff --git a/dynamic_vino_lib/src/inferences/base_reidentification.cpp b/openvino_wrapper_lib/src/inferences/base_reidentification.cpp similarity index 87% rename from dynamic_vino_lib/src/inferences/base_reidentification.cpp rename to openvino_wrapper_lib/src/inferences/base_reidentification.cpp index 6ef8429f..559565cc 100644 --- a/dynamic_vino_lib/src/inferences/base_reidentification.cpp +++ b/openvino_wrapper_lib/src/inferences/base_reidentification.cpp @@ -23,17 +23,17 @@ #include #include #include -#include "dynamic_vino_lib/inferences/base_reidentification.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/inferences/base_reidentification.hpp" +#include "openvino_wrapper_lib/slog.hpp" // Tracker -dynamic_vino_lib::Tracker::Tracker( +openvino_wrapper_lib::Tracker::Tracker( int max_record_size, double same_track_thresh, double new_track_thresh) : max_record_size_(max_record_size), same_track_thresh_(same_track_thresh), new_track_thresh_(new_track_thresh) {} -int dynamic_vino_lib::Tracker::processNewTrack(const std::vector & feature) +int openvino_wrapper_lib::Tracker::processNewTrack(const std::vector & feature) { int most_similar_id; double similarity = findMostSimilarTrack(feature, most_similar_id); @@ -45,7 +45,7 @@ int dynamic_vino_lib::Tracker::processNewTrack(const std::vector & featur return most_similar_id; } -double dynamic_vino_lib::Tracker::findMostSimilarTrack( +double openvino_wrapper_lib::Tracker::findMostSimilarTrack( const std::vector & feature, int & most_similar_id) { double max_similarity = 0; @@ -60,7 +60,7 @@ double dynamic_vino_lib::Tracker::findMostSimilarTrack( return max_similarity; } -double dynamic_vino_lib::Tracker::calcSimilarity( +double openvino_wrapper_lib::Tracker::calcSimilarity( const std::vector & feature_a, const std::vector & feature_b) { if (feature_a.size() != feature_b.size()) { @@ -84,7 +84,7 @@ double dynamic_vino_lib::Tracker::calcSimilarity( return mul_sum / (sqrt(denom_a) * sqrt(denom_b)); } -void dynamic_vino_lib::Tracker::updateMatchTrack( +void openvino_wrapper_lib::Tracker::updateMatchTrack( int track_id, const std::vector & feature) { if (recorded_tracks_.find(track_id) != recorded_tracks_.end()) { @@ -95,7 +95,7 @@ void dynamic_vino_lib::Tracker::updateMatchTrack( } } -void dynamic_vino_lib::Tracker::removeEarlestTrack() +void openvino_wrapper_lib::Tracker::removeEarlestTrack() { std::lock_guard lk(tracks_mtx_); int64_t earlest_time = LONG_MAX; @@ -110,7 +110,7 @@ void dynamic_vino_lib::Tracker::removeEarlestTrack() } -int dynamic_vino_lib::Tracker::addNewTrack(const std::vector & feature) +int openvino_wrapper_lib::Tracker::addNewTrack(const std::vector & feature) { if (recorded_tracks_.size() >= max_record_size_) { std::thread remove_thread(std::bind(&Tracker::removeEarlestTrack, this)); @@ -125,14 +125,14 @@ int dynamic_vino_lib::Tracker::addNewTrack(const std::vector & feature) return max_track_id_; } -int64_t dynamic_vino_lib::Tracker::getCurrentTime() +int64_t openvino_wrapper_lib::Tracker::getCurrentTime() { auto tp = std::chrono::time_point_cast( std::chrono::system_clock::now()); return static_cast(tp.time_since_epoch().count()); } -bool dynamic_vino_lib::Tracker::saveTracksToFile(std::string filepath) +bool openvino_wrapper_lib::Tracker::saveTracksToFile(std::string filepath) { std::ofstream outfile(filepath); if (!outfile.is_open()) { @@ -152,7 +152,7 @@ bool dynamic_vino_lib::Tracker::saveTracksToFile(std::string filepath) return true; } -bool dynamic_vino_lib::Tracker::loadTracksFromFile(std::string filepath) +bool openvino_wrapper_lib::Tracker::loadTracksFromFile(std::string filepath) { std::ifstream infile(filepath); if (!infile.is_open()) { diff --git a/dynamic_vino_lib/src/inferences/emotions_detection.cpp b/openvino_wrapper_lib/src/inferences/emotions_detection.cpp similarity index 74% rename from dynamic_vino_lib/src/inferences/emotions_detection.cpp rename to openvino_wrapper_lib/src/inferences/emotions_detection.cpp index 17d7785b..e239c228 100644 --- a/dynamic_vino_lib/src/inferences/emotions_detection.cpp +++ b/openvino_wrapper_lib/src/inferences/emotions_detection.cpp @@ -22,39 +22,39 @@ #include #include #include -#include "dynamic_vino_lib/inferences/emotions_detection.hpp" -#include "dynamic_vino_lib/outputs/base_output.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/inferences/emotions_detection.hpp" +#include "openvino_wrapper_lib/outputs/base_output.hpp" +#include "openvino_wrapper_lib/slog.hpp" // EmotionsResult -dynamic_vino_lib::EmotionsResult::EmotionsResult(const cv::Rect & location) +openvino_wrapper_lib::EmotionsResult::EmotionsResult(const cv::Rect & location) : Result(location) { } // Emotions Detection -dynamic_vino_lib::EmotionsDetection::EmotionsDetection() -: dynamic_vino_lib::BaseInference() +openvino_wrapper_lib::EmotionsDetection::EmotionsDetection() +: openvino_wrapper_lib::BaseInference() { } -dynamic_vino_lib::EmotionsDetection::~EmotionsDetection() = default; +openvino_wrapper_lib::EmotionsDetection::~EmotionsDetection() = default; -void dynamic_vino_lib::EmotionsDetection::loadNetwork( +void openvino_wrapper_lib::EmotionsDetection::loadNetwork( const std::shared_ptr network) { valid_model_ = network; setMaxBatchSize(network->getMaxBatchSize()); } -bool dynamic_vino_lib::EmotionsDetection::enqueue( +bool openvino_wrapper_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 = openvino_wrapper_lib::BaseInference::enqueue( frame, input_frame_loc, 1, getResultsLength(), valid_model_->getInputName()); if (!succeed) { slog::err << "Failed enqueue Emotion frame." << slog::endl; @@ -66,14 +66,14 @@ bool dynamic_vino_lib::EmotionsDetection::enqueue( return true; } -bool dynamic_vino_lib::EmotionsDetection::submitRequest() +bool openvino_wrapper_lib::EmotionsDetection::submitRequest() { - return dynamic_vino_lib::BaseInference::submitRequest(); + return openvino_wrapper_lib::BaseInference::submitRequest(); } -bool dynamic_vino_lib::EmotionsDetection::fetchResults() +bool openvino_wrapper_lib::EmotionsDetection::fetchResults() { - bool can_fetch = dynamic_vino_lib::BaseInference::fetchResults(); + bool can_fetch = openvino_wrapper_lib::BaseInference::fetchResults(); if (!can_fetch) { return false; } @@ -108,23 +108,23 @@ bool dynamic_vino_lib::EmotionsDetection::fetchResults() return true; } -int dynamic_vino_lib::EmotionsDetection::getResultsLength() const +int openvino_wrapper_lib::EmotionsDetection::getResultsLength() const { return static_cast(results_.size()); } -const dynamic_vino_lib::Result * -dynamic_vino_lib::EmotionsDetection::getLocationResult(int idx) const +const openvino_wrapper_lib::Result * +openvino_wrapper_lib::EmotionsDetection::getLocationResult(int idx) const { return &(results_[idx]); } -const std::string dynamic_vino_lib::EmotionsDetection::getName() const +const std::string openvino_wrapper_lib::EmotionsDetection::getName() const { return valid_model_->getModelCategory(); } -void dynamic_vino_lib::EmotionsDetection::observeOutput( +void openvino_wrapper_lib::EmotionsDetection::observeOutput( const std::shared_ptr & output) { if (output != nullptr) { @@ -132,7 +132,7 @@ void dynamic_vino_lib::EmotionsDetection::observeOutput( } } -const std::vector dynamic_vino_lib::EmotionsDetection::getFilteredROIs( +const std::vector openvino_wrapper_lib::EmotionsDetection::getFilteredROIs( const std::string filter_conditions) const { if (!filter_conditions.empty()) { diff --git a/dynamic_vino_lib/src/inferences/face_detection.cpp b/openvino_wrapper_lib/src/inferences/face_detection.cpp similarity index 76% rename from dynamic_vino_lib/src/inferences/face_detection.cpp rename to openvino_wrapper_lib/src/inferences/face_detection.cpp index e9820b68..0037bea3 100644 --- a/dynamic_vino_lib/src/inferences/face_detection.cpp +++ b/openvino_wrapper_lib/src/inferences/face_detection.cpp @@ -22,18 +22,18 @@ #include #include -#include "dynamic_vino_lib/inferences/face_detection.hpp" -#include "dynamic_vino_lib/outputs/base_output.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/inferences/face_detection.hpp" +#include "openvino_wrapper_lib/outputs/base_output.hpp" +#include "openvino_wrapper_lib/slog.hpp" // FaceDetectionResult -dynamic_vino_lib::FaceDetectionResult::FaceDetectionResult(const cv::Rect & location) +openvino_wrapper_lib::FaceDetectionResult::FaceDetectionResult(const cv::Rect & location) : ObjectDetectionResult(location) { } // FaceDetection -dynamic_vino_lib::FaceDetection::FaceDetection( +openvino_wrapper_lib::FaceDetection::FaceDetection( bool enable_roi_constraint, double show_output_thresh) : ObjectDetection(enable_roi_constraint, show_output_thresh) diff --git a/dynamic_vino_lib/src/inferences/face_reidentification.cpp b/openvino_wrapper_lib/src/inferences/face_reidentification.cpp similarity index 66% rename from dynamic_vino_lib/src/inferences/face_reidentification.cpp rename to openvino_wrapper_lib/src/inferences/face_reidentification.cpp index 1dddbfdf..392d4d62 100644 --- a/dynamic_vino_lib/src/inferences/face_reidentification.cpp +++ b/openvino_wrapper_lib/src/inferences/face_reidentification.cpp @@ -20,37 +20,37 @@ #include #include #include -#include "dynamic_vino_lib/inferences/face_reidentification.hpp" -#include "dynamic_vino_lib/outputs/base_output.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/inferences/face_reidentification.hpp" +#include "openvino_wrapper_lib/outputs/base_output.hpp" +#include "openvino_wrapper_lib/slog.hpp" // FaceReidentificationResult -dynamic_vino_lib::FaceReidentificationResult::FaceReidentificationResult( +openvino_wrapper_lib::FaceReidentificationResult::FaceReidentificationResult( const cv::Rect & location) : Result(location) {} // FaceReidentification -dynamic_vino_lib::FaceReidentification::FaceReidentification(double match_thresh) -: dynamic_vino_lib::BaseInference() +openvino_wrapper_lib::FaceReidentification::FaceReidentification(double match_thresh) +: openvino_wrapper_lib::BaseInference() { - face_tracker_ = std::make_shared(1000, match_thresh, 0.3); + face_tracker_ = std::make_shared(1000, match_thresh, 0.3); } -dynamic_vino_lib::FaceReidentification::~FaceReidentification() = default; -void dynamic_vino_lib::FaceReidentification::loadNetwork( +openvino_wrapper_lib::FaceReidentification::~FaceReidentification() = default; +void openvino_wrapper_lib::FaceReidentification::loadNetwork( const std::shared_ptr network) { valid_model_ = network; setMaxBatchSize(network->getMaxBatchSize()); } -bool dynamic_vino_lib::FaceReidentification::enqueue( +bool openvino_wrapper_lib::FaceReidentification::enqueue( const cv::Mat & frame, const cv::Rect & input_frame_loc) { if (getEnqueuedNum() == 0) { results_.clear(); } - if (!dynamic_vino_lib::BaseInference::enqueue( + if (!openvino_wrapper_lib::BaseInference::enqueue( frame, input_frame_loc, 1, 0, valid_model_->getInputName())) { return false; @@ -60,14 +60,14 @@ bool dynamic_vino_lib::FaceReidentification::enqueue( return true; } -bool dynamic_vino_lib::FaceReidentification::submitRequest() +bool openvino_wrapper_lib::FaceReidentification::submitRequest() { - return dynamic_vino_lib::BaseInference::submitRequest(); + return openvino_wrapper_lib::BaseInference::submitRequest(); } -bool dynamic_vino_lib::FaceReidentification::fetchResults() +bool openvino_wrapper_lib::FaceReidentification::fetchResults() { - bool can_fetch = dynamic_vino_lib::BaseInference::fetchResults(); + bool can_fetch = openvino_wrapper_lib::BaseInference::fetchResults(); if (!can_fetch) {return false;} bool found_result = false; InferenceEngine::InferRequest::Ptr request = getEngine()->getRequest(); @@ -85,23 +85,23 @@ bool dynamic_vino_lib::FaceReidentification::fetchResults() return true; } -int dynamic_vino_lib::FaceReidentification::getResultsLength() const +int openvino_wrapper_lib::FaceReidentification::getResultsLength() const { return static_cast(results_.size()); } -const dynamic_vino_lib::Result * -dynamic_vino_lib::FaceReidentification::getLocationResult(int idx) const +const openvino_wrapper_lib::Result * +openvino_wrapper_lib::FaceReidentification::getLocationResult(int idx) const { return &(results_[idx]); } -const std::string dynamic_vino_lib::FaceReidentification::getName() const +const std::string openvino_wrapper_lib::FaceReidentification::getName() const { return valid_model_->getModelCategory(); } -void dynamic_vino_lib::FaceReidentification::observeOutput( +void openvino_wrapper_lib::FaceReidentification::observeOutput( const std::shared_ptr & output) { if (output != nullptr) { @@ -109,7 +109,7 @@ void dynamic_vino_lib::FaceReidentification::observeOutput( } } -const std::vector dynamic_vino_lib::FaceReidentification::getFilteredROIs( +const std::vector openvino_wrapper_lib::FaceReidentification::getFilteredROIs( const std::string filter_conditions) const { if (!filter_conditions.empty()) { diff --git a/dynamic_vino_lib/src/inferences/head_pose_detection.cpp b/openvino_wrapper_lib/src/inferences/head_pose_detection.cpp similarity index 67% rename from dynamic_vino_lib/src/inferences/head_pose_detection.cpp rename to openvino_wrapper_lib/src/inferences/head_pose_detection.cpp index a5b4fa36..591c6fdd 100644 --- a/dynamic_vino_lib/src/inferences/head_pose_detection.cpp +++ b/openvino_wrapper_lib/src/inferences/head_pose_detection.cpp @@ -21,38 +21,38 @@ #include #include #include -#include "dynamic_vino_lib/inferences/head_pose_detection.hpp" -#include "dynamic_vino_lib/outputs/base_output.hpp" +#include "openvino_wrapper_lib/inferences/head_pose_detection.hpp" +#include "openvino_wrapper_lib/outputs/base_output.hpp" // HeadPoseResult -dynamic_vino_lib::HeadPoseResult::HeadPoseResult(const cv::Rect & location) +openvino_wrapper_lib::HeadPoseResult::HeadPoseResult(const cv::Rect & location) : Result(location) { } // Head Pose Detection -dynamic_vino_lib::HeadPoseDetection::HeadPoseDetection() -: dynamic_vino_lib::BaseInference() +openvino_wrapper_lib::HeadPoseDetection::HeadPoseDetection() +: openvino_wrapper_lib::BaseInference() { } -dynamic_vino_lib::HeadPoseDetection::~HeadPoseDetection() = default; +openvino_wrapper_lib::HeadPoseDetection::~HeadPoseDetection() = default; -void dynamic_vino_lib::HeadPoseDetection::loadNetwork( +void openvino_wrapper_lib::HeadPoseDetection::loadNetwork( std::shared_ptr network) { valid_model_ = network; setMaxBatchSize(network->getMaxBatchSize()); } -bool dynamic_vino_lib::HeadPoseDetection::enqueue( +bool openvino_wrapper_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 = openvino_wrapper_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 openvino_wrapper_lib::HeadPoseDetection::submitRequest() { - return dynamic_vino_lib::BaseInference::submitRequest(); + return openvino_wrapper_lib::BaseInference::submitRequest(); } -bool dynamic_vino_lib::HeadPoseDetection::fetchResults() +bool openvino_wrapper_lib::HeadPoseDetection::fetchResults() { - bool can_fetch = dynamic_vino_lib::BaseInference::fetchResults(); + bool can_fetch = openvino_wrapper_lib::BaseInference::fetchResults(); if (!can_fetch) { return false; } @@ -86,23 +86,23 @@ bool dynamic_vino_lib::HeadPoseDetection::fetchResults() return true; } -int dynamic_vino_lib::HeadPoseDetection::getResultsLength() const +int openvino_wrapper_lib::HeadPoseDetection::getResultsLength() const { return static_cast(results_.size()); } -const dynamic_vino_lib::Result * -dynamic_vino_lib::HeadPoseDetection::getLocationResult(int idx) const +const openvino_wrapper_lib::Result * +openvino_wrapper_lib::HeadPoseDetection::getLocationResult(int idx) const { return &(results_[idx]); } -const std::string dynamic_vino_lib::HeadPoseDetection::getName() const +const std::string openvino_wrapper_lib::HeadPoseDetection::getName() const { return valid_model_->getModelCategory(); } -void dynamic_vino_lib::HeadPoseDetection::observeOutput( +void openvino_wrapper_lib::HeadPoseDetection::observeOutput( const std::shared_ptr & output) { if (output != nullptr) { @@ -110,7 +110,7 @@ void dynamic_vino_lib::HeadPoseDetection::observeOutput( } } -const std::vector dynamic_vino_lib::HeadPoseDetection::getFilteredROIs( +const std::vector openvino_wrapper_lib::HeadPoseDetection::getFilteredROIs( const std::string filter_conditions) const { if (!filter_conditions.empty()) { diff --git a/dynamic_vino_lib/src/inferences/landmarks_detection.cpp b/openvino_wrapper_lib/src/inferences/landmarks_detection.cpp similarity index 70% rename from dynamic_vino_lib/src/inferences/landmarks_detection.cpp rename to openvino_wrapper_lib/src/inferences/landmarks_detection.cpp index 505c85d8..f3e468c8 100644 --- a/dynamic_vino_lib/src/inferences/landmarks_detection.cpp +++ b/openvino_wrapper_lib/src/inferences/landmarks_detection.cpp @@ -20,34 +20,34 @@ #include #include #include -#include "dynamic_vino_lib/inferences/landmarks_detection.hpp" -#include "dynamic_vino_lib/outputs/base_output.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/inferences/landmarks_detection.hpp" +#include "openvino_wrapper_lib/outputs/base_output.hpp" +#include "openvino_wrapper_lib/slog.hpp" // LandmarksDetectionResult -dynamic_vino_lib::LandmarksDetectionResult::LandmarksDetectionResult( +openvino_wrapper_lib::LandmarksDetectionResult::LandmarksDetectionResult( const cv::Rect & location) : Result(location) {} // LandmarksDetection -dynamic_vino_lib::LandmarksDetection::LandmarksDetection() -: dynamic_vino_lib::BaseInference() {} +openvino_wrapper_lib::LandmarksDetection::LandmarksDetection() +: openvino_wrapper_lib::BaseInference() {} -dynamic_vino_lib::LandmarksDetection::~LandmarksDetection() = default; -void dynamic_vino_lib::LandmarksDetection::loadNetwork( +openvino_wrapper_lib::LandmarksDetection::~LandmarksDetection() = default; +void openvino_wrapper_lib::LandmarksDetection::loadNetwork( const std::shared_ptr network) { valid_model_ = network; setMaxBatchSize(network->getMaxBatchSize()); } -bool dynamic_vino_lib::LandmarksDetection::enqueue( +bool openvino_wrapper_lib::LandmarksDetection::enqueue( const cv::Mat & frame, const cv::Rect & input_frame_loc) { if (getEnqueuedNum() == 0) { results_.clear(); } - if (!dynamic_vino_lib::BaseInference::enqueue( + if (!openvino_wrapper_lib::BaseInference::enqueue( frame, input_frame_loc, 1, 0, valid_model_->getInputName())) { return false; @@ -57,14 +57,14 @@ bool dynamic_vino_lib::LandmarksDetection::enqueue( return true; } -bool dynamic_vino_lib::LandmarksDetection::submitRequest() +bool openvino_wrapper_lib::LandmarksDetection::submitRequest() { - return dynamic_vino_lib::BaseInference::submitRequest(); + return openvino_wrapper_lib::BaseInference::submitRequest(); } -bool dynamic_vino_lib::LandmarksDetection::fetchResults() +bool openvino_wrapper_lib::LandmarksDetection::fetchResults() { - bool can_fetch = dynamic_vino_lib::BaseInference::fetchResults(); + bool can_fetch = openvino_wrapper_lib::BaseInference::fetchResults(); if (!can_fetch) {return false;} bool found_result = false; InferenceEngine::InferRequest::Ptr request = getEngine()->getRequest(); @@ -87,23 +87,23 @@ bool dynamic_vino_lib::LandmarksDetection::fetchResults() return true; } -int dynamic_vino_lib::LandmarksDetection::getResultsLength() const +int openvino_wrapper_lib::LandmarksDetection::getResultsLength() const { return static_cast(results_.size()); } -const dynamic_vino_lib::Result * -dynamic_vino_lib::LandmarksDetection::getLocationResult(int idx) const +const openvino_wrapper_lib::Result * +openvino_wrapper_lib::LandmarksDetection::getLocationResult(int idx) const { return &(results_[idx]); } -const std::string dynamic_vino_lib::LandmarksDetection::getName() const +const std::string openvino_wrapper_lib::LandmarksDetection::getName() const { return valid_model_->getModelCategory(); } -void dynamic_vino_lib::LandmarksDetection::observeOutput( +void openvino_wrapper_lib::LandmarksDetection::observeOutput( const std::shared_ptr & output) { if (output != nullptr) { @@ -111,7 +111,7 @@ void dynamic_vino_lib::LandmarksDetection::observeOutput( } } -const std::vector dynamic_vino_lib::LandmarksDetection::getFilteredROIs( +const std::vector openvino_wrapper_lib::LandmarksDetection::getFilteredROIs( const std::string filter_conditions) const { if (!filter_conditions.empty()) { diff --git a/dynamic_vino_lib/src/inferences/license_plate_detection.cpp b/openvino_wrapper_lib/src/inferences/license_plate_detection.cpp similarity index 69% rename from dynamic_vino_lib/src/inferences/license_plate_detection.cpp rename to openvino_wrapper_lib/src/inferences/license_plate_detection.cpp index ed862a88..aa0f8c1d 100644 --- a/dynamic_vino_lib/src/inferences/license_plate_detection.cpp +++ b/openvino_wrapper_lib/src/inferences/license_plate_detection.cpp @@ -20,28 +20,28 @@ #include #include #include -#include "dynamic_vino_lib/inferences/license_plate_detection.hpp" -#include "dynamic_vino_lib/outputs/base_output.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/inferences/license_plate_detection.hpp" +#include "openvino_wrapper_lib/outputs/base_output.hpp" +#include "openvino_wrapper_lib/slog.hpp" // LicensePlateDetectionResult -dynamic_vino_lib::LicensePlateDetectionResult::LicensePlateDetectionResult( +openvino_wrapper_lib::LicensePlateDetectionResult::LicensePlateDetectionResult( const cv::Rect & location) : Result(location) {} // LicensePlateDetection -dynamic_vino_lib::LicensePlateDetection::LicensePlateDetection() -: dynamic_vino_lib::BaseInference() {} +openvino_wrapper_lib::LicensePlateDetection::LicensePlateDetection() +: openvino_wrapper_lib::BaseInference() {} -dynamic_vino_lib::LicensePlateDetection::~LicensePlateDetection() = default; -void dynamic_vino_lib::LicensePlateDetection::loadNetwork( +openvino_wrapper_lib::LicensePlateDetection::~LicensePlateDetection() = default; +void openvino_wrapper_lib::LicensePlateDetection::loadNetwork( const std::shared_ptr network) { valid_model_ = network; setMaxBatchSize(network->getMaxBatchSize()); } -void dynamic_vino_lib::LicensePlateDetection::fillSeqBlob() +void openvino_wrapper_lib::LicensePlateDetection::fillSeqBlob() { ov::Tensor seq_tensor = getEngine()->getRequest().get_tensor( valid_model_->getSeqInputName()); @@ -52,13 +52,13 @@ void dynamic_vino_lib::LicensePlateDetection::fillSeqBlob() std::fill(tensor_data, tensor_data + max_sequence_size, 1.0f); } -bool dynamic_vino_lib::LicensePlateDetection::enqueue( +bool openvino_wrapper_lib::LicensePlateDetection::enqueue( const cv::Mat & frame, const cv::Rect & input_frame_loc) { if (getEnqueuedNum() == 0) { results_.clear(); } - if (!dynamic_vino_lib::BaseInference::enqueue( + if (!openvino_wrapper_lib::BaseInference::enqueue( frame, input_frame_loc, 1, 0, valid_model_->getInputName())) { return false; @@ -69,14 +69,14 @@ bool dynamic_vino_lib::LicensePlateDetection::enqueue( return true; } -bool dynamic_vino_lib::LicensePlateDetection::submitRequest() +bool openvino_wrapper_lib::LicensePlateDetection::submitRequest() { - return dynamic_vino_lib::BaseInference::submitRequest(); + return openvino_wrapper_lib::BaseInference::submitRequest(); } -bool dynamic_vino_lib::LicensePlateDetection::fetchResults() +bool openvino_wrapper_lib::LicensePlateDetection::fetchResults() { - bool can_fetch = dynamic_vino_lib::BaseInference::fetchResults(); + bool can_fetch = openvino_wrapper_lib::BaseInference::fetchResults(); if (!can_fetch) {return false;} bool found_result = false; ov::InferRequest request = getEngine()->getRequest(); @@ -98,23 +98,23 @@ bool dynamic_vino_lib::LicensePlateDetection::fetchResults() return true; } -int dynamic_vino_lib::LicensePlateDetection::getResultsLength() const +int openvino_wrapper_lib::LicensePlateDetection::getResultsLength() const { return static_cast(results_.size()); } -const dynamic_vino_lib::Result * -dynamic_vino_lib::LicensePlateDetection::getLocationResult(int idx) const +const openvino_wrapper_lib::Result * +openvino_wrapper_lib::LicensePlateDetection::getLocationResult(int idx) const { return &(results_[idx]); } -const std::string dynamic_vino_lib::LicensePlateDetection::getName() const +const std::string openvino_wrapper_lib::LicensePlateDetection::getName() const { return valid_model_->getModelCategory(); } -void dynamic_vino_lib::LicensePlateDetection::observeOutput( +void openvino_wrapper_lib::LicensePlateDetection::observeOutput( const std::shared_ptr & output) { if (output != nullptr) { @@ -122,7 +122,7 @@ void dynamic_vino_lib::LicensePlateDetection::observeOutput( } } -const std::vector dynamic_vino_lib::LicensePlateDetection::getFilteredROIs( +const std::vector openvino_wrapper_lib::LicensePlateDetection::getFilteredROIs( const std::string filter_conditions) const { if (!filter_conditions.empty()) { diff --git a/dynamic_vino_lib/src/inferences/object_detection.cpp b/openvino_wrapper_lib/src/inferences/object_detection.cpp similarity index 68% rename from dynamic_vino_lib/src/inferences/object_detection.cpp rename to openvino_wrapper_lib/src/inferences/object_detection.cpp index 9c0299e9..8470a103 100644 --- a/dynamic_vino_lib/src/inferences/object_detection.cpp +++ b/openvino_wrapper_lib/src/inferences/object_detection.cpp @@ -22,37 +22,37 @@ #include #include #include -#include "dynamic_vino_lib/inferences/object_detection.hpp" -#include "dynamic_vino_lib/outputs/base_output.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/inferences/object_detection.hpp" +#include "openvino_wrapper_lib/outputs/base_output.hpp" +#include "openvino_wrapper_lib/slog.hpp" // ObjectDetectionResult -dynamic_vino_lib::ObjectDetectionResult::ObjectDetectionResult(const cv::Rect & location) +openvino_wrapper_lib::ObjectDetectionResult::ObjectDetectionResult(const cv::Rect & location) : Result(location) { } // ObjectDetection -dynamic_vino_lib::ObjectDetection::ObjectDetection( +openvino_wrapper_lib::ObjectDetection::ObjectDetection( bool enable_roi_constraint, double show_output_thresh) : show_output_thresh_(show_output_thresh), - enable_roi_constraint_(enable_roi_constraint), dynamic_vino_lib::BaseInference() + enable_roi_constraint_(enable_roi_constraint), openvino_wrapper_lib::BaseInference() { result_filter_ = std::make_shared(); result_filter_->init(); } -dynamic_vino_lib::ObjectDetection::~ObjectDetection() = default; +openvino_wrapper_lib::ObjectDetection::~ObjectDetection() = default; -void dynamic_vino_lib::ObjectDetection::loadNetwork( +void openvino_wrapper_lib::ObjectDetection::loadNetwork( std::shared_ptr network) { valid_model_ = network; setMaxBatchSize(network->getMaxBatchSize()); } -bool dynamic_vino_lib::ObjectDetection::enqueue( +bool openvino_wrapper_lib::ObjectDetection::enqueue( const cv::Mat & frame, const cv::Rect & input_frame_loc) { @@ -74,9 +74,9 @@ bool dynamic_vino_lib::ObjectDetection::enqueue( return true; } -bool dynamic_vino_lib::ObjectDetection::fetchResults() +bool openvino_wrapper_lib::ObjectDetection::fetchResults() { - bool can_fetch = dynamic_vino_lib::BaseInference::fetchResults(); + bool can_fetch = openvino_wrapper_lib::BaseInference::fetchResults(); if (!can_fetch) { return false; } @@ -87,23 +87,23 @@ bool dynamic_vino_lib::ObjectDetection::fetchResults() getEngine(), results_, show_output_thresh_, enable_roi_constraint_); } -int dynamic_vino_lib::ObjectDetection::getResultsLength() const +int openvino_wrapper_lib::ObjectDetection::getResultsLength() const { return static_cast(results_.size()); } -const dynamic_vino_lib::ObjectDetection::Result * -dynamic_vino_lib::ObjectDetection::getLocationResult(int idx) const +const openvino_wrapper_lib::ObjectDetection::Result * +openvino_wrapper_lib::ObjectDetection::getLocationResult(int idx) const { return &(results_[idx]); } -const std::string dynamic_vino_lib::ObjectDetection::getName() const +const std::string openvino_wrapper_lib::ObjectDetection::getName() const { return valid_model_->getModelCategory(); } -void dynamic_vino_lib::ObjectDetection::observeOutput( +void openvino_wrapper_lib::ObjectDetection::observeOutput( const std::shared_ptr & output) { if (output != nullptr) { @@ -111,7 +111,7 @@ void dynamic_vino_lib::ObjectDetection::observeOutput( } } -const std::vector dynamic_vino_lib::ObjectDetection::getFilteredROIs( +const std::vector openvino_wrapper_lib::ObjectDetection::getFilteredROIs( const std::string filter_conditions) const { if (!result_filter_->isValidFilterConditions(filter_conditions)) { @@ -128,22 +128,22 @@ const std::vector dynamic_vino_lib::ObjectDetection::getFilteredROIs( // ObjectDetectionResultFilter -dynamic_vino_lib::ObjectDetectionResultFilter::ObjectDetectionResultFilter() {} +openvino_wrapper_lib::ObjectDetectionResultFilter::ObjectDetectionResultFilter() {} -void dynamic_vino_lib::ObjectDetectionResultFilter::init() +void openvino_wrapper_lib::ObjectDetectionResultFilter::init() { key_to_function_.insert(std::make_pair("label", isValidLabel)); key_to_function_.insert(std::make_pair("confidence", isValidConfidence)); } -void dynamic_vino_lib::ObjectDetectionResultFilter::acceptResults( +void openvino_wrapper_lib::ObjectDetectionResultFilter::acceptResults( const std::vector & results) { results_ = results; } std::vector -dynamic_vino_lib::ObjectDetectionResultFilter::getFilteredLocations() +openvino_wrapper_lib::ObjectDetectionResultFilter::getFilteredLocations() { std::vector locations; for (auto result : results_) { @@ -154,25 +154,25 @@ dynamic_vino_lib::ObjectDetectionResultFilter::getFilteredLocations() return locations; } -bool dynamic_vino_lib::ObjectDetectionResultFilter::isValidLabel( +bool openvino_wrapper_lib::ObjectDetectionResultFilter::isValidLabel( const Result & result, const std::string & op, const std::string & target) { return stringCompare(result.getLabel(), op, target); } -bool dynamic_vino_lib::ObjectDetectionResultFilter::isValidConfidence( +bool openvino_wrapper_lib::ObjectDetectionResultFilter::isValidConfidence( const Result & result, const std::string & op, const std::string & target) { return floatCompare(result.getConfidence(), op, stringToFloat(target)); } -bool dynamic_vino_lib::ObjectDetectionResultFilter::isValidResult( +bool openvino_wrapper_lib::ObjectDetectionResultFilter::isValidResult( const Result & result) { ISVALIDRESULT(key_to_function_, result); } -double dynamic_vino_lib::ObjectDetection::calcIoU( +double openvino_wrapper_lib::ObjectDetection::calcIoU( const cv::Rect & box_1, const cv::Rect & box_2) { diff --git a/dynamic_vino_lib/src/inferences/object_segmentation.cpp b/openvino_wrapper_lib/src/inferences/object_segmentation.cpp similarity index 79% rename from dynamic_vino_lib/src/inferences/object_segmentation.cpp rename to openvino_wrapper_lib/src/inferences/object_segmentation.cpp index 55a020e2..699731e3 100644 --- a/dynamic_vino_lib/src/inferences/object_segmentation.cpp +++ b/openvino_wrapper_lib/src/inferences/object_segmentation.cpp @@ -24,25 +24,25 @@ #include #include -#include "dynamic_vino_lib/inferences/object_segmentation.hpp" -#include "dynamic_vino_lib/outputs/base_output.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/inferences/object_segmentation.hpp" +#include "openvino_wrapper_lib/outputs/base_output.hpp" +#include "openvino_wrapper_lib/slog.hpp" // ObjectSegmentationResult -dynamic_vino_lib::ObjectSegmentationResult::ObjectSegmentationResult(const cv::Rect &location) +openvino_wrapper_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() +openvino_wrapper_lib::ObjectSegmentation::ObjectSegmentation(double show_output_thresh) + : show_output_thresh_(show_output_thresh), openvino_wrapper_lib::BaseInference() { } -dynamic_vino_lib::ObjectSegmentation::~ObjectSegmentation() = default; +openvino_wrapper_lib::ObjectSegmentation::~ObjectSegmentation() = default; -void dynamic_vino_lib::ObjectSegmentation::loadNetwork( +void openvino_wrapper_lib::ObjectSegmentation::loadNetwork( const std::shared_ptr network) { slog::info << "Loading Network: " << network->getModelCategory() << slog::endl; @@ -54,7 +54,7 @@ void dynamic_vino_lib::ObjectSegmentation::loadNetwork( * Deprecated! * This function only support OpenVINO version <=2018R5 */ -bool dynamic_vino_lib::ObjectSegmentation::enqueue_for_one_input( +bool openvino_wrapper_lib::ObjectSegmentation::enqueue_for_one_input( const cv::Mat &frame, const cv::Rect &input_frame_loc) { @@ -63,7 +63,7 @@ bool dynamic_vino_lib::ObjectSegmentation::enqueue_for_one_input( width_ = frame.cols; height_ = frame.rows; } - if (!dynamic_vino_lib::BaseInference::enqueue(frame, input_frame_loc, 1, 0, + if (!openvino_wrapper_lib::BaseInference::enqueue(frame, input_frame_loc, 1, 0, valid_model_->getInputName())) { return false; @@ -74,7 +74,7 @@ bool dynamic_vino_lib::ObjectSegmentation::enqueue_for_one_input( return true; } -bool dynamic_vino_lib::ObjectSegmentation::enqueue( +bool openvino_wrapper_lib::ObjectSegmentation::enqueue( const cv::Mat &frame, const cv::Rect &input_frame_loc) { @@ -106,14 +106,14 @@ bool dynamic_vino_lib::ObjectSegmentation::enqueue( return true; } -bool dynamic_vino_lib::ObjectSegmentation::submitRequest() +bool openvino_wrapper_lib::ObjectSegmentation::submitRequest() { - return dynamic_vino_lib::BaseInference::submitRequest(); + return openvino_wrapper_lib::BaseInference::submitRequest(); } -bool dynamic_vino_lib::ObjectSegmentation::fetchResults() +bool openvino_wrapper_lib::ObjectSegmentation::fetchResults() { - bool can_fetch = dynamic_vino_lib::BaseInference::fetchResults(); + bool can_fetch = openvino_wrapper_lib::BaseInference::fetchResults(); if (!can_fetch) { return false; @@ -199,23 +199,23 @@ bool dynamic_vino_lib::ObjectSegmentation::fetchResults() return true; } -int dynamic_vino_lib::ObjectSegmentation::getResultsLength() const +int openvino_wrapper_lib::ObjectSegmentation::getResultsLength() const { return static_cast(results_.size()); } -const dynamic_vino_lib::Result * -dynamic_vino_lib::ObjectSegmentation::getLocationResult(int idx) const +const openvino_wrapper_lib::Result * +openvino_wrapper_lib::ObjectSegmentation::getLocationResult(int idx) const { return &(results_[idx]); } -const std::string dynamic_vino_lib::ObjectSegmentation::getName() const +const std::string openvino_wrapper_lib::ObjectSegmentation::getName() const { return valid_model_->getModelCategory(); } -void dynamic_vino_lib::ObjectSegmentation::observeOutput( +void openvino_wrapper_lib::ObjectSegmentation::observeOutput( const std::shared_ptr &output) { if (output != nullptr) @@ -224,7 +224,7 @@ void dynamic_vino_lib::ObjectSegmentation::observeOutput( } } -const std::vector dynamic_vino_lib::ObjectSegmentation::getFilteredROIs( +const std::vector openvino_wrapper_lib::ObjectSegmentation::getFilteredROIs( const std::string filter_conditions) const { if (!filter_conditions.empty()) diff --git a/dynamic_vino_lib/src/inferences/object_segmentation_maskrcnn.cpp b/openvino_wrapper_lib/src/inferences/object_segmentation_maskrcnn.cpp similarity index 80% rename from dynamic_vino_lib/src/inferences/object_segmentation_maskrcnn.cpp rename to openvino_wrapper_lib/src/inferences/object_segmentation_maskrcnn.cpp index e1189db6..7c35fc55 100644 --- a/dynamic_vino_lib/src/inferences/object_segmentation_maskrcnn.cpp +++ b/openvino_wrapper_lib/src/inferences/object_segmentation_maskrcnn.cpp @@ -24,25 +24,25 @@ #include #include -#include "dynamic_vino_lib/inferences/object_segmentation_maskrcnn.hpp" -#include "dynamic_vino_lib/outputs/base_output.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/inferences/object_segmentation_maskrcnn.hpp" +#include "openvino_wrapper_lib/outputs/base_output.hpp" +#include "openvino_wrapper_lib/slog.hpp" // ObjectSegmentationResult -dynamic_vino_lib::ObjectSegmentationMaskrcnnResult::ObjectSegmentationMaskrcnnResult(const cv::Rect &location) +openvino_wrapper_lib::ObjectSegmentationMaskrcnnResult::ObjectSegmentationMaskrcnnResult(const cv::Rect &location) : Result(location) { } // ObjectSegmentation -dynamic_vino_lib::ObjectSegmentationMaskrcnn::ObjectSegmentationMaskrcnn(double show_output_thresh) - : show_output_thresh_(show_output_thresh), dynamic_vino_lib::BaseInference() +openvino_wrapper_lib::ObjectSegmentationMaskrcnn::ObjectSegmentationMaskrcnn(double show_output_thresh) + : show_output_thresh_(show_output_thresh), openvino_wrapper_lib::BaseInference() { } -dynamic_vino_lib::ObjectSegmentationMaskrcnn::~ObjectSegmentationMaskrcnn() = default; +openvino_wrapper_lib::ObjectSegmentationMaskrcnn::~ObjectSegmentationMaskrcnn() = default; -void dynamic_vino_lib::ObjectSegmentationMaskrcnn::loadNetwork( +void openvino_wrapper_lib::ObjectSegmentationMaskrcnn::loadNetwork( const std::shared_ptr network) { slog::info << "Loading Network: " << network->getModelCategory() << slog::endl; @@ -54,7 +54,7 @@ void dynamic_vino_lib::ObjectSegmentationMaskrcnn::loadNetwork( * Deprecated! * This function only support OpenVINO version <=2018R5 */ -bool dynamic_vino_lib::ObjectSegmentationMaskrcnn::enqueue_for_one_input( +bool openvino_wrapper_lib::ObjectSegmentationMaskrcnn::enqueue_for_one_input( const cv::Mat &frame, const cv::Rect &input_frame_loc) { @@ -63,7 +63,7 @@ bool dynamic_vino_lib::ObjectSegmentationMaskrcnn::enqueue_for_one_input( width_ = frame.cols; height_ = frame.rows; } - if (!dynamic_vino_lib::BaseInference::enqueue(frame, input_frame_loc, 1, 0, + if (!openvino_wrapper_lib::BaseInference::enqueue(frame, input_frame_loc, 1, 0, valid_model_->getInputName())) { return false; @@ -74,7 +74,7 @@ bool dynamic_vino_lib::ObjectSegmentationMaskrcnn::enqueue_for_one_input( return true; } -bool dynamic_vino_lib::ObjectSegmentationMaskrcnn::enqueue( +bool openvino_wrapper_lib::ObjectSegmentationMaskrcnn::enqueue( const cv::Mat &frame, const cv::Rect &input_frame_loc) { @@ -106,15 +106,15 @@ bool dynamic_vino_lib::ObjectSegmentationMaskrcnn::enqueue( return true; } -bool dynamic_vino_lib::ObjectSegmentationMaskrcnn::submitRequest() +bool openvino_wrapper_lib::ObjectSegmentationMaskrcnn::submitRequest() { - return dynamic_vino_lib::BaseInference::submitRequest(); + return openvino_wrapper_lib::BaseInference::submitRequest(); } -bool dynamic_vino_lib::ObjectSegmentationMaskrcnn::fetchResults() +bool openvino_wrapper_lib::ObjectSegmentationMaskrcnn::fetchResults() { - bool can_fetch = dynamic_vino_lib::BaseInference::fetchResults(); + bool can_fetch = openvino_wrapper_lib::BaseInference::fetchResults(); if (!can_fetch) { return false; @@ -196,23 +196,23 @@ bool dynamic_vino_lib::ObjectSegmentationMaskrcnn::fetchResults() return true; } -int dynamic_vino_lib::ObjectSegmentationMaskrcnn::getResultsLength() const +int openvino_wrapper_lib::ObjectSegmentationMaskrcnn::getResultsLength() const { return static_cast(results_.size()); } -const dynamic_vino_lib::Result * -dynamic_vino_lib::ObjectSegmentationMaskrcnn::getLocationResult(int idx) const +const openvino_wrapper_lib::Result * +openvino_wrapper_lib::ObjectSegmentationMaskrcnn::getLocationResult(int idx) const { return &(results_[idx]); } -const std::string dynamic_vino_lib::ObjectSegmentationMaskrcnn::getName() const +const std::string openvino_wrapper_lib::ObjectSegmentationMaskrcnn::getName() const { return valid_model_->getModelCategory(); } -void dynamic_vino_lib::ObjectSegmentationMaskrcnn::observeOutput( +void openvino_wrapper_lib::ObjectSegmentationMaskrcnn::observeOutput( const std::shared_ptr &output) { if (output != nullptr) @@ -221,7 +221,7 @@ void dynamic_vino_lib::ObjectSegmentationMaskrcnn::observeOutput( } } -const std::vector dynamic_vino_lib::ObjectSegmentationMaskrcnn::getFilteredROIs( +const std::vector openvino_wrapper_lib::ObjectSegmentationMaskrcnn::getFilteredROIs( const std::string filter_conditions) const { if (!filter_conditions.empty()) diff --git a/dynamic_vino_lib/src/inferences/person_attribs_detection.cpp b/openvino_wrapper_lib/src/inferences/person_attribs_detection.cpp similarity index 71% rename from dynamic_vino_lib/src/inferences/person_attribs_detection.cpp rename to openvino_wrapper_lib/src/inferences/person_attribs_detection.cpp index a9c5451d..79b5c446 100644 --- a/dynamic_vino_lib/src/inferences/person_attribs_detection.cpp +++ b/openvino_wrapper_lib/src/inferences/person_attribs_detection.cpp @@ -21,34 +21,34 @@ #include #include #include -#include "dynamic_vino_lib/inferences/person_attribs_detection.hpp" -#include "dynamic_vino_lib/outputs/base_output.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/inferences/person_attribs_detection.hpp" +#include "openvino_wrapper_lib/outputs/base_output.hpp" +#include "openvino_wrapper_lib/slog.hpp" // PersonAttribsDetectionResult -dynamic_vino_lib::PersonAttribsDetectionResult::PersonAttribsDetectionResult( +openvino_wrapper_lib::PersonAttribsDetectionResult::PersonAttribsDetectionResult( const cv::Rect & location) : Result(location) {} // PersonAttribsDetection -dynamic_vino_lib::PersonAttribsDetection::PersonAttribsDetection(double attribs_confidence) -: attribs_confidence_(attribs_confidence), dynamic_vino_lib::BaseInference() {} +openvino_wrapper_lib::PersonAttribsDetection::PersonAttribsDetection(double attribs_confidence) +: attribs_confidence_(attribs_confidence), openvino_wrapper_lib::BaseInference() {} -dynamic_vino_lib::PersonAttribsDetection::~PersonAttribsDetection() = default; -void dynamic_vino_lib::PersonAttribsDetection::loadNetwork( +openvino_wrapper_lib::PersonAttribsDetection::~PersonAttribsDetection() = default; +void openvino_wrapper_lib::PersonAttribsDetection::loadNetwork( const std::shared_ptr network) { valid_model_ = network; setMaxBatchSize(network->getMaxBatchSize()); } -bool dynamic_vino_lib::PersonAttribsDetection::enqueue( +bool openvino_wrapper_lib::PersonAttribsDetection::enqueue( const cv::Mat & frame, const cv::Rect & input_frame_loc) { if (getEnqueuedNum() == 0) { results_.clear(); } - if (!dynamic_vino_lib::BaseInference::enqueue( + if (!openvino_wrapper_lib::BaseInference::enqueue( frame, input_frame_loc, 1, 0, valid_model_->getInputName())) { return false; @@ -58,14 +58,14 @@ bool dynamic_vino_lib::PersonAttribsDetection::enqueue( return true; } -bool dynamic_vino_lib::PersonAttribsDetection::submitRequest() +bool openvino_wrapper_lib::PersonAttribsDetection::submitRequest() { - return dynamic_vino_lib::BaseInference::submitRequest(); + return openvino_wrapper_lib::BaseInference::submitRequest(); } -bool dynamic_vino_lib::PersonAttribsDetection::fetchResults() +bool openvino_wrapper_lib::PersonAttribsDetection::fetchResults() { - bool can_fetch = dynamic_vino_lib::BaseInference::fetchResults(); + bool can_fetch = openvino_wrapper_lib::BaseInference::fetchResults(); if (!can_fetch) {return false;} bool found_result = false; ov::InferRequest request = getEngine()->getRequest(); @@ -102,23 +102,23 @@ bool dynamic_vino_lib::PersonAttribsDetection::fetchResults() return true; } -int dynamic_vino_lib::PersonAttribsDetection::getResultsLength() const +int openvino_wrapper_lib::PersonAttribsDetection::getResultsLength() const { return static_cast(results_.size()); } -const dynamic_vino_lib::Result * -dynamic_vino_lib::PersonAttribsDetection::getLocationResult(int idx) const +const openvino_wrapper_lib::Result * +openvino_wrapper_lib::PersonAttribsDetection::getLocationResult(int idx) const { return &(results_[idx]); } -const std::string dynamic_vino_lib::PersonAttribsDetection::getName() const +const std::string openvino_wrapper_lib::PersonAttribsDetection::getName() const { return valid_model_->getModelCategory(); } -void dynamic_vino_lib::PersonAttribsDetection::observeOutput( +void openvino_wrapper_lib::PersonAttribsDetection::observeOutput( const std::shared_ptr & output) { if (output != nullptr) { @@ -126,7 +126,7 @@ void dynamic_vino_lib::PersonAttribsDetection::observeOutput( } } -const std::vector dynamic_vino_lib::PersonAttribsDetection::getFilteredROIs( +const std::vector openvino_wrapper_lib::PersonAttribsDetection::getFilteredROIs( const std::string filter_conditions) const { if (!filter_conditions.empty()) { diff --git a/dynamic_vino_lib/src/inferences/person_reidentification.cpp b/openvino_wrapper_lib/src/inferences/person_reidentification.cpp similarity index 64% rename from dynamic_vino_lib/src/inferences/person_reidentification.cpp rename to openvino_wrapper_lib/src/inferences/person_reidentification.cpp index c26c3b2d..9d4d891a 100644 --- a/dynamic_vino_lib/src/inferences/person_reidentification.cpp +++ b/openvino_wrapper_lib/src/inferences/person_reidentification.cpp @@ -20,37 +20,37 @@ #include #include #include -#include "dynamic_vino_lib/inferences/person_reidentification.hpp" -#include "dynamic_vino_lib/outputs/base_output.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/inferences/person_reidentification.hpp" +#include "openvino_wrapper_lib/outputs/base_output.hpp" +#include "openvino_wrapper_lib/slog.hpp" // PersonReidentificationResult -dynamic_vino_lib::PersonReidentificationResult::PersonReidentificationResult( +openvino_wrapper_lib::PersonReidentificationResult::PersonReidentificationResult( const cv::Rect & location) : Result(location) {} // PersonReidentification -dynamic_vino_lib::PersonReidentification::PersonReidentification(double match_thresh) -: dynamic_vino_lib::BaseInference() +openvino_wrapper_lib::PersonReidentification::PersonReidentification(double match_thresh) +: openvino_wrapper_lib::BaseInference() { - person_tracker_ = std::make_shared(1000, match_thresh, 0.3); + person_tracker_ = std::make_shared(1000, match_thresh, 0.3); } -dynamic_vino_lib::PersonReidentification::~PersonReidentification() = default; -void dynamic_vino_lib::PersonReidentification::loadNetwork( +openvino_wrapper_lib::PersonReidentification::~PersonReidentification() = default; +void openvino_wrapper_lib::PersonReidentification::loadNetwork( const std::shared_ptr network) { valid_model_ = network; setMaxBatchSize(network->getMaxBatchSize()); } -bool dynamic_vino_lib::PersonReidentification::enqueue( +bool openvino_wrapper_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 (!openvino_wrapper_lib::BaseInference::enqueue( frame, input_frame_loc, 1, 0, valid_model_->getInputName())) { return false; @@ -60,14 +60,14 @@ bool dynamic_vino_lib::PersonReidentification::enqueue( return true; } -bool dynamic_vino_lib::PersonReidentification::submitRequest() +bool openvino_wrapper_lib::PersonReidentification::submitRequest() { - return dynamic_vino_lib::BaseInference::submitRequest(); + return openvino_wrapper_lib::BaseInference::submitRequest(); } -bool dynamic_vino_lib::PersonReidentification::fetchResults() +bool openvino_wrapper_lib::PersonReidentification::fetchResults() { - bool can_fetch = dynamic_vino_lib::BaseInference::fetchResults(); + bool can_fetch = openvino_wrapper_lib::BaseInference::fetchResults(); if (!can_fetch) {return false;} bool found_result = false; ov::InferRequest request = getEngine()->getRequest(); @@ -85,23 +85,23 @@ bool dynamic_vino_lib::PersonReidentification::fetchResults() return true; } -int dynamic_vino_lib::PersonReidentification::getResultsLength() const +int openvino_wrapper_lib::PersonReidentification::getResultsLength() const { return static_cast(results_.size()); } -const dynamic_vino_lib::Result * -dynamic_vino_lib::PersonReidentification::getLocationResult(int idx) const +const openvino_wrapper_lib::Result * +openvino_wrapper_lib::PersonReidentification::getLocationResult(int idx) const { return &(results_[idx]); } -const std::string dynamic_vino_lib::PersonReidentification::getName() const +const std::string openvino_wrapper_lib::PersonReidentification::getName() const { return valid_model_->getModelCategory(); } -void dynamic_vino_lib::PersonReidentification::observeOutput( +void openvino_wrapper_lib::PersonReidentification::observeOutput( const std::shared_ptr & output) { if (output != nullptr) { @@ -109,7 +109,7 @@ void dynamic_vino_lib::PersonReidentification::observeOutput( } } -const std::vector dynamic_vino_lib::PersonReidentification::getFilteredROIs( +const std::vector openvino_wrapper_lib::PersonReidentification::getFilteredROIs( const std::string filter_conditions) const { if (!filter_conditions.empty()) { diff --git a/dynamic_vino_lib/src/inferences/vehicle_attribs_detection.cpp b/openvino_wrapper_lib/src/inferences/vehicle_attribs_detection.cpp similarity index 68% rename from dynamic_vino_lib/src/inferences/vehicle_attribs_detection.cpp rename to openvino_wrapper_lib/src/inferences/vehicle_attribs_detection.cpp index 92f17916..232d73ea 100644 --- a/dynamic_vino_lib/src/inferences/vehicle_attribs_detection.cpp +++ b/openvino_wrapper_lib/src/inferences/vehicle_attribs_detection.cpp @@ -20,34 +20,34 @@ #include #include #include -#include "dynamic_vino_lib/inferences/vehicle_attribs_detection.hpp" -#include "dynamic_vino_lib/outputs/base_output.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/inferences/vehicle_attribs_detection.hpp" +#include "openvino_wrapper_lib/outputs/base_output.hpp" +#include "openvino_wrapper_lib/slog.hpp" // VehicleAttribsDetectionResult -dynamic_vino_lib::VehicleAttribsDetectionResult::VehicleAttribsDetectionResult( +openvino_wrapper_lib::VehicleAttribsDetectionResult::VehicleAttribsDetectionResult( const cv::Rect & location) : Result(location) {} // VehicleAttribsDetection -dynamic_vino_lib::VehicleAttribsDetection::VehicleAttribsDetection() -: dynamic_vino_lib::BaseInference() {} +openvino_wrapper_lib::VehicleAttribsDetection::VehicleAttribsDetection() +: openvino_wrapper_lib::BaseInference() {} -dynamic_vino_lib::VehicleAttribsDetection::~VehicleAttribsDetection() = default; -void dynamic_vino_lib::VehicleAttribsDetection::loadNetwork( +openvino_wrapper_lib::VehicleAttribsDetection::~VehicleAttribsDetection() = default; +void openvino_wrapper_lib::VehicleAttribsDetection::loadNetwork( const std::shared_ptr network) { valid_model_ = network; setMaxBatchSize(network->getMaxBatchSize()); } -bool dynamic_vino_lib::VehicleAttribsDetection::enqueue( +bool openvino_wrapper_lib::VehicleAttribsDetection::enqueue( const cv::Mat & frame, const cv::Rect & input_frame_loc) { if (getEnqueuedNum() == 0) { results_.clear(); } - if (!dynamic_vino_lib::BaseInference::enqueue( + if (!openvino_wrapper_lib::BaseInference::enqueue( frame, input_frame_loc, 1, 0, valid_model_->getInputName())) { return false; @@ -57,14 +57,14 @@ bool dynamic_vino_lib::VehicleAttribsDetection::enqueue( return true; } -bool dynamic_vino_lib::VehicleAttribsDetection::submitRequest() +bool openvino_wrapper_lib::VehicleAttribsDetection::submitRequest() { - return dynamic_vino_lib::BaseInference::submitRequest(); + return openvino_wrapper_lib::BaseInference::submitRequest(); } -bool dynamic_vino_lib::VehicleAttribsDetection::fetchResults() +bool openvino_wrapper_lib::VehicleAttribsDetection::fetchResults() { - bool can_fetch = dynamic_vino_lib::BaseInference::fetchResults(); + bool can_fetch = openvino_wrapper_lib::BaseInference::fetchResults(); if (!can_fetch) {return false;} bool found_result = false; @@ -87,23 +87,23 @@ bool dynamic_vino_lib::VehicleAttribsDetection::fetchResults() return true; } -int dynamic_vino_lib::VehicleAttribsDetection::getResultsLength() const +int openvino_wrapper_lib::VehicleAttribsDetection::getResultsLength() const { return static_cast(results_.size()); } -const dynamic_vino_lib::Result * -dynamic_vino_lib::VehicleAttribsDetection::getLocationResult(int idx) const +const openvino_wrapper_lib::Result * +openvino_wrapper_lib::VehicleAttribsDetection::getLocationResult(int idx) const { return &(results_[idx]); } -const std::string dynamic_vino_lib::VehicleAttribsDetection::getName() const +const std::string openvino_wrapper_lib::VehicleAttribsDetection::getName() const { return valid_model_->getModelCategory(); } -void dynamic_vino_lib::VehicleAttribsDetection::observeOutput( +void openvino_wrapper_lib::VehicleAttribsDetection::observeOutput( const std::shared_ptr & output) { if (output != nullptr) { @@ -111,7 +111,7 @@ void dynamic_vino_lib::VehicleAttribsDetection::observeOutput( } } -const std::vector dynamic_vino_lib::VehicleAttribsDetection::getFilteredROIs( +const std::vector openvino_wrapper_lib::VehicleAttribsDetection::getFilteredROIs( const std::string filter_conditions) const { if (!filter_conditions.empty()) { diff --git a/dynamic_vino_lib/src/inputs/image_input.cpp b/openvino_wrapper_lib/src/inputs/image_input.cpp similarity index 93% rename from dynamic_vino_lib/src/inputs/image_input.cpp rename to openvino_wrapper_lib/src/inputs/image_input.cpp index db1195ed..4c6bdf6f 100644 --- a/dynamic_vino_lib/src/inputs/image_input.cpp +++ b/openvino_wrapper_lib/src/inputs/image_input.cpp @@ -18,8 +18,8 @@ */ #include -#include "dynamic_vino_lib/inputs/image_input.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/inputs/image_input.hpp" +#include "openvino_wrapper_lib/slog.hpp" Input::Image::Image(const std::string & file) { diff --git a/dynamic_vino_lib/src/inputs/image_topic.cpp b/openvino_wrapper_lib/src/inputs/image_topic.cpp similarity index 95% rename from dynamic_vino_lib/src/inputs/image_topic.cpp rename to openvino_wrapper_lib/src/inputs/image_topic.cpp index 55be9786..a716e2fe 100644 --- a/dynamic_vino_lib/src/inputs/image_topic.cpp +++ b/openvino_wrapper_lib/src/inputs/image_topic.cpp @@ -19,8 +19,8 @@ #include #include -#include "dynamic_vino_lib/inputs/image_topic.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/inputs/image_topic.hpp" +#include "openvino_wrapper_lib/slog.hpp" #define INPUT_TOPIC "/openvino_toolkit/image_raw" diff --git a/dynamic_vino_lib/src/inputs/ip_camera.cpp b/openvino_wrapper_lib/src/inputs/ip_camera.cpp similarity index 96% rename from dynamic_vino_lib/src/inputs/ip_camera.cpp rename to openvino_wrapper_lib/src/inputs/ip_camera.cpp index 1e7d3eae..e579ba54 100644 --- a/dynamic_vino_lib/src/inputs/ip_camera.cpp +++ b/openvino_wrapper_lib/src/inputs/ip_camera.cpp @@ -16,7 +16,7 @@ * @brief a header file with declaration of IpCamera class * @file ip_camera.cpp */ -#include "dynamic_vino_lib/inputs/ip_camera.hpp" +#include "openvino_wrapper_lib/inputs/ip_camera.hpp" bool Input::IpCamera::initialize() diff --git a/dynamic_vino_lib/src/inputs/realsense_camera.cpp b/openvino_wrapper_lib/src/inputs/realsense_camera.cpp similarity index 96% rename from dynamic_vino_lib/src/inputs/realsense_camera.cpp rename to openvino_wrapper_lib/src/inputs/realsense_camera.cpp index c2dcff9c..f9aa759d 100644 --- a/dynamic_vino_lib/src/inputs/realsense_camera.cpp +++ b/openvino_wrapper_lib/src/inputs/realsense_camera.cpp @@ -16,8 +16,8 @@ * @brief a header file with declaration of RealSenseCamera class * @file realsense_camera.cpp */ -#include "dynamic_vino_lib/inputs/realsense_camera.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/inputs/realsense_camera.hpp" +#include "openvino_wrapper_lib/slog.hpp" // RealSenseCamera bool Input::RealSenseCamera::initialize() diff --git a/dynamic_vino_lib/src/inputs/standard_camera.cpp b/openvino_wrapper_lib/src/inputs/standard_camera.cpp similarity index 97% rename from dynamic_vino_lib/src/inputs/standard_camera.cpp rename to openvino_wrapper_lib/src/inputs/standard_camera.cpp index 2bc20f02..8b25f717 100644 --- a/dynamic_vino_lib/src/inputs/standard_camera.cpp +++ b/openvino_wrapper_lib/src/inputs/standard_camera.cpp @@ -16,7 +16,7 @@ * @brief a header file with declaration of StandardCamera class * @file standard_camera.cpp */ -#include "dynamic_vino_lib/inputs/standard_camera.hpp" +#include "openvino_wrapper_lib/inputs/standard_camera.hpp" bool Input::StandardCamera::initialize() { diff --git a/dynamic_vino_lib/src/inputs/video_input.cpp b/openvino_wrapper_lib/src/inputs/video_input.cpp similarity index 96% rename from dynamic_vino_lib/src/inputs/video_input.cpp rename to openvino_wrapper_lib/src/inputs/video_input.cpp index 97a54745..4c4e2a80 100644 --- a/dynamic_vino_lib/src/inputs/video_input.cpp +++ b/openvino_wrapper_lib/src/inputs/video_input.cpp @@ -19,7 +19,7 @@ #include -#include "dynamic_vino_lib/inputs/video_input.hpp" +#include "openvino_wrapper_lib/inputs/video_input.hpp" // Video Input::Video::Video(const std::string & video) diff --git a/dynamic_vino_lib/src/models/age_gender_detection_model.cpp b/openvino_wrapper_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 openvino_wrapper_lib/src/models/age_gender_detection_model.cpp index f5b241a8..ac3eea86 100644 --- a/dynamic_vino_lib/src/models/age_gender_detection_model.cpp +++ b/openvino_wrapper_lib/src/models/age_gender_detection_model.cpp @@ -19,8 +19,8 @@ #include #include #include -#include "dynamic_vino_lib/models/age_gender_detection_model.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/models/age_gender_detection_model.hpp" +#include "openvino_wrapper_lib/slog.hpp" // Validated Age Gender Classification Network Models::AgeGenderDetectionModel::AgeGenderDetectionModel( diff --git a/dynamic_vino_lib/src/models/attributes/ssd_model_attr.cpp b/openvino_wrapper_lib/src/models/attributes/ssd_model_attr.cpp similarity index 97% rename from dynamic_vino_lib/src/models/attributes/ssd_model_attr.cpp rename to openvino_wrapper_lib/src/models/attributes/ssd_model_attr.cpp index 693f1481..1340d490 100644 --- a/dynamic_vino_lib/src/models/attributes/ssd_model_attr.cpp +++ b/openvino_wrapper_lib/src/models/attributes/ssd_model_attr.cpp @@ -19,8 +19,8 @@ #include -#include "dynamic_vino_lib/models/attributes/base_attribute.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/models/attributes/base_attribute.hpp" +#include "openvino_wrapper_lib/slog.hpp" // Validated Face Detection Network Models::SSDModelAttr::SSDModelAttr( diff --git a/dynamic_vino_lib/src/models/base_model.cpp b/openvino_wrapper_lib/src/models/base_model.cpp similarity index 93% rename from dynamic_vino_lib/src/models/base_model.cpp rename to openvino_wrapper_lib/src/models/base_model.cpp index 01588b94..70647b5a 100644 --- a/dynamic_vino_lib/src/models/base_model.cpp +++ b/openvino_wrapper_lib/src/models/base_model.cpp @@ -23,9 +23,9 @@ #include #include #include -#include "dynamic_vino_lib/models/base_model.hpp" -#include "dynamic_vino_lib/slog.hpp" -#include "dynamic_vino_lib/models/attributes/base_attribute.hpp" +#include "openvino_wrapper_lib/models/base_model.hpp" +#include "openvino_wrapper_lib/slog.hpp" +#include "openvino_wrapper_lib/models/attributes/base_attribute.hpp" // Validated Base Network Models::BaseModel::BaseModel( diff --git a/dynamic_vino_lib/src/models/emotion_detection_model.cpp b/openvino_wrapper_lib/src/models/emotion_detection_model.cpp similarity index 96% rename from dynamic_vino_lib/src/models/emotion_detection_model.cpp rename to openvino_wrapper_lib/src/models/emotion_detection_model.cpp index 7ee3ab94..9d7579bb 100644 --- a/dynamic_vino_lib/src/models/emotion_detection_model.cpp +++ b/openvino_wrapper_lib/src/models/emotion_detection_model.cpp @@ -18,8 +18,8 @@ */ #include #include -#include "dynamic_vino_lib/models/emotion_detection_model.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/models/emotion_detection_model.hpp" +#include "openvino_wrapper_lib/slog.hpp" // Validated Emotions Detection Network diff --git a/dynamic_vino_lib/src/models/face_detection_model.cpp b/openvino_wrapper_lib/src/models/face_detection_model.cpp similarity index 91% rename from dynamic_vino_lib/src/models/face_detection_model.cpp rename to openvino_wrapper_lib/src/models/face_detection_model.cpp index 149c7ddf..ced9982e 100644 --- a/dynamic_vino_lib/src/models/face_detection_model.cpp +++ b/openvino_wrapper_lib/src/models/face_detection_model.cpp @@ -19,8 +19,8 @@ #include -#include "dynamic_vino_lib/models/face_detection_model.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/models/face_detection_model.hpp" +#include "openvino_wrapper_lib/slog.hpp" // Validated Face Detection Network Models::FaceDetectionModel::FaceDetectionModel( diff --git a/dynamic_vino_lib/src/models/face_reidentification_model.cpp b/openvino_wrapper_lib/src/models/face_reidentification_model.cpp similarity index 94% rename from dynamic_vino_lib/src/models/face_reidentification_model.cpp rename to openvino_wrapper_lib/src/models/face_reidentification_model.cpp index c8a8ab97..d8deb8f5 100644 --- a/dynamic_vino_lib/src/models/face_reidentification_model.cpp +++ b/openvino_wrapper_lib/src/models/face_reidentification_model.cpp @@ -17,8 +17,8 @@ * @file face_reidentification_model.cpp */ #include -#include "dynamic_vino_lib/models/face_reidentification_model.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/models/face_reidentification_model.hpp" +#include "openvino_wrapper_lib/slog.hpp" // Validated Face Reidentification Network Models::FaceReidentificationModel::FaceReidentificationModel( const std::string & label_loc, const std::string & model_loc, int max_batch_size) diff --git a/dynamic_vino_lib/src/models/head_pose_detection_model.cpp b/openvino_wrapper_lib/src/models/head_pose_detection_model.cpp similarity index 96% rename from dynamic_vino_lib/src/models/head_pose_detection_model.cpp rename to openvino_wrapper_lib/src/models/head_pose_detection_model.cpp index ebfd4c1d..2f4ec293 100644 --- a/dynamic_vino_lib/src/models/head_pose_detection_model.cpp +++ b/openvino_wrapper_lib/src/models/head_pose_detection_model.cpp @@ -20,8 +20,8 @@ #include #include -#include "dynamic_vino_lib/models/head_pose_detection_model.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/models/head_pose_detection_model.hpp" +#include "openvino_wrapper_lib/slog.hpp" // Validated Head Pose Network Models::HeadPoseDetectionModel::HeadPoseDetectionModel( diff --git a/dynamic_vino_lib/src/models/landmarks_detection_model.cpp b/openvino_wrapper_lib/src/models/landmarks_detection_model.cpp similarity index 95% rename from dynamic_vino_lib/src/models/landmarks_detection_model.cpp rename to openvino_wrapper_lib/src/models/landmarks_detection_model.cpp index a956f3c2..3c261c5b 100644 --- a/dynamic_vino_lib/src/models/landmarks_detection_model.cpp +++ b/openvino_wrapper_lib/src/models/landmarks_detection_model.cpp @@ -17,8 +17,8 @@ * @file landmarks_detection_model.cpp */ #include -#include "dynamic_vino_lib/models/landmarks_detection_model.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/models/landmarks_detection_model.hpp" +#include "openvino_wrapper_lib/slog.hpp" // Validated Landmarks Detection Network Models::LandmarksDetectionModel::LandmarksDetectionModel( const std::string & label_loc, const std::string & model_loc, int max_batch_size) diff --git a/dynamic_vino_lib/src/models/license_plate_detection_model.cpp b/openvino_wrapper_lib/src/models/license_plate_detection_model.cpp similarity index 95% rename from dynamic_vino_lib/src/models/license_plate_detection_model.cpp rename to openvino_wrapper_lib/src/models/license_plate_detection_model.cpp index f197d839..bfdf4ce5 100644 --- a/dynamic_vino_lib/src/models/license_plate_detection_model.cpp +++ b/openvino_wrapper_lib/src/models/license_plate_detection_model.cpp @@ -17,8 +17,8 @@ * @file license_plate_detection_model.cpp */ #include -#include "dynamic_vino_lib/models/license_plate_detection_model.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/models/license_plate_detection_model.hpp" +#include "openvino_wrapper_lib/slog.hpp" // Validated Vehicle Attributes Detection Network Models::LicensePlateDetectionModel::LicensePlateDetectionModel( const std::string & label_loc, const std::string & model_loc, int max_batch_size) diff --git a/dynamic_vino_lib/src/models/object_detection_ssd_model.cpp b/openvino_wrapper_lib/src/models/object_detection_ssd_model.cpp similarity index 95% rename from dynamic_vino_lib/src/models/object_detection_ssd_model.cpp rename to openvino_wrapper_lib/src/models/object_detection_ssd_model.cpp index f6a24f4c..2c938ca8 100644 --- a/dynamic_vino_lib/src/models/object_detection_ssd_model.cpp +++ b/openvino_wrapper_lib/src/models/object_detection_ssd_model.cpp @@ -19,11 +19,11 @@ #include #include #include -#include "dynamic_vino_lib/inferences/object_detection.hpp" -#include "dynamic_vino_lib/models/object_detection_ssd_model.hpp" -#include "dynamic_vino_lib/slog.hpp" -#include "dynamic_vino_lib/engines/engine.hpp" -#include "dynamic_vino_lib/models/attributes/base_attribute.hpp" +#include "openvino_wrapper_lib/inferences/object_detection.hpp" +#include "openvino_wrapper_lib/models/object_detection_ssd_model.hpp" +#include "openvino_wrapper_lib/slog.hpp" +#include "openvino_wrapper_lib/engines/engine.hpp" +#include "openvino_wrapper_lib/models/attributes/base_attribute.hpp" // Validated Object Detection Network Models::ObjectDetectionSSDModel::ObjectDetectionSSDModel( @@ -93,7 +93,7 @@ bool Models::ObjectDetectionSSDModel::matToBlob( bool Models::ObjectDetectionSSDModel::fetchResults( const std::shared_ptr & engine, - std::vector & results, + std::vector & results, const float & confidence_thresh, const bool & enable_roi_constraint) { @@ -130,7 +130,7 @@ bool Models::ObjectDetectionSSDModel::fetchResults( if (enable_roi_constraint) {r &= cv::Rect(0, 0, frame_size.width, frame_size.height);} - dynamic_vino_lib::ObjectDetectionResult result(r); + openvino_wrapper_lib::ObjectDetectionResult result(r); std::string label = label_num < labels.size() ? labels[label_num] : std::string("label #") + std::to_string(label_num); result.setLabel(label); diff --git a/dynamic_vino_lib/src/models/object_detection_yolov5_model.cpp b/openvino_wrapper_lib/src/models/object_detection_yolov5_model.cpp similarity index 96% rename from dynamic_vino_lib/src/models/object_detection_yolov5_model.cpp rename to openvino_wrapper_lib/src/models/object_detection_yolov5_model.cpp index c812bfb1..8dd7176d 100644 --- a/dynamic_vino_lib/src/models/object_detection_yolov5_model.cpp +++ b/openvino_wrapper_lib/src/models/object_detection_yolov5_model.cpp @@ -20,10 +20,10 @@ #include #include #include -#include "dynamic_vino_lib/slog.hpp" -#include "dynamic_vino_lib/engines/engine.hpp" -#include "dynamic_vino_lib/inferences/object_detection.hpp" -#include "dynamic_vino_lib/models/object_detection_yolov5_model.hpp" +#include "openvino_wrapper_lib/slog.hpp" +#include "openvino_wrapper_lib/engines/engine.hpp" +#include "openvino_wrapper_lib/inferences/object_detection.hpp" +#include "openvino_wrapper_lib/models/object_detection_yolov5_model.hpp" // Validated Object Detection Network @@ -129,7 +129,7 @@ bool Models::ObjectDetectionYolov5Model::matToBlob( bool Models::ObjectDetectionYolov5Model::fetchResults( const std::shared_ptr & engine, - std::vector & results, + std::vector & results, const float & confidence_thresh, const bool & enable_roi_constraint) { diff --git a/dynamic_vino_lib/src/models/object_segmentation_maskrcnn_model.cpp b/openvino_wrapper_lib/src/models/object_segmentation_maskrcnn_model.cpp similarity index 98% rename from dynamic_vino_lib/src/models/object_segmentation_maskrcnn_model.cpp rename to openvino_wrapper_lib/src/models/object_segmentation_maskrcnn_model.cpp index 0b7bc772..d0d127ce 100644 --- a/dynamic_vino_lib/src/models/object_segmentation_maskrcnn_model.cpp +++ b/openvino_wrapper_lib/src/models/object_segmentation_maskrcnn_model.cpp @@ -19,9 +19,9 @@ #include #include #include -#include "dynamic_vino_lib/models/object_segmentation_maskrcnn_model.hpp" -#include "dynamic_vino_lib/slog.hpp" -#include "dynamic_vino_lib/engines/engine.hpp" +#include "openvino_wrapper_lib/models/object_segmentation_maskrcnn_model.hpp" +#include "openvino_wrapper_lib/slog.hpp" +#include "openvino_wrapper_lib/engines/engine.hpp" // Validated Object Segmentation Network Models::ObjectSegmentationMaskrcnnModel::ObjectSegmentationMaskrcnnModel( diff --git a/dynamic_vino_lib/src/models/object_segmentation_model.cpp b/openvino_wrapper_lib/src/models/object_segmentation_model.cpp similarity index 97% rename from dynamic_vino_lib/src/models/object_segmentation_model.cpp rename to openvino_wrapper_lib/src/models/object_segmentation_model.cpp index 3b22751c..31cd4c78 100644 --- a/dynamic_vino_lib/src/models/object_segmentation_model.cpp +++ b/openvino_wrapper_lib/src/models/object_segmentation_model.cpp @@ -19,9 +19,9 @@ #include #include #include -#include "dynamic_vino_lib/models/object_segmentation_model.hpp" -#include "dynamic_vino_lib/slog.hpp" -#include "dynamic_vino_lib/engines/engine.hpp" +#include "openvino_wrapper_lib/models/object_segmentation_model.hpp" +#include "openvino_wrapper_lib/slog.hpp" +#include "openvino_wrapper_lib/engines/engine.hpp" // Validated Object Segmentation Network Models::ObjectSegmentationModel::ObjectSegmentationModel( const std::string & label_loc, diff --git a/dynamic_vino_lib/src/models/person_attribs_detection_model.cpp b/openvino_wrapper_lib/src/models/person_attribs_detection_model.cpp similarity index 95% rename from dynamic_vino_lib/src/models/person_attribs_detection_model.cpp rename to openvino_wrapper_lib/src/models/person_attribs_detection_model.cpp index ef1d7e8a..405740d6 100644 --- a/dynamic_vino_lib/src/models/person_attribs_detection_model.cpp +++ b/openvino_wrapper_lib/src/models/person_attribs_detection_model.cpp @@ -18,8 +18,8 @@ */ #include #include -#include "dynamic_vino_lib/models/person_attribs_detection_model.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/models/person_attribs_detection_model.hpp" +#include "openvino_wrapper_lib/slog.hpp" // Validated Person Attributes Detection Network Models::PersonAttribsDetectionModel::PersonAttribsDetectionModel( const std::string & label_loc, const std::string & model_loc, int max_batch_size) diff --git a/dynamic_vino_lib/src/models/person_reidentification_model.cpp b/openvino_wrapper_lib/src/models/person_reidentification_model.cpp similarity index 94% rename from dynamic_vino_lib/src/models/person_reidentification_model.cpp rename to openvino_wrapper_lib/src/models/person_reidentification_model.cpp index af71d2c0..911a3609 100644 --- a/dynamic_vino_lib/src/models/person_reidentification_model.cpp +++ b/openvino_wrapper_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.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/models/person_reidentification_model.hpp" +#include "openvino_wrapper_lib/slog.hpp" // Validated Person Reidentification Network Models::PersonReidentificationModel::PersonReidentificationModel( const std::string & label_loc, const std::string & model_loc, int max_batch_size) diff --git a/dynamic_vino_lib/src/models/vehicle_attribs_detection_model.cpp b/openvino_wrapper_lib/src/models/vehicle_attribs_detection_model.cpp similarity index 95% rename from dynamic_vino_lib/src/models/vehicle_attribs_detection_model.cpp rename to openvino_wrapper_lib/src/models/vehicle_attribs_detection_model.cpp index 361658e8..e5a65947 100644 --- a/dynamic_vino_lib/src/models/vehicle_attribs_detection_model.cpp +++ b/openvino_wrapper_lib/src/models/vehicle_attribs_detection_model.cpp @@ -17,8 +17,8 @@ * @file vehicle_attribs_detection_model.cpp */ #include -#include "dynamic_vino_lib/models/vehicle_attribs_detection_model.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/models/vehicle_attribs_detection_model.hpp" +#include "openvino_wrapper_lib/slog.hpp" // Validated Vehicle Attributes Detection Network Models::VehicleAttribsDetectionModel::VehicleAttribsDetectionModel( const std::string & label_loc, const std::string & model_loc, int max_batch_size) diff --git a/dynamic_vino_lib/src/outputs/base_output.cpp b/openvino_wrapper_lib/src/outputs/base_output.cpp similarity index 89% rename from dynamic_vino_lib/src/outputs/base_output.cpp rename to openvino_wrapper_lib/src/outputs/base_output.cpp index fee27873..e401ce44 100644 --- a/dynamic_vino_lib/src/outputs/base_output.cpp +++ b/openvino_wrapper_lib/src/outputs/base_output.cpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dynamic_vino_lib/outputs/base_output.hpp" -#include "dynamic_vino_lib/pipeline.hpp" +#include "openvino_wrapper_lib/outputs/base_output.hpp" +#include "openvino_wrapper_lib/pipeline.hpp" void Outputs::BaseOutput::setPipeline(Pipeline * const pipeline) { diff --git a/dynamic_vino_lib/src/outputs/image_window_output.cpp b/openvino_wrapper_lib/src/outputs/image_window_output.cpp similarity index 91% rename from dynamic_vino_lib/src/outputs/image_window_output.cpp rename to openvino_wrapper_lib/src/outputs/image_window_output.cpp index 29f70c63..1cb37940 100644 --- a/dynamic_vino_lib/src/outputs/image_window_output.cpp +++ b/openvino_wrapper_lib/src/outputs/image_window_output.cpp @@ -23,8 +23,8 @@ #include #include -#include "dynamic_vino_lib/outputs/image_window_output.hpp" -#include "dynamic_vino_lib/pipeline.hpp" +#include "openvino_wrapper_lib/outputs/image_window_output.hpp" +#include "openvino_wrapper_lib/pipeline.hpp" Outputs::ImageWindowOutput::ImageWindowOutput(const std::string & output_name, int focal_length) : BaseOutput(output_name), focal_length_(focal_length) @@ -64,7 +64,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(); @@ -75,7 +75,7 @@ void Outputs::ImageWindowOutput::accept( } 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(); @@ -87,7 +87,7 @@ void Outputs::ImageWindowOutput::accept( } 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(); @@ -98,7 +98,7 @@ void Outputs::ImageWindowOutput::accept( } 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(); @@ -111,7 +111,7 @@ void Outputs::ImageWindowOutput::accept( } 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(); @@ -133,7 +133,7 @@ void Outputs::ImageWindowOutput::accept( } 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(); @@ -144,7 +144,7 @@ void Outputs::ImageWindowOutput::accept( } void Outputs::ImageWindowOutput::mergeMask( - const std::vector & results) + const std::vector & results) { std::map class_color; for (unsigned i = 0; i < results.size(); i++) { @@ -179,7 +179,7 @@ void Outputs::ImageWindowOutput::mergeMask( } 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(); @@ -202,7 +202,7 @@ void Outputs::ImageWindowOutput::accept( void Outputs::ImageWindowOutput::mergeMask( - const std::vector & results) + const std::vector & results) { std::map class_color; for (unsigned i = 0; i < results.size(); i++) { @@ -224,7 +224,7 @@ void Outputs::ImageWindowOutput::mergeMask( } } 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(); @@ -246,7 +246,7 @@ void Outputs::ImageWindowOutput::accept( 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(); @@ -262,7 +262,7 @@ void Outputs::ImageWindowOutput::accept( } 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(); @@ -280,7 +280,7 @@ void Outputs::ImageWindowOutput::accept( } 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(); @@ -293,7 +293,7 @@ void Outputs::ImageWindowOutput::accept( } 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(); @@ -342,7 +342,7 @@ cv::Mat Outputs::ImageWindowOutput::getRotationTransform(double yaw, double pitc } void Outputs::ImageWindowOutput::accept( - const std::vector & results) + const std::vector & results) { for (unsigned i = 0; i < results.size(); i++) { auto result = results[i]; diff --git a/dynamic_vino_lib/src/outputs/ros_service_output.cpp b/openvino_wrapper_lib/src/outputs/ros_service_output.cpp similarity index 89% rename from dynamic_vino_lib/src/outputs/ros_service_output.cpp rename to openvino_wrapper_lib/src/outputs/ros_service_output.cpp index 08105a82..5220a29a 100644 --- a/dynamic_vino_lib/src/outputs/ros_service_output.cpp +++ b/openvino_wrapper_lib/src/outputs/ros_service_output.cpp @@ -20,7 +20,7 @@ #include #include #include -#include "dynamic_vino_lib/outputs/ros_service_output.hpp" +#include "openvino_wrapper_lib/outputs/ros_service_output.hpp" #include "cv_bridge/cv_bridge.h" void Outputs::RosServiceOutput::setServiceResponse( @@ -42,7 +42,7 @@ void Outputs::RosServiceOutput::setResponseForFace( } void Outputs::RosServiceOutput::setServiceResponse( - std::shared_ptr response) + std::shared_ptr response) { if (age_gender_topic_ != nullptr) { response->age_gender.objects = age_gender_topic_->objects; @@ -50,7 +50,7 @@ void Outputs::RosServiceOutput::setServiceResponse( } void Outputs::RosServiceOutput::setServiceResponse( - std::shared_ptr response) + std::shared_ptr response) { if (emotions_topic_ != nullptr) { response->emotion.emotions = emotions_topic_->emotions; @@ -58,7 +58,7 @@ void Outputs::RosServiceOutput::setServiceResponse( } void Outputs::RosServiceOutput::setServiceResponse( - std::shared_ptr response) + std::shared_ptr response) { if (headpose_topic_ != nullptr) { response->headpose.headposes = headpose_topic_->headposes; @@ -66,7 +66,7 @@ void Outputs::RosServiceOutput::setServiceResponse( } void Outputs::RosServiceOutput::setServiceResponse( - std::shared_ptr response) + std::shared_ptr response) { slog::info << "in People::Response ..."; if (faces_topic_ != nullptr) { diff --git a/dynamic_vino_lib/src/outputs/ros_topic_output.cpp b/openvino_wrapper_lib/src/outputs/ros_topic_output.cpp similarity index 73% rename from dynamic_vino_lib/src/outputs/ros_topic_output.cpp rename to openvino_wrapper_lib/src/outputs/ros_topic_output.cpp index 717792da..8a87d5f6 100644 --- a/dynamic_vino_lib/src/outputs/ros_topic_output.cpp +++ b/openvino_wrapper_lib/src/outputs/ros_topic_output.cpp @@ -20,9 +20,9 @@ #include #include #include -#include "dynamic_vino_lib/outputs/ros_topic_output.hpp" -#include "dynamic_vino_lib/pipeline_params.hpp" -#include "dynamic_vino_lib/pipeline.hpp" +#include "openvino_wrapper_lib/outputs/ros_topic_output.hpp" +#include "openvino_wrapper_lib/pipeline_params.hpp" +#include "openvino_wrapper_lib/pipeline.hpp" #include "cv_bridge/cv_bridge.h" Outputs::RosTopicOutput::RosTopicOutput(std::string output_name, @@ -34,19 +34,19 @@ Outputs::RosTopicOutput::RosTopicOutput(std::string output_name, } else { node_ = rclcpp::Node::make_shared(output_name + "_topic_publisher"); } - pub_license_plate_ = node_->create_publisher( + pub_license_plate_ = node_->create_publisher( "/openvino_toolkit/" + output_name_ + "/detected_license_plates", 16); - pub_vehicle_attribs_ = node_->create_publisher( + pub_vehicle_attribs_ = node_->create_publisher( "/openvino_toolkit/" + output_name_ + "/detected_vehicles_attribs", 16); - pub_landmarks_ = node_->create_publisher( + pub_landmarks_ = node_->create_publisher( "/openvino_toolkit/" + output_name_ + "/detected_landmarks", 16); - pub_face_reid_ = node_->create_publisher( + pub_face_reid_ = node_->create_publisher( "/openvino_toolkit/" + output_name_ + "/reidentified_faces", 16); - pub_person_attribs_ = node_->create_publisher( + pub_person_attribs_ = node_->create_publisher( "/openvino_toolkit/" + output_name_ + "/person_attributes", 16); - pub_person_reid_ = node_->create_publisher( + pub_person_reid_ = node_->create_publisher( "/openvino_toolkit/" + output_name_ + "/reidentified_persons", 16); - pub_segmented_object_ = node_->create_publisher( + pub_segmented_object_ = node_->create_publisher( "/openvino_toolkit/" + output_name_ + "/segmented_obejcts", 16); pub_detected_object_ = node_->create_publisher( "/openvino_toolkit/" + output_name_ + "/detected_objects", 16); @@ -54,12 +54,12 @@ Outputs::RosTopicOutput::RosTopicOutput(std::string output_name, node_->create_publisher( "/openvino_toolkit/" + output_name_ + "/faces", 16); pub_emotion_ = - node_->create_publisher( + node_->create_publisher( "/openvino_toolkit/" + output_name_ + "/emotions", 16); - pub_age_gender_ = node_->create_publisher( + pub_age_gender_ = node_->create_publisher( "/openvino_toolkit/" + output_name_ + "/age_genders", 16); pub_headpose_ = - node_->create_publisher( + node_->create_publisher( "/openvino_toolkit/" + output_name_ + "/headposes", 16); emotions_topic_ = nullptr; detected_objects_topic_ = nullptr; @@ -81,10 +81,10 @@ void Outputs::RosTopicOutput::feedFrame(const cv::Mat & frame) } void Outputs::RosTopicOutput::accept( - const std::vector & results) + const std::vector & results) { - vehicle_attribs_topic_ = std::make_shared(); - people_msgs::msg::VehicleAttribs attribs; + vehicle_attribs_topic_ = std::make_shared(); + openvino_people_msgs::msg::VehicleAttribs attribs; for (auto & r : results) { auto loc = r.getLocation(); attribs.roi.x_offset = loc.x; @@ -98,10 +98,10 @@ void Outputs::RosTopicOutput::accept( } void Outputs::RosTopicOutput::accept( - const std::vector & results) + const std::vector & results) { - license_plate_topic_ = std::make_shared(); - people_msgs::msg::LicensePlate plate; + license_plate_topic_ = std::make_shared(); + openvino_people_msgs::msg::LicensePlate plate; for (auto & r : results) { auto loc = r.getLocation(); plate.roi.x_offset = loc.x; @@ -114,10 +114,10 @@ void Outputs::RosTopicOutput::accept( } void Outputs::RosTopicOutput::accept( - const std::vector & results) + const std::vector & results) { - face_reid_topic_ = std::make_shared(); - people_msgs::msg::Reidentification face; + face_reid_topic_ = std::make_shared(); + openvino_people_msgs::msg::Reidentification face; for (auto & r : results) { auto loc = r.getLocation(); face.roi.x_offset = loc.x; @@ -130,10 +130,10 @@ void Outputs::RosTopicOutput::accept( } void Outputs::RosTopicOutput::accept( - const std::vector & results) + const std::vector & results) { - landmarks_topic_ = std::make_shared(); - people_msgs::msg::Landmark landmark; + landmarks_topic_ = std::make_shared(); + openvino_people_msgs::msg::Landmark landmark; for (auto & r : results) { auto loc = r.getLocation(); landmark.roi.x_offset = loc.x; @@ -152,10 +152,10 @@ void Outputs::RosTopicOutput::accept( } void Outputs::RosTopicOutput::accept( - const std::vector & results) + const std::vector & results) { - person_attribs_topic_ = std::make_shared(); - people_msgs::msg::PersonAttribute person_attrib; + person_attribs_topic_ = std::make_shared(); + openvino_people_msgs::msg::PersonAttribute person_attrib; for (auto & r : results) { auto loc = r.getLocation(); person_attrib.roi.x_offset = loc.x; @@ -168,10 +168,10 @@ void Outputs::RosTopicOutput::accept( } void Outputs::RosTopicOutput::accept( - const std::vector & results) + const std::vector & results) { - person_reid_topic_ = std::make_shared(); - people_msgs::msg::Reidentification person; + person_reid_topic_ = std::make_shared(); + openvino_people_msgs::msg::Reidentification person; for (auto & r : results) { auto loc = r.getLocation(); person.roi.x_offset = loc.x; @@ -184,10 +184,10 @@ void Outputs::RosTopicOutput::accept( } void Outputs::RosTopicOutput::accept( - const std::vector & results) + const std::vector & results) { - segmented_objects_topic_ = std::make_shared(); - people_msgs::msg::ObjectInMask object; + segmented_objects_topic_ = std::make_shared(); + openvino_people_msgs::msg::ObjectInMask object; for (auto & r : results) { auto loc = r.getLocation(); object.roi.x_offset = loc.x; @@ -207,10 +207,10 @@ void Outputs::RosTopicOutput::accept( } void Outputs::RosTopicOutput::accept( - const std::vector & results) + const std::vector & results) { - segmented_objects_topic_ = std::make_shared(); - people_msgs::msg::ObjectInMask object; + segmented_objects_topic_ = std::make_shared(); + openvino_people_msgs::msg::ObjectInMask object; for (auto & r : results) { auto loc = r.getLocation(); object.roi.x_offset = loc.x; @@ -230,7 +230,7 @@ void Outputs::RosTopicOutput::accept( } void Outputs::RosTopicOutput::accept( - const std::vector & results) + const std::vector & results) { detected_objects_topic_ = std::make_shared(); object_msgs::msg::ObjectInBox object; @@ -247,7 +247,7 @@ void Outputs::RosTopicOutput::accept( } void Outputs::RosTopicOutput::accept( - const std::vector & results) + const std::vector & results) { faces_topic_ = std::make_shared(); @@ -265,11 +265,11 @@ void Outputs::RosTopicOutput::accept( } } -void Outputs::RosTopicOutput::accept(const std::vector & results) +void Outputs::RosTopicOutput::accept(const std::vector & results) { - emotions_topic_ = std::make_shared(); + emotions_topic_ = std::make_shared(); - people_msgs::msg::Emotion emotion; + openvino_people_msgs::msg::Emotion emotion; for (auto r : results) { auto loc = r.getLocation(); emotion.roi.x_offset = loc.x; @@ -281,11 +281,11 @@ void Outputs::RosTopicOutput::accept(const std::vector & results) +void Outputs::RosTopicOutput::accept(const std::vector & results) { - age_gender_topic_ = std::make_shared(); + age_gender_topic_ = std::make_shared(); - people_msgs::msg::AgeGender ag; + openvino_people_msgs::msg::AgeGender ag; for (auto r : results) { auto loc = r.getLocation(); ag.roi.x_offset = loc.x; @@ -305,11 +305,11 @@ void Outputs::RosTopicOutput::accept(const std::vector & results) +void Outputs::RosTopicOutput::accept(const std::vector & results) { - headpose_topic_ = std::make_shared(); + headpose_topic_ = std::make_shared(); - people_msgs::msg::HeadPose hp; + openvino_people_msgs::msg::HeadPose hp; for (auto r : results) { auto loc = r.getLocation(); hp.roi.x_offset = loc.x; diff --git a/dynamic_vino_lib/src/outputs/rviz_output.cpp b/openvino_wrapper_lib/src/outputs/rviz_output.cpp similarity index 72% rename from dynamic_vino_lib/src/outputs/rviz_output.cpp rename to openvino_wrapper_lib/src/outputs/rviz_output.cpp index 647c219b..f35e6414 100644 --- a/dynamic_vino_lib/src/outputs/rviz_output.cpp +++ b/openvino_wrapper_lib/src/outputs/rviz_output.cpp @@ -22,8 +22,8 @@ #include #include #include "cv_bridge/cv_bridge.h" -#include "dynamic_vino_lib/pipeline.hpp" -#include "dynamic_vino_lib/outputs/rviz_output.hpp" +#include "openvino_wrapper_lib/pipeline.hpp" +#include "openvino_wrapper_lib/outputs/rviz_output.hpp" Outputs::RvizOutput::RvizOutput(std::string output_name, const rclcpp::Node::SharedPtr node) : BaseOutput(output_name) @@ -45,63 +45,63 @@ void Outputs::RvizOutput::feedFrame(const cv::Mat & frame) } 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) + 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) + 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) + 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) + 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/openvino_wrapper_lib/src/pipeline.cpp similarity index 95% rename from dynamic_vino_lib/src/pipeline.cpp rename to openvino_wrapper_lib/src/pipeline.cpp index ee583cd3..cd454103 100644 --- a/dynamic_vino_lib/src/pipeline.cpp +++ b/openvino_wrapper_lib/src/pipeline.cpp @@ -17,7 +17,7 @@ * @file pipeline.cpp */ -#include +#include #include #include #include @@ -25,9 +25,9 @@ #include #include -#include "dynamic_vino_lib/inputs/base_input.hpp" -#include "dynamic_vino_lib/inputs/image_input.hpp" -#include "dynamic_vino_lib/pipeline.hpp" +#include "openvino_wrapper_lib/inputs/base_input.hpp" +#include "openvino_wrapper_lib/inputs/image_input.hpp" +#include "openvino_wrapper_lib/pipeline.hpp" Pipeline::Pipeline(const std::string & name) { @@ -121,7 +121,7 @@ void Pipeline::addConnect(const std::string & parent, const std::string & name) bool Pipeline::add( const std::string & parent, const std::string & name, - std::shared_ptr inference) + std::shared_ptr inference) { if (parent.empty() || name.empty() || !isLegalConnect(parent, name)) { slog::err << "ARGuments ERROR when adding inference instance!" << slog::endl; @@ -138,14 +138,14 @@ bool Pipeline::add( 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 = + std::map>::iterator it = name_to_detection_map_.find(name); if (it != name_to_detection_map_.end()) { slog::warn << "inferance instance for [" << name << diff --git a/dynamic_vino_lib/src/pipeline_manager.cpp b/openvino_wrapper_lib/src/pipeline_manager.cpp similarity index 78% rename from dynamic_vino_lib/src/pipeline_manager.cpp rename to openvino_wrapper_lib/src/pipeline_manager.cpp index 9040209f..184ac922 100644 --- a/dynamic_vino_lib/src/pipeline_manager.cpp +++ b/openvino_wrapper_lib/src/pipeline_manager.cpp @@ -17,55 +17,55 @@ * @file pipeline_manager.cpp */ -#include +#include #include #include #include #include #if 0 -#include "dynamic_vino_lib/inferences/landmarks_detection.hpp" -#include "dynamic_vino_lib/inferences/face_reidentification.hpp" -#include "dynamic_vino_lib/models/face_reidentification_model.hpp" -#include "dynamic_vino_lib/models/landmarks_detection_model.hpp" +#include "openvino_wrapper_lib/inferences/landmarks_detection.hpp" +#include "openvino_wrapper_lib/inferences/face_reidentification.hpp" +#include "openvino_wrapper_lib/models/face_reidentification_model.hpp" +#include "openvino_wrapper_lib/models/landmarks_detection_model.hpp" #endif -#include "dynamic_vino_lib/models/vehicle_attribs_detection_model.hpp" -#include "dynamic_vino_lib/models/license_plate_detection_model.hpp" -#include "dynamic_vino_lib/models/person_reidentification_model.hpp" -#include "dynamic_vino_lib/models/person_attribs_detection_model.hpp" -#include "dynamic_vino_lib/inferences/vehicle_attribs_detection.hpp" -#include "dynamic_vino_lib/inferences/license_plate_detection.hpp" -#include "dynamic_vino_lib/inferences/person_reidentification.hpp" -#include "dynamic_vino_lib/inferences/person_attribs_detection.hpp" -#include "dynamic_vino_lib/inferences/face_detection.hpp" -#include "dynamic_vino_lib/models/face_detection_model.hpp" -#include "dynamic_vino_lib/inferences/age_gender_detection.hpp" -#include "dynamic_vino_lib/models/age_gender_detection_model.hpp" -#include "dynamic_vino_lib/inferences/emotions_detection.hpp" -#include "dynamic_vino_lib/models/emotion_detection_model.hpp" -#include "dynamic_vino_lib/inferences/head_pose_detection.hpp" -#include "dynamic_vino_lib/models/head_pose_detection_model.hpp" -#include "dynamic_vino_lib/models/object_detection_yolov5_model.hpp" -#include "dynamic_vino_lib/models/object_detection_ssd_model.hpp" -#include "dynamic_vino_lib/inferences/object_segmentation.hpp" -#include "dynamic_vino_lib/models/object_segmentation_model.hpp" -#include "dynamic_vino_lib/inputs/base_input.hpp" -#include "dynamic_vino_lib/inputs/image_input.hpp" -#include "dynamic_vino_lib/inputs/realsense_camera.hpp" -#include "dynamic_vino_lib/inputs/realsense_camera_topic.hpp" -#include "dynamic_vino_lib/inputs/standard_camera.hpp" -#include "dynamic_vino_lib/inputs/ip_camera.hpp" -#include "dynamic_vino_lib/inputs/video_input.hpp" -#include "dynamic_vino_lib/outputs/image_window_output.hpp" -#include "dynamic_vino_lib/outputs/ros_topic_output.hpp" -#include "dynamic_vino_lib/outputs/rviz_output.hpp" -#include "dynamic_vino_lib/outputs/ros_service_output.hpp" -#include "dynamic_vino_lib/pipeline.hpp" -#include "dynamic_vino_lib/pipeline_manager.hpp" -#include "dynamic_vino_lib/pipeline_params.hpp" -#include "dynamic_vino_lib/services/pipeline_processing_server.hpp" -#include "dynamic_vino_lib/engines/engine_manager.hpp" +#include "openvino_wrapper_lib/models/vehicle_attribs_detection_model.hpp" +#include "openvino_wrapper_lib/models/license_plate_detection_model.hpp" +#include "openvino_wrapper_lib/models/person_reidentification_model.hpp" +#include "openvino_wrapper_lib/models/person_attribs_detection_model.hpp" +#include "openvino_wrapper_lib/inferences/vehicle_attribs_detection.hpp" +#include "openvino_wrapper_lib/inferences/license_plate_detection.hpp" +#include "openvino_wrapper_lib/inferences/person_reidentification.hpp" +#include "openvino_wrapper_lib/inferences/person_attribs_detection.hpp" +#include "openvino_wrapper_lib/inferences/face_detection.hpp" +#include "openvino_wrapper_lib/models/face_detection_model.hpp" +#include "openvino_wrapper_lib/inferences/age_gender_detection.hpp" +#include "openvino_wrapper_lib/models/age_gender_detection_model.hpp" +#include "openvino_wrapper_lib/inferences/emotions_detection.hpp" +#include "openvino_wrapper_lib/models/emotion_detection_model.hpp" +#include "openvino_wrapper_lib/inferences/head_pose_detection.hpp" +#include "openvino_wrapper_lib/models/head_pose_detection_model.hpp" +#include "openvino_wrapper_lib/models/object_detection_yolov5_model.hpp" +#include "openvino_wrapper_lib/models/object_detection_ssd_model.hpp" +#include "openvino_wrapper_lib/inferences/object_segmentation.hpp" +#include "openvino_wrapper_lib/models/object_segmentation_model.hpp" +#include "openvino_wrapper_lib/inputs/base_input.hpp" +#include "openvino_wrapper_lib/inputs/image_input.hpp" +#include "openvino_wrapper_lib/inputs/realsense_camera.hpp" +#include "openvino_wrapper_lib/inputs/realsense_camera_topic.hpp" +#include "openvino_wrapper_lib/inputs/standard_camera.hpp" +#include "openvino_wrapper_lib/inputs/ip_camera.hpp" +#include "openvino_wrapper_lib/inputs/video_input.hpp" +#include "openvino_wrapper_lib/outputs/image_window_output.hpp" +#include "openvino_wrapper_lib/outputs/ros_topic_output.hpp" +#include "openvino_wrapper_lib/outputs/rviz_output.hpp" +#include "openvino_wrapper_lib/outputs/ros_service_output.hpp" +#include "openvino_wrapper_lib/pipeline.hpp" +#include "openvino_wrapper_lib/pipeline_manager.hpp" +#include "openvino_wrapper_lib/pipeline_params.hpp" +#include "openvino_wrapper_lib/services/pipeline_processing_server.hpp" +#include "openvino_wrapper_lib/engines/engine_manager.hpp" std::shared_ptr PipelineManager::createPipeline(const Params::ParamManager::PipelineRawData & params, rclcpp::Node::SharedPtr node) @@ -186,16 +186,16 @@ PipelineManager::parseOutput(const PipelineData & pdata) return outputs; } -std::map> +std::map> PipelineManager::parseInference(const Params::ParamManager::PipelineRawData & params) { - std::map> inferences; + 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 (infer.name == kInferTpye_FaceDetection) { object = createFaceDetection(infer); @@ -237,46 +237,46 @@ PipelineManager::parseInference(const Params::ParamManager::PipelineRawData & pa } -std::shared_ptr +std::shared_ptr PipelineManager::createFaceDetection( const Params::ParamManager::InferenceRawData & infer) { return createObjectDetection(infer); } -std::shared_ptr +std::shared_ptr PipelineManager::createAgeGenderRecognition(const Params::ParamManager::InferenceRawData & param) { auto model = std::make_shared(param.label, param.model, param.batch); model->modelInit(); auto engine = engine_manager_.createEngine(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::InferenceRawData & param) { auto model = std::make_shared(param.label, param.model, param.batch); model->modelInit(); auto engine = engine_manager_.createEngine(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::InferenceRawData & param) { auto model = std::make_shared(param.label, param.model, param.batch); model->modelInit(); auto engine = engine_manager_.createEngine(param.engine, model); - auto infer = std::make_shared(); + auto infer = std::make_shared(); infer->loadNetwork(model); infer->loadEngine(engine); @@ -284,12 +284,12 @@ PipelineManager::createHeadPoseEstimation(const Params::ParamManager::InferenceR } -std::shared_ptr +std::shared_ptr PipelineManager::createObjectDetection( const Params::ParamManager::InferenceRawData & infer) { std::shared_ptr object_detection_model; - std::shared_ptr object_inference_ptr; + std::shared_ptr object_inference_ptr; slog::debug << "for test in createObjectDetection()" << slog::endl; if (infer.model_type == kInferTpye_ObjectDetectionTypeSSD) { object_detection_model = @@ -301,7 +301,7 @@ PipelineManager::createObjectDetection( } slog::debug << "for test in createObjectDetection(), Created SSDModel" << slog::endl; - object_inference_ptr = std::make_shared( + object_inference_ptr = std::make_shared( infer.enable_roi_constraint, infer.confidence_threshold); // To-do theshold configuration slog::debug << "for test in createObjectDetection(), before modelInit()" << slog::endl; object_detection_model->modelInit(); @@ -314,7 +314,7 @@ PipelineManager::createObjectDetection( return object_inference_ptr; } -std::shared_ptr +std::shared_ptr PipelineManager::createObjectSegmentation(const Params::ParamManager::InferenceRawData & infer) { auto model = @@ -323,7 +323,7 @@ PipelineManager::createObjectSegmentation(const Params::ParamManager::InferenceR slog::info << "Segmentation model initialized." << slog::endl; auto engine = engine_manager_.createEngine(infer.engine, model); slog::info << "Segmentation Engine initialized." << slog::endl; - auto segmentation_inference_ptr = std::make_shared( + auto segmentation_inference_ptr = std::make_shared( infer.confidence_threshold); slog::info << "Segmentation Inference instanced." << slog::endl; segmentation_inference_ptr->loadNetwork(model); @@ -332,7 +332,7 @@ PipelineManager::createObjectSegmentation(const Params::ParamManager::InferenceR return segmentation_inference_ptr; } -std::shared_ptr +std::shared_ptr PipelineManager::createObjectSegmentationMaskrcnn(const Params::ParamManager::InferenceRawData & infer) { auto model = @@ -341,7 +341,7 @@ PipelineManager::createObjectSegmentationMaskrcnn(const Params::ParamManager::In slog::info << "Segmentation model initialized." << slog::endl; auto engine = engine_manager_.createEngine(infer.engine, model); slog::info << "Segmentation Engine initialized." << slog::endl; - auto segmentation_inference_ptr = std::make_shared( + auto segmentation_inference_ptr = std::make_shared( infer.confidence_threshold); slog::info << "Segmentation Inference instanced." << slog::endl; segmentation_inference_ptr->loadNetwork(model); @@ -350,12 +350,12 @@ PipelineManager::createObjectSegmentationMaskrcnn(const Params::ParamManager::In return segmentation_inference_ptr; } -std::shared_ptr +std::shared_ptr PipelineManager::createPersonReidentification( const Params::ParamManager::InferenceRawData & infer) { std::shared_ptr person_reidentification_model; - std::shared_ptr reidentification_inference_ptr; + std::shared_ptr reidentification_inference_ptr; slog::debug << "for test in createPersonReidentification()"<(infer.label, infer.model, infer.batch); @@ -363,7 +363,7 @@ PipelineManager::createPersonReidentification( slog::info << "Reidentification model initialized" << slog::endl; auto person_reidentification_engine = engine_manager_.createEngine(infer.engine, person_reidentification_model); reidentification_inference_ptr = - std::make_shared(infer.confidence_threshold); + std::make_shared(infer.confidence_threshold); slog::debug<< "for test in createPersonReidentification(), before loadNetwork"<loadNetwork(person_reidentification_model); reidentification_inference_ptr->loadEngine(person_reidentification_engine); @@ -372,7 +372,7 @@ PipelineManager::createPersonReidentification( return reidentification_inference_ptr; } -std::shared_ptr +std::shared_ptr PipelineManager::createVehicleAttribsDetection( const Params::ParamManager::InferenceRawData & infer) { @@ -381,14 +381,14 @@ PipelineManager::createVehicleAttribsDetection( model->modelInit(); auto engine = engine_manager_.createEngine(infer.engine, model); auto vehicle_attribs_ptr = - std::make_shared(); + std::make_shared(); vehicle_attribs_ptr->loadNetwork(model); vehicle_attribs_ptr->loadEngine(engine); return vehicle_attribs_ptr; } -std::shared_ptr +std::shared_ptr PipelineManager::createLicensePlateDetection( const Params::ParamManager::InferenceRawData & infer) { @@ -397,14 +397,14 @@ PipelineManager::createLicensePlateDetection( model->modelInit(); auto engine = engine_manager_.createEngine(infer.engine, model); auto license_plate_ptr = - std::make_shared(); + std::make_shared(); license_plate_ptr->loadNetwork(model); license_plate_ptr->loadEngine(engine); return license_plate_ptr; } -std::shared_ptr +std::shared_ptr PipelineManager::createPersonAttribsDetection( const Params::ParamManager::InferenceRawData & infer) { @@ -414,7 +414,7 @@ PipelineManager::createPersonAttribsDetection( model->modelInit(); auto engine = engine_manager_.createEngine(infer.engine, model); auto attribs_inference_ptr = - std::make_shared(infer.confidence_threshold); + std::make_shared(infer.confidence_threshold); attribs_inference_ptr->loadNetwork(model); attribs_inference_ptr->loadEngine(engine); @@ -422,7 +422,7 @@ PipelineManager::createPersonAttribsDetection( } #if 0 -std::shared_ptr +std::shared_ptr PipelineManager::createPersonReidentification( const Params::ParamManager::InferenceRawData & infer) { @@ -431,14 +431,14 @@ PipelineManager::createPersonReidentification( model->modelInit(); auto engine = engine_manager_.createEngine(infer.engine, model); auto reidentification_inference_ptr = - std::make_shared(infer.confidence_threshold); + std::make_shared(infer.confidence_threshold); reidentification_inference_ptr->loadNetwork(model); reidentification_inference_ptr->loadEngine(engine); return reidentification_inference_ptr; } -std::shared_ptr +std::shared_ptr PipelineManager::createPersonAttribsDetection( const Params::ParamManager::InferenceRawData & infer) { @@ -448,14 +448,14 @@ PipelineManager::createPersonAttribsDetection( model->modelInit(); auto engine = engine_manager_.createEngine(infer.engine, model); auto attribs_inference_ptr = - std::make_shared(infer.confidence_threshold); + std::make_shared(infer.confidence_threshold); attribs_inference_ptr->loadNetwork(model); attribs_inference_ptr->loadEngine(engine); return attribs_inference_ptr; } -std::shared_ptr +std::shared_ptr PipelineManager::createLandmarksDetection( const Params::ParamManager::InferenceRawData & infer) { @@ -464,14 +464,14 @@ PipelineManager::createLandmarksDetection( model->modelInit(); auto engine = engine_manager_.createEngine(infer.engine, model); auto landmarks_inference_ptr = - std::make_shared(); + std::make_shared(); landmarks_inference_ptr->loadNetwork(model); landmarks_inference_ptr->loadEngine(engine); return landmarks_inference_ptr; } -std::shared_ptr +std::shared_ptr PipelineManager::createFaceReidentification( const Params::ParamManager::InferenceRawData & infer) { @@ -480,14 +480,14 @@ PipelineManager::createFaceReidentification( model->modelInit(); auto engine = engine_manager_.createEngine(infer.engine, model); auto face_reid_ptr = - std::make_shared(infer.confidence_threshold); + std::make_shared(infer.confidence_threshold); face_reid_ptr->loadNetwork(model); face_reid_ptr->loadEngine(engine); return face_reid_ptr; } -std::shared_ptr +std::shared_ptr PipelineManager::createVehicleAttribsDetection( const Params::ParamManager::InferenceRawData & infer) { @@ -496,14 +496,14 @@ PipelineManager::createVehicleAttribsDetection( model->modelInit(); auto engine = engine_manager_.createEngine(infer.engine, model); auto vehicle_attribs_ptr = - std::make_shared(); + std::make_shared(); vehicle_attribs_ptr->loadNetwork(model); vehicle_attribs_ptr->loadEngine(engine); return vehicle_attribs_ptr; } -std::shared_ptr +std::shared_ptr PipelineManager::createLicensePlateDetection( const Params::ParamManager::InferenceRawData & infer) { @@ -512,7 +512,7 @@ PipelineManager::createLicensePlateDetection( model->modelInit(); auto engine = engine_manager_.createEngine(infer.engine, model); auto license_plate_ptr = - std::make_shared(); + std::make_shared(); license_plate_ptr->loadNetwork(model); license_plate_ptr->loadEngine(engine); @@ -573,7 +573,7 @@ void PipelineManager::runAll() void PipelineManager::runService() { auto node = std::make_shared>("pipeline_service"); + >("pipeline_service"); while (service_.state != PipelineState_ThreadStopped && service_.thread != nullptr) { rclcpp::spin_some(node); std::this_thread::sleep_for(std::chrono::milliseconds(1)); diff --git a/dynamic_vino_lib/src/pipeline_params.cpp b/openvino_wrapper_lib/src/pipeline_params.cpp similarity index 95% rename from dynamic_vino_lib/src/pipeline_params.cpp rename to openvino_wrapper_lib/src/pipeline_params.cpp index 43bc953c..9b9b3c41 100644 --- a/dynamic_vino_lib/src/pipeline_params.cpp +++ b/openvino_wrapper_lib/src/pipeline_params.cpp @@ -17,11 +17,11 @@ * @file pipeline.cpp */ -#include +#include #include #include #include -#include "dynamic_vino_lib/pipeline_params.hpp" +#include "openvino_wrapper_lib/pipeline_params.hpp" PipelineParams::PipelineParams(const std::string & name) { diff --git a/dynamic_vino_lib/src/services/frame_processing_server.cpp b/openvino_wrapper_lib/src/services/frame_processing_server.cpp similarity index 85% rename from dynamic_vino_lib/src/services/frame_processing_server.cpp rename to openvino_wrapper_lib/src/services/frame_processing_server.cpp index 3a97a036..052751dc 100644 --- a/dynamic_vino_lib/src/services/frame_processing_server.cpp +++ b/openvino_wrapper_lib/src/services/frame_processing_server.cpp @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dynamic_vino_lib/services/frame_processing_server.hpp" -#include +#include "openvino_wrapper_lib/services/frame_processing_server.hpp" +#include #include #include -#include +#include #include #include #include @@ -25,11 +25,11 @@ #include #include -#include "dynamic_vino_lib/pipeline_manager.hpp" -#include "dynamic_vino_lib/pipeline.hpp" -#include "dynamic_vino_lib/inputs/base_input.hpp" -#include "dynamic_vino_lib/inputs/image_input.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/pipeline_manager.hpp" +#include "openvino_wrapper_lib/pipeline.hpp" +#include "openvino_wrapper_lib/inputs/base_input.hpp" +#include "openvino_wrapper_lib/inputs/image_input.hpp" +#include "openvino_wrapper_lib/slog.hpp" namespace vino_service { @@ -93,5 +93,5 @@ void FrameProcessingServer::cbService( } template class FrameProcessingServer; -template class FrameProcessingServer; +template class FrameProcessingServer; } // namespace vino_service diff --git a/dynamic_vino_lib/src/services/pipeline_processing_server.cpp b/openvino_wrapper_lib/src/services/pipeline_processing_server.cpp similarity index 88% rename from dynamic_vino_lib/src/services/pipeline_processing_server.cpp rename to openvino_wrapper_lib/src/services/pipeline_processing_server.cpp index 7323c6f6..b24fb2eb 100644 --- a/dynamic_vino_lib/src/services/pipeline_processing_server.cpp +++ b/openvino_wrapper_lib/src/services/pipeline_processing_server.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dynamic_vino_lib/services/pipeline_processing_server.hpp" +#include "openvino_wrapper_lib/services/pipeline_processing_server.hpp" #include -#include +#include #include #include #include @@ -23,9 +23,9 @@ #include #include -#include "dynamic_vino_lib/pipeline_manager.hpp" -#include "dynamic_vino_lib/pipeline.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/pipeline_manager.hpp" +#include "openvino_wrapper_lib/pipeline.hpp" +#include "openvino_wrapper_lib/slog.hpp" namespace vino_service { @@ -52,13 +52,13 @@ void PipelineProcessingServer::setResponse( std::shared_ptr response) { for (auto it = pipelines_->begin(); it != pipelines_->end(); ++it) { - pipeline_srv_msgs::msg::Pipeline pipeline_msg; + openvino_msgs::msg::Pipeline pipeline_msg; pipeline_msg.name = it->first; pipeline_msg.running_status = std::to_string(it->second.state); auto connection_map = it->second.pipeline->getPipelineDetail(); for (auto & current_pipe : connection_map) { - pipeline_srv_msgs::msg::Connection connection; + openvino_msgs::msg::Connection connection; connection.input = current_pipe.first.c_str(); connection.output = current_pipe.second.c_str(); pipeline_msg.connections.push_back(connection); @@ -100,5 +100,5 @@ void PipelineProcessingServer::cbService( } setResponse(response); } -template class PipelineProcessingServer; +template class PipelineProcessingServer; } // namespace vino_service diff --git a/sample/CMakeLists.txt b/sample/CMakeLists.txt index bd9b9ddc..6452c709 100644 --- a/sample/CMakeLists.txt +++ b/sample/CMakeLists.txt @@ -11,7 +11,7 @@ set(OpenVINO_LIBRARIES openvino::runtime) cmake_minimum_required(VERSION 3.5) -project(dynamic_vino_sample) +project(openvino_node) # Default to C++17 if(NOT CMAKE_CXX_STANDARD) @@ -38,11 +38,11 @@ find_package(rcutils) find_package(OpenCV REQUIRED) find_package(cv_bridge REQUIRED) find_package(OpenVINO REQUIRED) -find_package(dynamic_vino_lib REQUIRED) +find_package(openvino_wrapper_lib REQUIRED) find_package(object_msgs REQUIRED) -find_package(people_msgs REQUIRED) -find_package(pipeline_srv_msgs REQUIRED) -find_package(vino_param_lib REQUIRED) +find_package(openvino_people_msgs REQUIRED) +find_package(openvino_msgs REQUIRED) +find_package(openvino_param_lib REQUIRED) find_package(yaml_cpp_vendor REQUIRED) find_package(realsense2 REQUIRED) find_package(rclcpp_components) @@ -97,8 +97,8 @@ source_group("include" FILES ${MAIN_HEADERS}) include_directories(${OpenCV_INCLUDE_DIRS}) include_directories(${PROJECT_SOURCE_DIR}/include) -include_directories(${dynamic_vino_lib_INCLUDE_DIRS}) -include_directories(${vino_param_lib_INCLUDE_DIRS}) +include_directories(${openvino_wrapper_lib_INCLUDE_DIRS}) +include_directories(${openvino_param_lib_INCLUDE_DIRS}) include_directories(${OpenVINO_DIRS}) include_directories(${realsense2_INCLUDE_DIRS}) @@ -115,8 +115,8 @@ target_link_libraries(vino_param_sample ) ament_target_dependencies(vino_param_sample - "vino_param_lib" - "dynamic_vino_lib" + "openvino_param_lib" + "openvino_wrapper_lib" "yaml_cpp_vendor" ) @@ -133,11 +133,11 @@ ament_target_dependencies(pipeline_with_params "object_msgs" "ament_index_cpp" "class_loader" - "dynamic_vino_lib" + "openvino_wrapper_lib" "OpenVINO" - "people_msgs" - "pipeline_srv_msgs" - "vino_param_lib" + "openvino_people_msgs" + "openvino_msgs" + "openvino_param_lib" "OpenCV" "yaml_cpp_vendor" "realsense2" @@ -157,11 +157,11 @@ ament_target_dependencies(composable_pipeline "object_msgs" "ament_index_cpp" "class_loader" - "dynamic_vino_lib" + "openvino_wrapper_lib" "OpenVINO" - "people_msgs" - "pipeline_srv_msgs" - "vino_param_lib" + "openvino_people_msgs" + "openvino_msgs" + "openvino_param_lib" "OpenCV" "yaml_cpp_vendor" "realsense2" @@ -181,11 +181,11 @@ ament_target_dependencies(image_object_server "object_msgs" "ament_index_cpp" "class_loader" - "dynamic_vino_lib" + "openvino_wrapper_lib" "OpenVINO" - "people_msgs" - "pipeline_srv_msgs" - "vino_param_lib" + "openvino_people_msgs" + "openvino_msgs" + "openvino_param_lib" "OpenCV" ) @@ -202,11 +202,11 @@ ament_target_dependencies(image_people_server "object_msgs" "ament_index_cpp" "class_loader" - "dynamic_vino_lib" + "openvino_wrapper_lib" "OpenVINO" - "people_msgs" - "pipeline_srv_msgs" - "vino_param_lib" + "openvino_people_msgs" + "openvino_msgs" + "openvino_param_lib" "OpenCV" ) @@ -223,11 +223,11 @@ ament_target_dependencies(image_object_client "object_msgs" "ament_index_cpp" "class_loader" - "dynamic_vino_lib" + "openvino_wrapper_lib" "OpenVINO" - "people_msgs" - "pipeline_srv_msgs" - "vino_param_lib" + "openvino_people_msgs" + "openvino_msgs" + "openvino_param_lib" "OpenCV" ) @@ -244,11 +244,11 @@ ament_target_dependencies(image_people_client "object_msgs" "ament_index_cpp" "class_loader" - "dynamic_vino_lib" + "openvino_wrapper_lib" "OpenVINO" - "people_msgs" - "pipeline_srv_msgs" - "vino_param_lib" + "openvino_people_msgs" + "openvino_msgs" + "openvino_param_lib" "OpenCV" ) diff --git a/sample/launch/image_object_server.launch.py b/sample/launch/image_object_server.launch.py index 2d3bbbba..cdf978cd 100644 --- a/sample/launch/image_object_server.launch.py +++ b/sample/launch/image_object_server.launch.py @@ -22,12 +22,12 @@ def generate_launch_description(): - default_yaml = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param', + default_yaml = os.path.join(get_package_share_directory('openvino_node'), 'param', 'image_object_server.yaml') return LaunchDescription([ # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', node_executable='image_object_server', + package='openvino_node', node_executable='image_object_server', arguments=['-config', default_yaml], output='screen'), ]) diff --git a/sample/launch/image_people_server.launch.py b/sample/launch/image_people_server.launch.py index c0a4ee57..0e2873d1 100644 --- a/sample/launch/image_people_server.launch.py +++ b/sample/launch/image_people_server.launch.py @@ -22,12 +22,12 @@ def generate_launch_description(): - default_yaml = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param', + default_yaml = os.path.join(get_package_share_directory('openvino_node'), 'param', 'image_people_server.yaml') return LaunchDescription([ # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', node_executable='image_people_server', + package='openvino_node', node_executable='image_people_server', arguments=['-config', default_yaml], output='screen'), ]) diff --git a/sample/launch/multi_pipeline_service.launch.py b/sample/launch/multi_pipeline_service.launch.py index 2bcdd2f6..aacc6973 100644 --- a/sample/launch/multi_pipeline_service.launch.py +++ b/sample/launch/multi_pipeline_service.launch.py @@ -22,14 +22,14 @@ def generate_launch_description(): - default_yaml = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param', + default_yaml = os.path.join(get_package_share_directory('openvino_node'), 'param', 'multi_pipleine_service.yaml') - default_rviz = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'launch', + default_rviz = os.path.join(get_package_share_directory('openvino_node'), 'launch', 'rviz/default2.rviz') return LaunchDescription([ # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', node_executable='pipeline_with_params', + package='openvino_node', node_executable='pipeline_with_params', arguments=['-config', default_yaml], remappings=[ ('/openvino_toolkit/object1/detected_objects', diff --git a/sample/launch/pipeline_composite_object_topic.launch.py b/sample/launch/pipeline_composite_object_topic.launch.py index 5184448f..767a28ed 100644 --- a/sample/launch/pipeline_composite_object_topic.launch.py +++ b/sample/launch/pipeline_composite_object_topic.launch.py @@ -5,7 +5,7 @@ import os def generate_launch_description(): - default_yaml = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param', + default_yaml = os.path.join(get_package_share_directory('openvino_node'), 'param', 'pipeline_composite_object_topic.yaml') container = ComposableNodeContainer( node_name='vision_pipeline', @@ -20,7 +20,7 @@ def generate_launch_description(): parameters=[get_package_share_directory('realsense_examples')+'/config/d435i.yaml'], extra_arguments=[{'use_intra_process_comms':'true'}]), ComposableNode( - package='dynamic_vino_sample', + package='openvino_node', node_plugin='ComposablePipeline', node_name='composable_pipeline', parameters=[{"config":default_yaml}], diff --git a/sample/launch/pipeline_face_reidentification.launch.py b/sample/launch/pipeline_face_reidentification.launch.py index 758cc881..5a2ceb51 100644 --- a/sample/launch/pipeline_face_reidentification.launch.py +++ b/sample/launch/pipeline_face_reidentification.launch.py @@ -24,16 +24,16 @@ import launch def generate_launch_description(): - #default_yaml = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param', + #default_yaml = os.path.join(get_package_share_directory('openvino_node'), 'param', #'pipeline_face_reidentification.yaml') - default_rviz = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'launch', + default_rviz = os.path.join(get_package_share_directory('openvino_node'), 'launch', 'rviz/default.rviz') return LaunchDescription([ launch.actions.DeclareLaunchArgument(name='yaml_path', default_value = - os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param','pipeline_face_reidentification.yaml')), + os.path.join(get_package_share_directory('openvino_node'), 'param','pipeline_face_reidentification.yaml')), # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', + package='openvino_node', executable='pipeline_with_params', #arguments=['-config', default_yaml], arguments=['-config', LaunchConfiguration('yaml_path')], diff --git a/sample/launch/pipeline_image.launch.py b/sample/launch/pipeline_image.launch.py index 4aa1c41a..0ac9f013 100644 --- a/sample/launch/pipeline_image.launch.py +++ b/sample/launch/pipeline_image.launch.py @@ -24,16 +24,16 @@ import launch def generate_launch_description(): - #default_yaml = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param', + #default_yaml = os.path.join(get_package_share_directory('openvino_node'), 'param', #'pipeline_image.yaml') - default_rviz = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'launch', + default_rviz = os.path.join(get_package_share_directory('openvino_node'), 'launch', 'rviz/default.rviz') return LaunchDescription([ launch.actions.DeclareLaunchArgument(name='yaml_path', default_value = - os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param','pipeline_image.yaml')), + os.path.join(get_package_share_directory('openvino_node'), 'param','pipeline_image.yaml')), # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', + package='openvino_node', executable='pipeline_with_params', arguments=['-config', LaunchConfiguration('yaml_path')], remappings=[ diff --git a/sample/launch/pipeline_object.launch.py b/sample/launch/pipeline_object.launch.py index c61ac818..457faae1 100644 --- a/sample/launch/pipeline_object.launch.py +++ b/sample/launch/pipeline_object.launch.py @@ -24,16 +24,16 @@ import launch def generate_launch_description(): - #default_yaml = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param', + #default_yaml = os.path.join(get_package_share_directory('openvino_node'), 'param', #'pipeline_object.yaml') - default_rviz = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'launch', + default_rviz = os.path.join(get_package_share_directory('openvino_node'), 'launch', 'rviz/default.rviz') return LaunchDescription([ launch.actions.DeclareLaunchArgument(name='yaml_path', default_value = - os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param','pipeline_object.yaml')), + os.path.join(get_package_share_directory('openvino_node'), 'param','pipeline_object.yaml')), # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', + package='openvino_node', executable='pipeline_with_params', arguments=['-config', LaunchConfiguration('yaml_path')], remappings=[ diff --git a/sample/launch/pipeline_object_topic.launch.py b/sample/launch/pipeline_object_topic.launch.py index aca2810b..07de7471 100644 --- a/sample/launch/pipeline_object_topic.launch.py +++ b/sample/launch/pipeline_object_topic.launch.py @@ -24,20 +24,20 @@ import launch def generate_launch_description(): - #default_yaml = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param', + #default_yaml = os.path.join(get_package_share_directory('openvino_node'), 'param', #'pipeline_object_topic.yaml') - default_rviz = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'launch', + default_rviz = os.path.join(get_package_share_directory('openvino_node'), 'launch', 'rviz/default.rviz') return LaunchDescription([ launch.actions.DeclareLaunchArgument(name='yaml_path', default_value = - os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param','pipeline_object_topic.yaml')), + os.path.join(get_package_share_directory('openvino_node'), 'param','pipeline_object_topic.yaml')), # Realsense # NOTE: Split realsense_node launching from OpenVINO package, which # will be launched by RDK launching file or manually. # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', + package='openvino_node', executable='pipeline_with_params', arguments=['-config', LaunchConfiguration('yaml_path')], remappings=[ diff --git a/sample/launch/pipeline_object_yolo.launch.py b/sample/launch/pipeline_object_yolo.launch.py index 0cd67db9..d5df63ac 100644 --- a/sample/launch/pipeline_object_yolo.launch.py +++ b/sample/launch/pipeline_object_yolo.launch.py @@ -24,16 +24,16 @@ import launch def generate_launch_description(): - #default_yaml = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param', + #default_yaml = os.path.join(get_package_share_directory('openvino_node'), 'param', #'pipeline_object_yolo.yaml') - default_rviz = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'launch', + default_rviz = os.path.join(get_package_share_directory('openvino_node'), 'launch', 'rviz/default.rviz') return LaunchDescription([ launch.actions.DeclareLaunchArgument(name='yaml_path', default_value = - os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param','pipeline_object_yolo.yaml')), + os.path.join(get_package_share_directory('openvino_node'), 'param','pipeline_object_yolo.yaml')), # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', + package='openvino_node', executable='pipeline_with_params', arguments=['-config', LaunchConfiguration('yaml_path')], remappings=[ diff --git a/sample/launch/pipeline_object_yolo_topic.launch.py b/sample/launch/pipeline_object_yolo_topic.launch.py index 28ec64ed..451f4b95 100644 --- a/sample/launch/pipeline_object_yolo_topic.launch.py +++ b/sample/launch/pipeline_object_yolo_topic.launch.py @@ -24,20 +24,20 @@ import launch def generate_launch_description(): - #default_yaml = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param', + #default_yaml = os.path.join(get_package_share_directory('openvino_node'), 'param', #'pipeline_object_yolo_topic.yaml') - default_rviz = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'launch', + default_rviz = os.path.join(get_package_share_directory('openvino_node'), 'launch', 'rviz/default.rviz') return LaunchDescription([ launch.actions.DeclareLaunchArgument(name='yaml_path', default_value = - os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param','pipeline_object_yolo_topic.yaml')), + os.path.join(get_package_share_directory('openvino_node'), 'param','pipeline_object_yolo_topic.yaml')), # Realsense # NOTE: Split realsense_node launching from OpenVINO package, which # will be launched by RDK launching file or manually. # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', + package='openvino_node', executable='pipeline_with_params', arguments=['-config', LaunchConfiguration('yaml_path')], remappings=[ diff --git a/sample/launch/pipeline_people.launch.py b/sample/launch/pipeline_people.launch.py index b1c9e213..88386dcd 100644 --- a/sample/launch/pipeline_people.launch.py +++ b/sample/launch/pipeline_people.launch.py @@ -25,17 +25,17 @@ def generate_launch_description(): - #default_yaml = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param', + #default_yaml = os.path.join(get_package_share_directory('openvino_node'), 'param', #'pipeline_people.yaml') - default_rviz = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'launch', + default_rviz = os.path.join(get_package_share_directory('openvino_node'), 'launch', 'rviz/default.rviz') return LaunchDescription([ launch.actions.DeclareLaunchArgument(name='yaml_path', default_value = - os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param','pipeline_people.yaml')), + os.path.join(get_package_share_directory('openvino_node'), 'param','pipeline_people.yaml')), # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', + package='openvino_node', executable='pipeline_with_params', arguments=['-config', LaunchConfiguration('yaml_path')], remappings=[ diff --git a/sample/launch/pipeline_people_ip.launch.py b/sample/launch/pipeline_people_ip.launch.py index 8f97e5d7..eb69a212 100644 --- a/sample/launch/pipeline_people_ip.launch.py +++ b/sample/launch/pipeline_people_ip.launch.py @@ -24,16 +24,16 @@ import launch def generate_launch_description(): - #default_yaml = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param', + #default_yaml = os.path.join(get_package_share_directory('openvino_node'), 'param', #'pipeline_people_ip.yaml') - default_rviz = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'launch', + default_rviz = os.path.join(get_package_share_directory('openvino_node'), 'launch', 'rviz/default.rviz') return LaunchDescription([ launch.actions.DeclareLaunchArgument(name='yaml_path', default_value = - os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param','pipeline_people_ip.yaml')), + os.path.join(get_package_share_directory('openvino_node'), 'param','pipeline_people_ip.yaml')), # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', + package='openvino_node', executable='pipeline_with_params', arguments=['-config', LaunchConfiguration('yaml_path')], remappings=[ diff --git a/sample/launch/pipeline_person_attributes.launch.py b/sample/launch/pipeline_person_attributes.launch.py index 467e7b07..10645ca2 100644 --- a/sample/launch/pipeline_person_attributes.launch.py +++ b/sample/launch/pipeline_person_attributes.launch.py @@ -24,16 +24,16 @@ import launch def generate_launch_description(): - #default_yaml = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param', + #default_yaml = os.path.join(get_package_share_directory('openvino_node'), 'param', #'pipeline_person_attributes.yaml') - default_rviz = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'launch', + default_rviz = os.path.join(get_package_share_directory('openvino_node'), 'launch', 'rviz/default.rviz') return LaunchDescription([ launch.actions.DeclareLaunchArgument(name='yaml_path', default_value = - os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param','pipeline_person_attributes.yaml')), + os.path.join(get_package_share_directory('openvino_node'), 'param','pipeline_person_attributes.yaml')), # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', + package='openvino_node', executable='pipeline_with_params', arguments=['-config', LaunchConfiguration('yaml_path')], remappings=[ diff --git a/sample/launch/pipeline_reidentification.launch.py b/sample/launch/pipeline_reidentification.launch.py index 591a6180..defca5b3 100644 --- a/sample/launch/pipeline_reidentification.launch.py +++ b/sample/launch/pipeline_reidentification.launch.py @@ -24,16 +24,16 @@ import launch def generate_launch_description(): - #default_yaml = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param', + #default_yaml = os.path.join(get_package_share_directory('openvino_node'), 'param', #'pipeline_reidentification.yaml') - default_rviz = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'launch', + default_rviz = os.path.join(get_package_share_directory('openvino_node'), 'launch', 'rviz/default.rviz') return LaunchDescription([ launch.actions.DeclareLaunchArgument(name='yaml_path', default_value = - os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param','pipeline_reidentification.yaml')), + os.path.join(get_package_share_directory('openvino_node'), 'param','pipeline_reidentification.yaml')), # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', + package='openvino_node', executable='pipeline_with_params', arguments=['-config', LaunchConfiguration('yaml_path')], remappings=[ diff --git a/sample/launch/pipeline_segmentation.launch.py b/sample/launch/pipeline_segmentation.launch.py index 8dee1812..d5303ae4 100644 --- a/sample/launch/pipeline_segmentation.launch.py +++ b/sample/launch/pipeline_segmentation.launch.py @@ -24,20 +24,20 @@ import launch def generate_launch_description(): - #default_yaml = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param', + #default_yaml = os.path.join(get_package_share_directory('openvino_node'), 'param', #'pipeline_segmentation.yaml') - default_rviz = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'launch', + default_rviz = os.path.join(get_package_share_directory('openvino_node'), 'launch', 'rviz/default.rviz') return LaunchDescription([ launch.actions.DeclareLaunchArgument(name='yaml_path', default_value = - os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param','pipeline_segmentation.yaml')), + os.path.join(get_package_share_directory('openvino_node'), 'param','pipeline_segmentation.yaml')), # Realsense # NOTE: Split realsense_node launching from OpenVINO package, which # will be launched by RDK launching file or manually. # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', + package='openvino_node', executable='pipeline_with_params', arguments=['-config', LaunchConfiguration('yaml_path')], remappings=[ diff --git a/sample/launch/pipeline_segmentation_image.launch.py b/sample/launch/pipeline_segmentation_image.launch.py index 81e5bea0..584ddfc3 100644 --- a/sample/launch/pipeline_segmentation_image.launch.py +++ b/sample/launch/pipeline_segmentation_image.launch.py @@ -24,20 +24,20 @@ import launch def generate_launch_description(): - #default_yaml = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param', + #default_yaml = os.path.join(get_package_share_directory('openvino_node'), 'param', #'pipeline_segmentation_image.yaml') - default_rviz = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'launch', + default_rviz = os.path.join(get_package_share_directory('openvino_node'), 'launch', 'rviz/default.rviz') return LaunchDescription([ launch.actions.DeclareLaunchArgument(name='yaml_path', default_value = - os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param','pipeline_segmentation_image.yaml')), + os.path.join(get_package_share_directory('openvino_node'), 'param','pipeline_segmentation_image.yaml')), # Realsense # NOTE: Split realsense_node launching from OpenVINO package, which # will be launched by RDK launching file or manually. # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', + package='openvino_node', executable='pipeline_with_params', arguments=['-config', LaunchConfiguration('yaml_path')], remappings=[ diff --git a/sample/launch/pipeline_segmentation_maskrcnn.launch.py b/sample/launch/pipeline_segmentation_maskrcnn.launch.py index 5ccd9c52..b07d5476 100644 --- a/sample/launch/pipeline_segmentation_maskrcnn.launch.py +++ b/sample/launch/pipeline_segmentation_maskrcnn.launch.py @@ -24,20 +24,20 @@ import launch def generate_launch_description(): - #default_yaml = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param', + #default_yaml = os.path.join(get_package_share_directory('openvino_node'), 'param', #'pipeline_segmentation.yaml') - default_rviz = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'launch', + default_rviz = os.path.join(get_package_share_directory('openvino_node'), 'launch', 'rviz/default.rviz') return LaunchDescription([ launch.actions.DeclareLaunchArgument(name='yaml_path', default_value = - os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param','pipeline_segmentation_maskrcnn.yaml')), + os.path.join(get_package_share_directory('openvino_node'), 'param','pipeline_segmentation_maskrcnn.yaml')), # Realsense # NOTE: Split realsense_node launching from OpenVINO package, which # will be launched by RDK launching file or manually. # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', + package='openvino_node', executable='pipeline_with_params', arguments=['-config', LaunchConfiguration('yaml_path')], remappings=[ diff --git a/sample/launch/pipeline_vehicle_detection.launch.py b/sample/launch/pipeline_vehicle_detection.launch.py index 1cfd6899..a147d95c 100644 --- a/sample/launch/pipeline_vehicle_detection.launch.py +++ b/sample/launch/pipeline_vehicle_detection.launch.py @@ -24,16 +24,16 @@ import launch def generate_launch_description(): - #default_yaml = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param', + #default_yaml = os.path.join(get_package_share_directory('openvino_node'), 'param', #'pipeline_vehicle_detection.yaml') - default_rviz = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'launch', + default_rviz = os.path.join(get_package_share_directory('openvino_node'), 'launch', 'rviz/default.rviz') return LaunchDescription([ launch.actions.DeclareLaunchArgument(name='yaml_path', default_value = - os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param','pipeline_vehicle_detection.yaml')), + os.path.join(get_package_share_directory('openvino_node'), 'param','pipeline_vehicle_detection.yaml')), # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', + package='openvino_node', executable='pipeline_with_params', arguments=['-config', LaunchConfiguration('yaml_path')], remappings=[ diff --git a/sample/launch/pipeline_video.launch.py b/sample/launch/pipeline_video.launch.py index 5ace9324..63f76cec 100644 --- a/sample/launch/pipeline_video.launch.py +++ b/sample/launch/pipeline_video.launch.py @@ -24,16 +24,16 @@ import launch def generate_launch_description(): - #default_yaml = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param', + #default_yaml = os.path.join(get_package_share_directory('openvino_node'), 'param', #'pipeline_video.yaml') - default_rviz = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'launch', + default_rviz = os.path.join(get_package_share_directory('openvino_node'), 'launch', 'rviz/default.rviz') return LaunchDescription([ launch.actions.DeclareLaunchArgument(name='yaml_path', default_value = - os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param','pipeline_video.yaml')), + os.path.join(get_package_share_directory('openvino_node'), 'param','pipeline_video.yaml')), # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', + package='openvino_node', executable='pipeline_with_params', arguments=['-config', LaunchConfiguration('yaml_path')], remappings=[ diff --git a/sample/launch/ros2_openvino_oa.launch.py b/sample/launch/ros2_openvino_oa.launch.py index 687c8fc7..b759e165 100644 --- a/sample/launch/ros2_openvino_oa.launch.py +++ b/sample/launch/ros2_openvino_oa.launch.py @@ -22,12 +22,12 @@ def generate_launch_description(): - default_yaml = os.path.join(get_package_share_directory('dynamic_vino_sample'), 'param', + default_yaml = os.path.join(get_package_share_directory('openvino_node'), 'param', 'pipeline_object_topic.yaml') return LaunchDescription([ # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', node_executable='pipeline_with_params', + package='openvino_node', node_executable='pipeline_with_params', arguments=['-config', default_yaml], remappings=[ ('/openvino_toolkit/image_raw', '/camera/color/image_raw'), diff --git a/sample/package.xml b/sample/package.xml index b9a5ed0d..b82fcf92 100644 --- a/sample/package.xml +++ b/sample/package.xml @@ -14,7 +14,7 @@ limitations under the License. --> - dynamic_vino_sample + openvino_node 0.9.0 a ROS2 wrapper package for Intel OpenVINO Weizhi Liu @@ -33,8 +33,8 @@ limitations under the License. gflags yaml_cpp_vendor ament_index_cpp - dynamic_vino_lib - vino_param_lib + openvino_wrapper_lib + openvino_param_lib cv_bridge object_msgs realsense2 @@ -49,8 +49,8 @@ limitations under the License. ament_index_cpp class_loader cv_bridge - dynamic_vino_lib - vino_param_lib + openvino_wrapper_lib + openvino_param_lib object_msgs realsense2 diff --git a/sample/src/image_object_client.cpp b/sample/src/image_object_client.cpp index 26894d9b..9704febf 100644 --- a/sample/src/image_object_client.cpp +++ b/sample/src/image_object_client.cpp @@ -13,13 +13,13 @@ // limitations under the License. #include -#include +#include #include #include #include #include -#include "dynamic_vino_lib/services/frame_processing_server.hpp" +#include "openvino_wrapper_lib/services/frame_processing_server.hpp" int main(int argc, char ** argv) { @@ -27,7 +27,7 @@ int main(int argc, char ** argv) auto node = rclcpp::Node::make_shared("service_example_for_object"); if (argc != 2) { - RCLCPP_INFO(node->get_logger(), "Usage: ros2 run dynamic_vino_sample image_object_client" + RCLCPP_INFO(node->get_logger(), "Usage: ros2 run openvino_node image_object_client" ""); return -1; } diff --git a/sample/src/image_object_server.cpp b/sample/src/image_object_server.cpp index 6efc55f0..50cb7e81 100644 --- a/sample/src/image_object_server.cpp +++ b/sample/src/image_object_server.cpp @@ -13,17 +13,17 @@ // limitations under the License. #include -#include +#include #include #include #include -#include "dynamic_vino_lib/pipeline_manager.hpp" -#include "dynamic_vino_lib/services/frame_processing_server.hpp" -#include "dynamic_vino_lib/pipeline.hpp" -#include "dynamic_vino_lib/slog.hpp" -#include "dynamic_vino_lib/inputs/base_input.hpp" -#include "dynamic_vino_lib/inputs/image_input.hpp" +#include "openvino_wrapper_lib/pipeline_manager.hpp" +#include "openvino_wrapper_lib/services/frame_processing_server.hpp" +#include "openvino_wrapper_lib/pipeline.hpp" +#include "openvino_wrapper_lib/slog.hpp" +#include "openvino_wrapper_lib/inputs/base_input.hpp" +#include "openvino_wrapper_lib/inputs/image_input.hpp" #include "openvino/openvino.hpp" #if(defined(USE_OLD_E_PLUGIN_API)) #include diff --git a/sample/src/image_people_client.cpp b/sample/src/image_people_client.cpp index ba89b013..0b1ce773 100644 --- a/sample/src/image_people_client.cpp +++ b/sample/src/image_people_client.cpp @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include +#include +#include #include -#include +#include #include #include #include #include #include -#include "dynamic_vino_lib/services/frame_processing_server.hpp" +#include "openvino_wrapper_lib/services/frame_processing_server.hpp" int main(int argc, char ** argv) { @@ -30,15 +30,15 @@ int main(int argc, char ** argv) auto node = rclcpp::Node::make_shared("service_example_for_face"); if (argc != 2) { - RCLCPP_INFO(node->get_logger(), "Usage: ros2 run dynamic_vino_sample image_object_client" + RCLCPP_INFO(node->get_logger(), "Usage: ros2 run openvino_node image_object_client" ""); return -1; } std::string image_path = argv[1]; - auto client = node->create_client("/openvino_toolkit/service"); - auto request = std::make_shared(); + auto client = node->create_client("/openvino_toolkit/service"); + auto request = std::make_shared(); request->image_path = image_path; while (!client->wait_for_service(std::chrono::seconds(1))) { diff --git a/sample/src/image_people_server.cpp b/sample/src/image_people_server.cpp index 99e6d4da..03f84b30 100644 --- a/sample/src/image_people_server.cpp +++ b/sample/src/image_people_server.cpp @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include +#include #include -#include +#include #include #include #include -#include "dynamic_vino_lib/pipeline_manager.hpp" -#include "dynamic_vino_lib/services/frame_processing_server.hpp" -#include "dynamic_vino_lib/pipeline.hpp" -#include "dynamic_vino_lib/slog.hpp" -#include "dynamic_vino_lib/inputs/base_input.hpp" -#include "dynamic_vino_lib/inputs/image_input.hpp" +#include "openvino_wrapper_lib/pipeline_manager.hpp" +#include "openvino_wrapper_lib/services/frame_processing_server.hpp" +#include "openvino_wrapper_lib/pipeline.hpp" +#include "openvino_wrapper_lib/slog.hpp" +#include "openvino_wrapper_lib/inputs/base_input.hpp" +#include "openvino_wrapper_lib/inputs/image_input.hpp" #include "openvino/openvino.hpp" #if(defined(USE_OLD_E_PLUGIN_API)) #include @@ -39,7 +39,7 @@ int main(int argc, char ** argv) try { auto node = std::make_shared>("service_people_detection", config_path); + >("service_people_detection", config_path); rclcpp::spin(node); } catch (std::exception & e) { std::cout << e.what() << std::endl; diff --git a/sample/src/parameters.cpp b/sample/src/parameters.cpp index 07430996..45bef956 100644 --- a/sample/src/parameters.cpp +++ b/sample/src/parameters.cpp @@ -19,8 +19,8 @@ * \file sample/parameters.cpp */ -#include -#include +#include +#include #include #include #include diff --git a/sample/src/pipeline_composite.cpp b/sample/src/pipeline_composite.cpp index cc0f00b0..aea1630a 100644 --- a/sample/src/pipeline_composite.cpp +++ b/sample/src/pipeline_composite.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include @@ -37,9 +37,9 @@ #include #include -#include "dynamic_vino_lib/pipeline.hpp" -#include "dynamic_vino_lib/pipeline_manager.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/pipeline.hpp" +#include "openvino_wrapper_lib/pipeline_manager.hpp" +#include "openvino_wrapper_lib/slog.hpp" #if(defined(USE_OLD_E_PLUGIN_API)) #include #endif diff --git a/sample/src/pipeline_with_params.cpp b/sample/src/pipeline_with_params.cpp index 4bc6ba78..6d11ff9a 100644 --- a/sample/src/pipeline_with_params.cpp +++ b/sample/src/pipeline_with_params.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include @@ -37,10 +37,10 @@ #include #include -#include "dynamic_vino_lib/pipeline.hpp" -#include "dynamic_vino_lib/pipeline_manager.hpp" -#include "dynamic_vino_lib/services/pipeline_processing_server.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/pipeline.hpp" +#include "openvino_wrapper_lib/pipeline_manager.hpp" +#include "openvino_wrapper_lib/services/pipeline_processing_server.hpp" +#include "openvino_wrapper_lib/slog.hpp" #if(defined(USE_OLD_E_PLUGIN_API)) #include #endif @@ -65,7 +65,7 @@ int main(int argc, char * argv[]) rclcpp::executors::SingleThreadedExecutor exec; rclcpp::Node::SharedPtr main_node = rclcpp::Node::make_shared("openvino_pipeline"); rclcpp::Node::SharedPtr service_node = std::make_shared>("pipeline_service"); + >("pipeline_service"); // register signal SIGINT and signal handler //signal(SIGINT, signalHandler); diff --git a/script/viewer/service.py b/script/viewer/service.py index d0f99702..82d7d2e4 100644 --- a/script/viewer/service.py +++ b/script/viewer/service.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from pipeline_srv_msgs.srv import * +from openvino_msgs.srv import * import rclpy import sys from pipeTree import TreeNode diff --git a/script/viewer/viewer.py b/script/viewer/viewer.py index 93b71918..a82ace37 100644 --- a/script/viewer/viewer.py +++ b/script/viewer/viewer.py @@ -3,7 +3,7 @@ from PyQt5.QtGui import QPainter,QPen,QBrush,QColor from PyQt5.QtCore import QRect from service import reqPipelineService,getTree -from pipeline_srv_msgs.srv import * +from openvino_msgs.srv import * from pipeTree import TreeNode diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5e871b1d..3dd4228e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -14,7 +14,7 @@ cmake_minimum_required(VERSION 3.5) -project(dynamic_vino_test) +project(openvino_test) list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) @@ -51,12 +51,12 @@ find_package(rmw REQUIRED) find_package(std_msgs REQUIRED) find_package(sensor_msgs REQUIRED) find_package(object_msgs REQUIRED) -find_package(people_msgs REQUIRED) -find_package(pipeline_srv_msgs REQUIRED) +find_package(openvino_people_msgs REQUIRED) +find_package(openvino_msgs REQUIRED) find_package(class_loader REQUIRED) -find_package(vino_param_lib REQUIRED) +find_package(openvino_param_lib REQUIRED) find_package(yaml_cpp_vendor REQUIRED) -find_package(dynamic_vino_lib REQUIRED) +find_package(openvino_wrapper_lib REQUIRED) set(CMAKE_BUILD_TYPE "Release") if("${CMAKE_BUILD_TYPE}" STREQUAL "") @@ -144,17 +144,17 @@ if(BUILD_TESTING) if(TARGET ${target}) ament_target_dependencies(${target} "rclcpp" - "vino_param_lib" + "openvino_param_lib" "object_msgs" - "people_msgs" - "pipeline_srv_msgs" + "openvino_people_msgs" + "openvino_msgs" "OpenVINO" "OpenCV" "realsense2" "ament_index_cpp" "yaml_cpp_vendor" "class_loader" - "dynamic_vino_lib") + "openvino_wrapper_lib") endif() endmacro() diff --git a/tests/launch/image_object_service_test.launch.py b/tests/launch/image_object_service_test.launch.py index aa4e85e7..9b8ecb32 100644 --- a/tests/launch/image_object_service_test.launch.py +++ b/tests/launch/image_object_service_test.launch.py @@ -22,12 +22,12 @@ def generate_launch_description(): - default_yaml = os.path.join(get_package_share_directory('dynamic_vino_test'), 'param', + default_yaml = os.path.join(get_package_share_directory('openvino_test'), 'param', 'image_object_service_test.yaml') return LaunchDescription([ # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', node_executable='image_object_server', + package='openvino_node', node_executable='image_object_server', arguments=['-config', default_yaml], output='screen'), ]) diff --git a/tests/launch/image_people_service_test.launch.py b/tests/launch/image_people_service_test.launch.py index 6db0d65f..a9519dd4 100644 --- a/tests/launch/image_people_service_test.launch.py +++ b/tests/launch/image_people_service_test.launch.py @@ -22,12 +22,12 @@ def generate_launch_description(): - default_yaml = os.path.join(get_package_share_directory('dynamic_vino_test'), 'param', + default_yaml = os.path.join(get_package_share_directory('openvino_test'), 'param', 'image_people_service_test.yaml') return LaunchDescription([ # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', node_executable='image_people_server', + package='openvino_node', node_executable='image_people_server', arguments=['-config', default_yaml], output='screen'), ]) diff --git a/tests/launch/pipeline_face_reidentification_test.launch.py b/tests/launch/pipeline_face_reidentification_test.launch.py index cd4b0844..9515a86e 100644 --- a/tests/launch/pipeline_face_reidentification_test.launch.py +++ b/tests/launch/pipeline_face_reidentification_test.launch.py @@ -22,12 +22,12 @@ def generate_launch_description(): - default_yaml = os.path.join(get_package_share_directory('dynamic_vino_test'), 'param', + default_yaml = os.path.join(get_package_share_directory('openvino_test'), 'param', 'pipeline_face_reidentification_test.yaml') return LaunchDescription([ # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', node_executable='pipeline_with_params', + package='openvino_node', node_executable='pipeline_with_params', arguments=['-config', default_yaml], remappings=[ ('/openvino_toolkit/people/detected_objects', '/ros2_openvino_toolkit/face_detection'), diff --git a/tests/launch/pipeline_face_test.launch.py b/tests/launch/pipeline_face_test.launch.py index 9c08bd36..2311342e 100644 --- a/tests/launch/pipeline_face_test.launch.py +++ b/tests/launch/pipeline_face_test.launch.py @@ -22,12 +22,12 @@ def generate_launch_description(): - default_yaml = os.path.join(get_package_share_directory('dynamic_vino_test'), 'param', + default_yaml = os.path.join(get_package_share_directory('openvino_test'), 'param', 'pipeline_face_test.yaml') return LaunchDescription([ # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', node_executable='pipeline_with_params', + package='openvino_node', node_executable='pipeline_with_params', arguments=['-config', default_yaml], remappings=[ ('/openvino_toolkit/people/detected_objects', diff --git a/tests/launch/pipeline_image_test.launch.py b/tests/launch/pipeline_image_test.launch.py index 947667d1..e4a2b738 100644 --- a/tests/launch/pipeline_image_test.launch.py +++ b/tests/launch/pipeline_image_test.launch.py @@ -22,12 +22,12 @@ def generate_launch_description(): - default_yaml = os.path.join(get_package_share_directory('dynamic_vino_test'), 'param', + default_yaml = os.path.join(get_package_share_directory('openvino_test'), 'param', 'pipeline_image_test.yaml') return LaunchDescription([ # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', node_executable='pipeline_with_params', + package='openvino_node', node_executable='pipeline_with_params', arguments=['-config', default_yaml], remappings=[ ('/openvino_toolkit/people/detected_objects', diff --git a/tests/launch/pipeline_object_test.launch.py b/tests/launch/pipeline_object_test.launch.py index b324415d..752080c7 100644 --- a/tests/launch/pipeline_object_test.launch.py +++ b/tests/launch/pipeline_object_test.launch.py @@ -22,12 +22,12 @@ def generate_launch_description(): - default_yaml = os.path.join(get_package_share_directory('dynamic_vino_test'), 'param', + default_yaml = os.path.join(get_package_share_directory('openvino_test'), 'param', 'pipeline_object_test.yaml') return LaunchDescription([ # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', node_executable='pipeline_with_params', + package='openvino_node', node_executable='pipeline_with_params', arguments=['-config', default_yaml], remappings=[ ('/openvino_toolkit/object/detected_objects', diff --git a/tests/launch/pipeline_reidentification_test.launch.py b/tests/launch/pipeline_reidentification_test.launch.py index b29f0316..080d619c 100644 --- a/tests/launch/pipeline_reidentification_test.launch.py +++ b/tests/launch/pipeline_reidentification_test.launch.py @@ -22,12 +22,12 @@ def generate_launch_description(): - default_yaml = os.path.join(get_package_share_directory('dynamic_vino_test'), 'param', + default_yaml = os.path.join(get_package_share_directory('openvino_test'), 'param', 'pipeline_reidentification_test.yaml') return LaunchDescription([ # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', node_executable='pipeline_with_params', + package='openvino_node', node_executable='pipeline_with_params', arguments=['-config', default_yaml], remappings=[ ('/openvino_toolkit/object/detected_objects', diff --git a/tests/launch/pipeline_segmentation_test.launch.py b/tests/launch/pipeline_segmentation_test.launch.py index 613e5747..5cceb3eb 100644 --- a/tests/launch/pipeline_segmentation_test.launch.py +++ b/tests/launch/pipeline_segmentation_test.launch.py @@ -22,12 +22,12 @@ def generate_launch_description(): - default_yaml = os.path.join(get_package_share_directory('dynamic_vino_test'), 'param', + default_yaml = os.path.join(get_package_share_directory('openvino_test'), 'param', 'pipeline_segmentation_test.yaml') return LaunchDescription([ # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', node_executable='pipeline_with_params', + package='openvino_node', node_executable='pipeline_with_params', arguments=['-config', default_yaml], remappings=[ ('/openvino_toolkit/segmentation/segmented_obejcts', diff --git a/tests/launch/pipeline_vehicle_detection_test.launch.py b/tests/launch/pipeline_vehicle_detection_test.launch.py index b039ec8d..deb7cda3 100644 --- a/tests/launch/pipeline_vehicle_detection_test.launch.py +++ b/tests/launch/pipeline_vehicle_detection_test.launch.py @@ -22,12 +22,12 @@ def generate_launch_description(): - default_yaml = os.path.join(get_package_share_directory('dynamic_vino_test'), 'param', + default_yaml = os.path.join(get_package_share_directory('openvino_test'), 'param', 'pipeline_vehicle_detection_test.yaml') return LaunchDescription([ # Openvino detection launch_ros.actions.Node( - package='dynamic_vino_sample', node_executable='pipeline_with_params', + package='openvino_node', node_executable='pipeline_with_params', arguments=['-config', default_yaml], remappings=[ ('/openvino_toolkit/object/detected_license_plates', diff --git a/tests/package.xml b/tests/package.xml index a9ad9c4e..0d2bce43 100644 --- a/tests/package.xml +++ b/tests/package.xml @@ -14,7 +14,7 @@ limitations under the License. --> - dynamic_vino_test + openvino_test 0.9.0 a ROS2 wrapper package for Intel OpenVINO Weizhi Liu @@ -35,12 +35,12 @@ limitations under the License. class_loader cv_bridge object_msgs - people_msgs - pipeline_srv_msgs - vino_param_lib + openvino_people_msgs + openvino_msgs + openvino_param_lib realsense2 openvino_common - dynamic_vino_lib + openvino_wrapper_lib rosidl_default_runtime builtin_interfaces @@ -53,11 +53,11 @@ limitations under the License. class_loader cv_bridge object_msgs - people_msgs - pipeline_srv_msgs - vino_param_lib + openvino_people_msgs + openvino_msgs + openvino_param_lib realsense2 - dynamic_vino_lib + openvino_wrapper_lib ament_lint_auto ament_lint_common diff --git a/tests/src/lib/unittest_createPipelineCheck.cpp b/tests/src/lib/unittest_createPipelineCheck.cpp index 3cca1133..b531391b 100644 --- a/tests/src/lib/unittest_createPipelineCheck.cpp +++ b/tests/src/lib/unittest_createPipelineCheck.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include @@ -32,16 +32,16 @@ #include #include -#include "dynamic_vino_lib/pipeline.hpp" -#include "dynamic_vino_lib/pipeline_manager.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/pipeline.hpp" +#include "openvino_wrapper_lib/pipeline_manager.hpp" +#include "openvino_wrapper_lib/slog.hpp" std::string getConfigPath(std::string config_file) { std::string content; std::string prefix_path; - ament_index_cpp::get_resource("packages", "dynamic_vino_test", content, &prefix_path); - return prefix_path + "/share/dynamic_vino_test/param/" + config_file; + ament_index_cpp::get_resource("packages", "openvino_test", content, &prefix_path); + return prefix_path + "/share/openvino_test/param/" + config_file; } TEST(UnitTestCheckPipeline, testCreatePipeline) diff --git a/tests/src/service/unittest_objectService.cpp b/tests/src/service/unittest_objectService.cpp index c808f154..ecf11b33 100644 --- a/tests/src/service/unittest_objectService.cpp +++ b/tests/src/service/unittest_objectService.cpp @@ -13,7 +13,7 @@ // limitations under the License. #include -#include +#include #include #include #include @@ -22,7 +22,7 @@ #include #include -#include "dynamic_vino_lib/services/frame_processing_server.hpp" +#include "openvino_wrapper_lib/services/frame_processing_server.hpp" std::string generate_file_path(std::string path) { @@ -79,7 +79,7 @@ int main(int argc, char ** argv) rclcpp::init(argc, argv); testing::InitGoogleTest(&argc, argv); auto offset = std::chrono::seconds(20); - system("ros2 launch dynamic_vino_test image_object_service_test.launch.py &"); + system("ros2 launch openvino_test image_object_service_test.launch.py &"); rclcpp::sleep_for(offset); int ret = RUN_ALL_TESTS(); system("killall -s SIGINT image_object_server &"); diff --git a/tests/src/service/unittest_peopleService.cpp b/tests/src/service/unittest_peopleService.cpp index 85883e84..745a203d 100644 --- a/tests/src/service/unittest_peopleService.cpp +++ b/tests/src/service/unittest_peopleService.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include +#include +#include #include -#include +#include #include #include #include @@ -24,7 +24,7 @@ #include #include -#include "dynamic_vino_lib/services/frame_processing_server.hpp" +#include "openvino_wrapper_lib/services/frame_processing_server.hpp" std::string generate_file_path(std::string path) { @@ -38,11 +38,11 @@ TEST(UnitTestPeople, testPeople) { auto node = rclcpp::Node::make_shared("openvino_people_service_test"); - auto client = node->create_client("/openvino_toolkit/service"); + auto client = node->create_client("/openvino_toolkit/service"); ASSERT_TRUE(client->wait_for_service(std::chrono::seconds(20))); - auto request = std::make_shared(); + auto request = std::make_shared(); std::string buffer = generate_file_path("data/images/team.jpg"); std::cout << buffer << std::endl; @@ -71,7 +71,7 @@ int main(int argc, char ** argv) rclcpp::init(argc, argv); testing::InitGoogleTest(&argc, argv); auto offset = std::chrono::seconds(20); - system("ros2 launch dynamic_vino_test image_people_service_test.launch.py &"); + system("ros2 launch openvino_test image_people_service_test.launch.py &"); rclcpp::sleep_for(offset); int ret = RUN_ALL_TESTS(); system("killall -s SIGINT image_people_server &"); diff --git a/tests/src/topic/unittest_faceDetectionCheck.cpp b/tests/src/topic/unittest_faceDetectionCheck.cpp index 8dbc135c..e7e22f6c 100644 --- a/tests/src/topic/unittest_faceDetectionCheck.cpp +++ b/tests/src/topic/unittest_faceDetectionCheck.cpp @@ -14,13 +14,13 @@ #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include -#include +#include #include #include @@ -37,9 +37,9 @@ #include #include -#include "dynamic_vino_lib/pipeline.hpp" -#include "dynamic_vino_lib/pipeline_manager.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/pipeline.hpp" +#include "openvino_wrapper_lib/pipeline_manager.hpp" +#include "openvino_wrapper_lib/slog.hpp" #include "openvino/openvino.hpp" #include "librealsense2/rs.hpp" #include "opencv2/opencv.hpp" @@ -102,7 +102,7 @@ TEST(UnitTestFaceDetection, testEmotionDetection) std::shared_future sub_called_future(sub_called.get_future()); auto openvino_emotionRecognition_callback = - [&sub_called](const people_msgs::msg::EmotionsStamped::SharedPtr msg) -> void { + [&sub_called](const openvino_people_msgs::msg::EmotionsStamped::SharedPtr msg) -> void { emotion_test_pass = true; sub_called.set_value(true); }; @@ -111,7 +111,7 @@ TEST(UnitTestFaceDetection, testEmotionDetection) executor.add_node(node); { - auto sub2 = node->create_subscription( + auto sub2 = node->create_subscription( "/ros2_openvino_toolkit/emotions_recognition", qos, openvino_emotionRecognition_callback); executor.spin_once(std::chrono::seconds(0)); @@ -130,7 +130,7 @@ TEST(UnitTestFaceDetection, testageGenderDetection) std::shared_future sub_called_future(sub_called.get_future()); auto openvino_ageGender_callback = - [&sub_called](const people_msgs::msg::AgeGenderStamped::SharedPtr msg) -> void { + [&sub_called](const openvino_people_msgs::msg::AgeGenderStamped::SharedPtr msg) -> void { ageGender_test_pass = true; sub_called.set_value(true); }; @@ -139,7 +139,7 @@ TEST(UnitTestFaceDetection, testageGenderDetection) executor.add_node(node); { - auto sub3 = node->create_subscription( + auto sub3 = node->create_subscription( "/ros2_openvino_toolkit/age_genders_Recognition", qos, openvino_ageGender_callback); executor.spin_once(std::chrono::seconds(0)); @@ -158,7 +158,7 @@ TEST(UnitTestFaceDetection, testheadPoseDetection) std::shared_future sub_called_future(sub_called.get_future()); auto openvino_headPose_callback = - [&sub_called](const people_msgs::msg::HeadPoseStamped::SharedPtr msg) -> void { + [&sub_called](const openvino_people_msgs::msg::HeadPoseStamped::SharedPtr msg) -> void { headPose_test_pass = true; sub_called.set_value(true); }; @@ -167,7 +167,7 @@ TEST(UnitTestFaceDetection, testheadPoseDetection) executor.add_node(node); { - auto sub4 = node->create_subscription( + auto sub4 = node->create_subscription( "/ros2_openvino_toolkit/headposes_estimation", qos, openvino_headPose_callback); executor.spin_once(std::chrono::seconds(0)); @@ -183,7 +183,7 @@ int main(int argc, char * argv[]) testing::InitGoogleTest(&argc, argv); rclcpp::init(argc, argv); auto offset = std::chrono::seconds(30); - system("ros2 launch dynamic_vino_test pipeline_face_test.launch.py &"); + system("ros2 launch openvino_test pipeline_face_test.launch.py &"); int ret = RUN_ALL_TESTS(); rclcpp::sleep_for(offset); system("killall -s SIGINT pipeline_with_params &"); diff --git a/tests/src/topic/unittest_face_reidentification.cpp b/tests/src/topic/unittest_face_reidentification.cpp index e0b50eff..beb6e867 100644 --- a/tests/src/topic/unittest_face_reidentification.cpp +++ b/tests/src/topic/unittest_face_reidentification.cpp @@ -14,12 +14,12 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include #include #include @@ -36,9 +36,9 @@ #include #include -#include "dynamic_vino_lib/pipeline.hpp" -#include "dynamic_vino_lib/pipeline_manager.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/pipeline.hpp" +#include "openvino_wrapper_lib/pipeline_manager.hpp" +#include "openvino_wrapper_lib/slog.hpp" #include "openvino/openvino.hpp" #include "librealsense2/rs.hpp" #include "opencv2/opencv.hpp" @@ -100,7 +100,7 @@ TEST(UnitTestFaceReidentification, testLandmarkDetection) std::shared_future sub_called_future(sub_called.get_future()); auto openvino_landmark_detection_callback = - [&sub_called](const people_msgs::msg::LandmarkStamped::SharedPtr msg) -> void { + [&sub_called](const openvino_people_msgs::msg::LandmarkStamped::SharedPtr msg) -> void { if(msg->landmarks.size() > 0) landmark_detection = true; sub_called.set_value(true); @@ -110,7 +110,7 @@ TEST(UnitTestFaceReidentification, testLandmarkDetection) executor.add_node(node); { - auto sub1 = node->create_subscription( + auto sub1 = node->create_subscription( "/ros2_openvino_toolkit/detected_landmarks", qos, openvino_landmark_detection_callback); executor.spin_once(std::chrono::seconds(0)); @@ -128,7 +128,7 @@ TEST(UnitTestFaceReidentification, testReidentification) std::shared_future sub_called_future(sub_called.get_future()); auto openvino_face_reidentification_callback = - [&sub_called](const people_msgs::msg::ReidentificationStamped::SharedPtr msg) -> void { + [&sub_called](const openvino_people_msgs::msg::ReidentificationStamped::SharedPtr msg) -> void { if(msg->reidentified_vector.size() > 0) test_pass = true; sub_called.set_value(true); @@ -138,7 +138,7 @@ TEST(UnitTestFaceReidentification, testReidentification) executor.add_node(node); { - auto sub1 = node->create_subscription( + auto sub1 = node->create_subscription( "/ros2_openvino_toolkit/reidentified_faces", qos, openvino_face_reidentification_callback); executor.spin_once(std::chrono::seconds(0)); @@ -154,7 +154,7 @@ int main(int argc, char * argv[]) testing::InitGoogleTest(&argc, argv); rclcpp::init(argc, argv); auto offset = std::chrono::seconds(30); - system("ros2 launch dynamic_vino_test pipeline_face_reidentification_test.launch.py &"); + system("ros2 launch openvino_test pipeline_face_reidentification_test.launch.py &"); int ret = RUN_ALL_TESTS(); rclcpp::sleep_for(offset); system("killall -s SIGINT pipeline_with_params &"); diff --git a/tests/src/topic/unittest_imageCheck.cpp b/tests/src/topic/unittest_imageCheck.cpp index ceef983f..6990df51 100644 --- a/tests/src/topic/unittest_imageCheck.cpp +++ b/tests/src/topic/unittest_imageCheck.cpp @@ -14,13 +14,13 @@ #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include -#include +#include #include #include @@ -37,9 +37,9 @@ #include #include -#include "dynamic_vino_lib/pipeline.hpp" -#include "dynamic_vino_lib/pipeline_manager.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/pipeline.hpp" +#include "openvino_wrapper_lib/pipeline_manager.hpp" +#include "openvino_wrapper_lib/slog.hpp" #include "openvino/openvino.hpp" #include "librealsense2/rs.hpp" #include "opencv2/opencv.hpp" @@ -102,7 +102,7 @@ TEST(UnitTestFaceDetection, testEmotionDetection) std::shared_future sub_called_future(sub_called.get_future()); auto openvino_emotionRecognition_callback = - [&sub_called](const people_msgs::msg::EmotionsStamped::SharedPtr msg) -> void { + [&sub_called](const openvino_people_msgs::msg::EmotionsStamped::SharedPtr msg) -> void { emotion_test_pass = true; sub_called.set_value(true); }; @@ -111,7 +111,7 @@ TEST(UnitTestFaceDetection, testEmotionDetection) executor.add_node(node); { - auto sub2 = node->create_subscription( + auto sub2 = node->create_subscription( "/ros2_openvino_toolkit/emotions_recognition", qos, openvino_emotionRecognition_callback); executor.spin_once(std::chrono::seconds(0)); @@ -130,7 +130,7 @@ TEST(UnitTestFaceDetection, testageGenderDetection) std::shared_future sub_called_future(sub_called.get_future()); auto openvino_ageGender_callback = - [&sub_called](const people_msgs::msg::AgeGenderStamped::SharedPtr msg) -> void { + [&sub_called](const openvino_people_msgs::msg::AgeGenderStamped::SharedPtr msg) -> void { ageGender_test_pass = true; sub_called.set_value(true); }; @@ -139,7 +139,7 @@ TEST(UnitTestFaceDetection, testageGenderDetection) executor.add_node(node); { - auto sub3 = node->create_subscription( + auto sub3 = node->create_subscription( "/ros2_openvino_toolkit/age_genders_Recognition", qos, openvino_ageGender_callback); executor.spin_once(std::chrono::seconds(0)); @@ -158,7 +158,7 @@ TEST(UnitTestFaceDetection, testheadPoseDetection) std::shared_future sub_called_future(sub_called.get_future()); auto openvino_headPose_callback = - [&sub_called](const people_msgs::msg::HeadPoseStamped::SharedPtr msg) -> void { + [&sub_called](const openvino_people_msgs::msg::HeadPoseStamped::SharedPtr msg) -> void { headPose_test_pass = true; sub_called.set_value(true); }; @@ -167,7 +167,7 @@ TEST(UnitTestFaceDetection, testheadPoseDetection) executor.add_node(node); { - auto sub4 = node->create_subscription( + auto sub4 = node->create_subscription( "/ros2_openvino_toolkit/headposes_estimation", qos, openvino_headPose_callback); executor.spin_once(std::chrono::seconds(0)); @@ -183,7 +183,7 @@ int main(int argc, char * argv[]) testing::InitGoogleTest(&argc, argv); rclcpp::init(argc, argv); auto offset = std::chrono::seconds(30); - system("ros2 launch dynamic_vino_test pipeline_image_test.launch.py &"); + system("ros2 launch openvino_test pipeline_image_test.launch.py &"); int ret = RUN_ALL_TESTS(); rclcpp::sleep_for(offset); system("killall -s SIGINT pipeline_with_params &"); diff --git a/tests/src/topic/unittest_objectDetectionCheck.cpp b/tests/src/topic/unittest_objectDetectionCheck.cpp index 91bfb486..e5917c13 100644 --- a/tests/src/topic/unittest_objectDetectionCheck.cpp +++ b/tests/src/topic/unittest_objectDetectionCheck.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include @@ -32,9 +32,9 @@ #include #include -#include "dynamic_vino_lib/pipeline.hpp" -#include "dynamic_vino_lib/pipeline_manager.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/pipeline.hpp" +#include "openvino_wrapper_lib/pipeline_manager.hpp" +#include "openvino_wrapper_lib/slog.hpp" #include "openvino/openvino.hpp" #include "librealsense2/rs.hpp" #include "opencv2/opencv.hpp" @@ -91,7 +91,7 @@ int main(int argc, char * argv[]) testing::InitGoogleTest(&argc, argv); rclcpp::init(argc, argv); auto offset = std::chrono::seconds(60); - system("ros2 launch dynamic_vino_test pipeline_object_test.launch.py &"); + system("ros2 launch openvino_test pipeline_object_test.launch.py &"); int ret = RUN_ALL_TESTS(); rclcpp::sleep_for(offset); system("killall -s SIGINT pipeline_with_params &"); diff --git a/tests/src/topic/unittest_reidentification.cpp b/tests/src/topic/unittest_reidentification.cpp index b67c9fe5..cb19f460 100644 --- a/tests/src/topic/unittest_reidentification.cpp +++ b/tests/src/topic/unittest_reidentification.cpp @@ -14,10 +14,10 @@ #include #include -#include -#include +#include +#include #include -#include +#include #include #include @@ -34,9 +34,9 @@ #include #include -#include "dynamic_vino_lib/pipeline.hpp" -#include "dynamic_vino_lib/pipeline_manager.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/pipeline.hpp" +#include "openvino_wrapper_lib/pipeline_manager.hpp" +#include "openvino_wrapper_lib/slog.hpp" #include "openvino/openvino.hpp" #include "librealsense2/rs.hpp" #include "opencv2/opencv.hpp" @@ -69,7 +69,7 @@ TEST(UnitTestPersonReidentification, testReidentification) std::shared_future sub_called_future(sub_called.get_future()); auto openvino_reidentification_callback = - [&sub_called](const people_msgs::msg::ReidentificationStamped::SharedPtr msg) -> void { + [&sub_called](const openvino_people_msgs::msg::ReidentificationStamped::SharedPtr msg) -> void { test_pass = true; sub_called.set_value(true); }; @@ -78,7 +78,7 @@ TEST(UnitTestPersonReidentification, testReidentification) executor.add_node(node); { - auto sub1 = node->create_subscription( + auto sub1 = node->create_subscription( "/ros2_openvino_toolkit/reidentified_persons", qos, openvino_reidentification_callback); executor.spin_once(std::chrono::seconds(0)); @@ -94,7 +94,7 @@ int main(int argc, char * argv[]) testing::InitGoogleTest(&argc, argv); rclcpp::init(argc, argv); auto offset = std::chrono::seconds(30); - system("ros2 launch dynamic_vino_test pipeline_reidentification_test.launch.py &"); + system("ros2 launch openvino_test pipeline_reidentification_test.launch.py &"); int ret = RUN_ALL_TESTS(); system("killall -s SIGINT pipeline_with_params &"); rclcpp::shutdown(); diff --git a/tests/src/topic/unittest_segmentationCheck.cpp b/tests/src/topic/unittest_segmentationCheck.cpp index 93c14dc0..97e10a85 100644 --- a/tests/src/topic/unittest_segmentationCheck.cpp +++ b/tests/src/topic/unittest_segmentationCheck.cpp @@ -14,9 +14,9 @@ #include #include -#include +#include #include -#include +#include #include #include @@ -33,9 +33,9 @@ #include #include -#include "dynamic_vino_lib/pipeline.hpp" -#include "dynamic_vino_lib/pipeline_manager.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/pipeline.hpp" +#include "openvino_wrapper_lib/pipeline_manager.hpp" +#include "openvino_wrapper_lib/slog.hpp" #include "openvino/openvino.hpp" #include "librealsense2/rs.hpp" #include "opencv2/opencv.hpp" @@ -67,7 +67,7 @@ TEST(UnitTestObjectDetection, testObjectDetection) std::shared_future sub_called_future(sub_called.get_future()); auto openvino_faceDetection_callback = - [&sub_called](const people_msgs::msg::ObjectsInMasks::SharedPtr msg) -> void { + [&sub_called](const openvino_people_msgs::msg::ObjectsInMasks::SharedPtr msg) -> void { test_pass = true; sub_called.set_value(true); }; @@ -76,7 +76,7 @@ TEST(UnitTestObjectDetection, testObjectDetection) executor.add_node(node); { - auto sub1 = node->create_subscription( + auto sub1 = node->create_subscription( "/ros2_openvino_toolkit/segmented_obejcts", qos, openvino_faceDetection_callback); executor.spin_once(std::chrono::seconds(0)); @@ -92,7 +92,7 @@ int main(int argc, char * argv[]) testing::InitGoogleTest(&argc, argv); rclcpp::init(argc, argv); auto offset = std::chrono::seconds(60); - system("ros2 launch dynamic_vino_test pipeline_segmentation_test.launch.py &"); + system("ros2 launch openvino_test pipeline_segmentation_test.launch.py &"); int ret = RUN_ALL_TESTS(); rclcpp::sleep_for(offset); system("killall -s SIGINT pipeline_with_params &"); diff --git a/tests/src/topic/unittest_vehicleDetectionCheck.cpp b/tests/src/topic/unittest_vehicleDetectionCheck.cpp index 1390d7bf..30649361 100644 --- a/tests/src/topic/unittest_vehicleDetectionCheck.cpp +++ b/tests/src/topic/unittest_vehicleDetectionCheck.cpp @@ -14,12 +14,12 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include #include #include @@ -36,9 +36,9 @@ #include #include -#include "dynamic_vino_lib/pipeline.hpp" -#include "dynamic_vino_lib/pipeline_manager.hpp" -#include "dynamic_vino_lib/slog.hpp" +#include "openvino_wrapper_lib/pipeline.hpp" +#include "openvino_wrapper_lib/pipeline_manager.hpp" +#include "openvino_wrapper_lib/slog.hpp" #include "openvino/openvino.hpp" #include "librealsense2/rs.hpp" #include "opencv2/opencv.hpp" @@ -71,7 +71,7 @@ TEST(UnitTestPersonReidentification, testReidentification) std::shared_future sub_called_future(sub_called.get_future()); auto openvino_vehicle_callback = - [&sub_called](const people_msgs::msg::LicensePlateStamped::SharedPtr msg) -> void { + [&sub_called](const openvino_people_msgs::msg::LicensePlateStamped::SharedPtr msg) -> void { test_pass = true; sub_called.set_value(true); }; @@ -80,7 +80,7 @@ TEST(UnitTestPersonReidentification, testReidentification) executor.add_node(node); { - auto sub1 = node->create_subscription( + auto sub1 = node->create_subscription( "/ros2_openvino_toolkit/detected_license_plates", qos, openvino_vehicle_callback); executor.spin_once(std::chrono::seconds(0)); @@ -96,7 +96,7 @@ int main(int argc, char * argv[]) testing::InitGoogleTest(&argc, argv); rclcpp::init(argc, argv); auto offset = std::chrono::seconds(30); - system("ros2 launch dynamic_vino_test pipeline_vehicle_detection_test.launch.py &"); + system("ros2 launch openvino_test pipeline_vehicle_detection_test.launch.py &"); int ret = RUN_ALL_TESTS(); system("killall -s SIGINT pipeline_with_params &"); rclcpp::shutdown(); diff --git a/vino_param_lib/include/vino_param_lib/slog.hpp b/vino_param_lib/include/vino_param_lib/slog.hpp deleted file mode 120000 index f8aaab99..00000000 --- a/vino_param_lib/include/vino_param_lib/slog.hpp +++ /dev/null @@ -1 +0,0 @@ -../../../dynamic_vino_lib/include/dynamic_vino_lib/slog.hpp \ No newline at end of file