diff --git a/README.md b/README.md index 5ede16c4..1379ad6f 100644 --- a/README.md +++ b/README.md @@ -173,15 +173,15 @@ 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```([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))| +|Emotion Recognition|```/ros2_openvino_toolkit/emotions_recognition```([object_msgs:msg:EmotionsStamped](../../../object_msgs/msg/EmotionsStamped.msg))| +|Age and Gender Recognition|```/ros2_openvino_toolkit/age_genders_Recognition```([object_msgs:msg:AgeGenderStamped](../../../object_msgs/msg/AgeGenderStamped.msg))| +|Head Pose Estimation|```/ros2_openvino_toolkit/headposes_estimation```([object_msgs:msg:HeadPoseStamped](../../../object_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```([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))| -|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))| +|Object Segmentation|```/ros2_openvino_toolkit/segmented_obejcts```([object_msgs::msg::ObjectsInMasks](../../../object_msgs/msg/ObjectsInMasks.msg))| +|Object Segmentation Maskrcnn|```/ros2_openvino_toolkit/segmented_obejcts```([object_msgs::msg::ObjectsInMasks](../../../object_msgs/msg/ObjectsInMasks.msg))| +|Person Reidentification|```/ros2_openvino_toolkit/reidentified_persons```([object_msgs::msg::ReidentificationStamped](../../../object_msgs/msg/ReidentificationStamped.msg))| +|Vehicle Detection|```/ros2_openvino_toolkit/detected_vehicles_attribs```([object_msgs::msg::VehicleAttribsStamped](../../../object_msgs/msg/PersonAttributeStamped.msg))| +|Vehicle License Detection|```/ros2_openvino_toolkit/detected_license_plates```([object_msgs::msg::LicensePlateStamped](../../../object_msgs/msg/LicensePlateStamped.msg))|

@@ -196,9 +196,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```([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))| +|Age Gender Detection Service|```/detect_age_gender```([object_msgs::srv::AgeGender](./object_msgs/srv/AgeGenderSrv.srv))| +|Headpose Detection Service|```/detect_head_pose```([object_msgs::srv::HeadPose](./object_msgs/srv/HeadPoseSrv.srv))| +|Emotion Detection Service|```/detect_emotion```([object_msgs::srv::Emotion](./object_msgs/srv/EmotionSrv.srv))|

diff --git a/openvino_people_msgs/COLCON_IGNORE b/openvino_people_msgs/COLCON_IGNORE new file mode 100644 index 00000000..e69de29b diff --git a/openvino_wrapper_lib/CMakeLists.txt b/openvino_wrapper_lib/CMakeLists.txt index 4afcbc37..f6ea6126 100644 --- a/openvino_wrapper_lib/CMakeLists.txt +++ b/openvino_wrapper_lib/CMakeLists.txt @@ -62,7 +62,6 @@ find_package(rmw REQUIRED) find_package(std_msgs REQUIRED) find_package(sensor_msgs REQUIRED) find_package(object_msgs REQUIRED) -find_package(openvino_people_msgs REQUIRED) find_package(openvino_msgs REQUIRED) find_package(class_loader REQUIRED) find_package(cv_bridge REQUIRED) @@ -233,7 +232,6 @@ ament_target_dependencies(${PROJECT_NAME} "std_msgs" "sensor_msgs" "object_msgs" - "openvino_people_msgs" "openvino_msgs" "ament_index_cpp" "class_loader" diff --git a/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/age_gender_detection.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/age_gender_detection.hpp index 4b5b2e40..865348f5 100644 --- a/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/age_gender_detection.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/inferences/age_gender_detection.hpp @@ -19,8 +19,8 @@ #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 diff --git a/openvino_wrapper_lib/include/openvino_wrapper_lib/outputs/base_output.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/outputs/base_output.hpp index 97ac56b1..67971a47 100644 --- a/openvino_wrapper_lib/include/openvino_wrapper_lib/outputs/base_output.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/outputs/base_output.hpp @@ -22,16 +22,16 @@ #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 @@ -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() {} diff --git a/openvino_wrapper_lib/include/openvino_wrapper_lib/outputs/ros_service_output.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/outputs/ros_service_output.hpp index 8cdfabad..d0558ad2 100644 --- a/openvino_wrapper_lib/include/openvino_wrapper_lib/outputs/ros_service_output.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/outputs/ros_service_output.hpp @@ -23,12 +23,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -60,10 +60,10 @@ 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_; 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 index b2fcfcec..74285c0e 100644 --- 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 @@ -23,24 +23,24 @@ #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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -154,30 +154,30 @@ class RosTopicOutput : public BaseOutput 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_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_; + 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/openvino_wrapper_lib/include/openvino_wrapper_lib/services/frame_processing_server.hpp b/openvino_wrapper_lib/include/openvino_wrapper_lib/services/frame_processing_server.hpp index e5e5eb82..9c361718 100644 --- a/openvino_wrapper_lib/include/openvino_wrapper_lib/services/frame_processing_server.hpp +++ b/openvino_wrapper_lib/include/openvino_wrapper_lib/services/frame_processing_server.hpp @@ -17,16 +17,16 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include -#include -#include +#include +#include +#include #include #include diff --git a/openvino_wrapper_lib/package.xml b/openvino_wrapper_lib/package.xml index e1e4fbf3..bd73ac69 100644 --- a/openvino_wrapper_lib/package.xml +++ b/openvino_wrapper_lib/package.xml @@ -37,7 +37,6 @@ limitations under the License. class_loader cv_bridge object_msgs - openvino_people_msgs openvino_msgs openvino_param_lib realsense2 @@ -54,7 +53,6 @@ limitations under the License. class_loader cv_bridge object_msgs - openvino_people_msgs openvino_msgs openvino_param_lib realsense2 diff --git a/openvino_wrapper_lib/src/outputs/ros_service_output.cpp b/openvino_wrapper_lib/src/outputs/ros_service_output.cpp index 5220a29a..257e8a35 100644 --- a/openvino_wrapper_lib/src/outputs/ros_service_output.cpp +++ b/openvino_wrapper_lib/src/outputs/ros_service_output.cpp @@ -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/openvino_wrapper_lib/src/outputs/ros_topic_output.cpp b/openvino_wrapper_lib/src/outputs/ros_topic_output.cpp index 8a87d5f6..a0f8a531 100644 --- a/openvino_wrapper_lib/src/outputs/ros_topic_output.cpp +++ b/openvino_wrapper_lib/src/outputs/ros_topic_output.cpp @@ -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; @@ -83,8 +83,8 @@ void Outputs::RosTopicOutput::feedFrame(const cv::Mat & frame) void Outputs::RosTopicOutput::accept( const std::vector & results) { - vehicle_attribs_topic_ = std::make_shared(); - openvino_people_msgs::msg::VehicleAttribs attribs; + vehicle_attribs_topic_ = std::make_shared(); + object_msgs::msg::VehicleAttribs attribs; for (auto & r : results) { auto loc = r.getLocation(); attribs.roi.x_offset = loc.x; @@ -100,8 +100,8 @@ void Outputs::RosTopicOutput::accept( void Outputs::RosTopicOutput::accept( const std::vector & results) { - license_plate_topic_ = std::make_shared(); - openvino_people_msgs::msg::LicensePlate plate; + license_plate_topic_ = std::make_shared(); + object_msgs::msg::LicensePlate plate; for (auto & r : results) { auto loc = r.getLocation(); plate.roi.x_offset = loc.x; @@ -116,8 +116,8 @@ void Outputs::RosTopicOutput::accept( void Outputs::RosTopicOutput::accept( const std::vector & results) { - face_reid_topic_ = std::make_shared(); - openvino_people_msgs::msg::Reidentification face; + face_reid_topic_ = std::make_shared(); + object_msgs::msg::Reidentification face; for (auto & r : results) { auto loc = r.getLocation(); face.roi.x_offset = loc.x; @@ -132,8 +132,8 @@ void Outputs::RosTopicOutput::accept( void Outputs::RosTopicOutput::accept( const std::vector & results) { - landmarks_topic_ = std::make_shared(); - openvino_people_msgs::msg::Landmark landmark; + landmarks_topic_ = std::make_shared(); + object_msgs::msg::Landmark landmark; for (auto & r : results) { auto loc = r.getLocation(); landmark.roi.x_offset = loc.x; @@ -154,8 +154,8 @@ void Outputs::RosTopicOutput::accept( void Outputs::RosTopicOutput::accept( const std::vector & results) { - person_attribs_topic_ = std::make_shared(); - openvino_people_msgs::msg::PersonAttribute person_attrib; + person_attribs_topic_ = std::make_shared(); + object_msgs::msg::PersonAttribute person_attrib; for (auto & r : results) { auto loc = r.getLocation(); person_attrib.roi.x_offset = loc.x; @@ -170,8 +170,8 @@ void Outputs::RosTopicOutput::accept( void Outputs::RosTopicOutput::accept( const std::vector & results) { - person_reid_topic_ = std::make_shared(); - openvino_people_msgs::msg::Reidentification person; + person_reid_topic_ = std::make_shared(); + object_msgs::msg::Reidentification person; for (auto & r : results) { auto loc = r.getLocation(); person.roi.x_offset = loc.x; @@ -186,8 +186,8 @@ void Outputs::RosTopicOutput::accept( void Outputs::RosTopicOutput::accept( const std::vector & results) { - segmented_objects_topic_ = std::make_shared(); - openvino_people_msgs::msg::ObjectInMask object; + segmented_objects_topic_ = std::make_shared(); + object_msgs::msg::ObjectInMask object; for (auto & r : results) { auto loc = r.getLocation(); object.roi.x_offset = loc.x; @@ -209,8 +209,8 @@ void Outputs::RosTopicOutput::accept( void Outputs::RosTopicOutput::accept( const std::vector & results) { - segmented_objects_topic_ = std::make_shared(); - openvino_people_msgs::msg::ObjectInMask object; + segmented_objects_topic_ = std::make_shared(); + object_msgs::msg::ObjectInMask object; for (auto & r : results) { auto loc = r.getLocation(); object.roi.x_offset = loc.x; @@ -267,9 +267,9 @@ void Outputs::RosTopicOutput::accept( void Outputs::RosTopicOutput::accept(const std::vector & results) { - emotions_topic_ = std::make_shared(); + emotions_topic_ = std::make_shared(); - openvino_people_msgs::msg::Emotion emotion; + object_msgs::msg::Emotion emotion; for (auto r : results) { auto loc = r.getLocation(); emotion.roi.x_offset = loc.x; @@ -283,9 +283,9 @@ void Outputs::RosTopicOutput::accept(const std::vector & results) { - age_gender_topic_ = std::make_shared(); + age_gender_topic_ = std::make_shared(); - openvino_people_msgs::msg::AgeGender ag; + object_msgs::msg::AgeGender ag; for (auto r : results) { auto loc = r.getLocation(); ag.roi.x_offset = loc.x; @@ -307,9 +307,9 @@ void Outputs::RosTopicOutput::accept(const std::vector & results) { - headpose_topic_ = std::make_shared(); + headpose_topic_ = std::make_shared(); - openvino_people_msgs::msg::HeadPose hp; + object_msgs::msg::HeadPose hp; for (auto r : results) { auto loc = r.getLocation(); hp.roi.x_offset = loc.x; diff --git a/openvino_wrapper_lib/src/services/frame_processing_server.cpp b/openvino_wrapper_lib/src/services/frame_processing_server.cpp index 052751dc..06e8387c 100644 --- a/openvino_wrapper_lib/src/services/frame_processing_server.cpp +++ b/openvino_wrapper_lib/src/services/frame_processing_server.cpp @@ -13,7 +13,7 @@ // limitations under the License. #include "openvino_wrapper_lib/services/frame_processing_server.hpp" -#include +#include #include #include @@ -93,5 +93,5 @@ void FrameProcessingServer::cbService( } template class FrameProcessingServer; -template class FrameProcessingServer; +template class FrameProcessingServer; } // namespace vino_service diff --git a/sample/CMakeLists.txt b/sample/CMakeLists.txt index 6452c709..25f50b09 100644 --- a/sample/CMakeLists.txt +++ b/sample/CMakeLists.txt @@ -40,7 +40,6 @@ find_package(cv_bridge REQUIRED) find_package(OpenVINO REQUIRED) find_package(openvino_wrapper_lib REQUIRED) find_package(object_msgs REQUIRED) -find_package(openvino_people_msgs REQUIRED) find_package(openvino_msgs REQUIRED) find_package(openvino_param_lib REQUIRED) find_package(yaml_cpp_vendor REQUIRED) @@ -135,7 +134,6 @@ ament_target_dependencies(pipeline_with_params "class_loader" "openvino_wrapper_lib" "OpenVINO" - "openvino_people_msgs" "openvino_msgs" "openvino_param_lib" "OpenCV" @@ -159,7 +157,6 @@ ament_target_dependencies(composable_pipeline "class_loader" "openvino_wrapper_lib" "OpenVINO" - "openvino_people_msgs" "openvino_msgs" "openvino_param_lib" "OpenCV" @@ -183,7 +180,6 @@ ament_target_dependencies(image_object_server "class_loader" "openvino_wrapper_lib" "OpenVINO" - "openvino_people_msgs" "openvino_msgs" "openvino_param_lib" "OpenCV" @@ -204,7 +200,6 @@ ament_target_dependencies(image_people_server "class_loader" "openvino_wrapper_lib" "OpenVINO" - "openvino_people_msgs" "openvino_msgs" "openvino_param_lib" "OpenCV" @@ -225,7 +220,6 @@ ament_target_dependencies(image_object_client "class_loader" "openvino_wrapper_lib" "OpenVINO" - "openvino_people_msgs" "openvino_msgs" "openvino_param_lib" "OpenCV" @@ -246,7 +240,6 @@ ament_target_dependencies(image_people_client "class_loader" "openvino_wrapper_lib" "OpenVINO" - "openvino_people_msgs" "openvino_msgs" "openvino_param_lib" "OpenCV" diff --git a/sample/src/image_people_client.cpp b/sample/src/image_people_client.cpp index 0b1ce773..240beae3 100644 --- a/sample/src/image_people_client.cpp +++ b/sample/src/image_people_client.cpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include +#include +#include #include #include #include @@ -37,8 +37,8 @@ int main(int argc, char ** argv) 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 03f84b30..2f9fdcc2 100644 --- a/sample/src/image_people_server.cpp +++ b/sample/src/image_people_server.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include +#include #include #include #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/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3dd4228e..f6c1fde6 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -51,7 +51,6 @@ find_package(rmw REQUIRED) find_package(std_msgs REQUIRED) find_package(sensor_msgs REQUIRED) find_package(object_msgs REQUIRED) -find_package(openvino_people_msgs REQUIRED) find_package(openvino_msgs REQUIRED) find_package(class_loader REQUIRED) find_package(openvino_param_lib REQUIRED) @@ -146,7 +145,6 @@ if(BUILD_TESTING) "rclcpp" "openvino_param_lib" "object_msgs" - "openvino_people_msgs" "openvino_msgs" "OpenVINO" "OpenCV" diff --git a/tests/package.xml b/tests/package.xml index 0d2bce43..53577f50 100644 --- a/tests/package.xml +++ b/tests/package.xml @@ -35,7 +35,6 @@ limitations under the License. class_loader cv_bridge object_msgs - openvino_people_msgs openvino_msgs openvino_param_lib realsense2 @@ -53,7 +52,6 @@ limitations under the License. class_loader cv_bridge object_msgs - openvino_people_msgs openvino_msgs openvino_param_lib realsense2 diff --git a/tests/src/service/unittest_peopleService.cpp b/tests/src/service/unittest_peopleService.cpp index 745a203d..eca6a0c7 100644 --- a/tests/src/service/unittest_peopleService.cpp +++ b/tests/src/service/unittest_peopleService.cpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include +#include +#include #include #include #include @@ -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; diff --git a/tests/src/topic/unittest_faceDetectionCheck.cpp b/tests/src/topic/unittest_faceDetectionCheck.cpp index e7e22f6c..90c007ed 100644 --- a/tests/src/topic/unittest_faceDetectionCheck.cpp +++ b/tests/src/topic/unittest_faceDetectionCheck.cpp @@ -14,11 +14,11 @@ #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include @@ -102,7 +102,7 @@ TEST(UnitTestFaceDetection, testEmotionDetection) std::shared_future sub_called_future(sub_called.get_future()); auto openvino_emotionRecognition_callback = - [&sub_called](const openvino_people_msgs::msg::EmotionsStamped::SharedPtr msg) -> void { + [&sub_called](const object_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 openvino_people_msgs::msg::AgeGenderStamped::SharedPtr msg) -> void { + [&sub_called](const object_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 openvino_people_msgs::msg::HeadPoseStamped::SharedPtr msg) -> void { + [&sub_called](const object_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)); diff --git a/tests/src/topic/unittest_face_reidentification.cpp b/tests/src/topic/unittest_face_reidentification.cpp index beb6e867..439d86b0 100644 --- a/tests/src/topic/unittest_face_reidentification.cpp +++ b/tests/src/topic/unittest_face_reidentification.cpp @@ -14,10 +14,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -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 openvino_people_msgs::msg::LandmarkStamped::SharedPtr msg) -> void { + [&sub_called](const object_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 openvino_people_msgs::msg::ReidentificationStamped::SharedPtr msg) -> void { + [&sub_called](const object_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)); diff --git a/tests/src/topic/unittest_imageCheck.cpp b/tests/src/topic/unittest_imageCheck.cpp index 6990df51..4f3359ac 100644 --- a/tests/src/topic/unittest_imageCheck.cpp +++ b/tests/src/topic/unittest_imageCheck.cpp @@ -14,11 +14,11 @@ #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include @@ -102,7 +102,7 @@ TEST(UnitTestFaceDetection, testEmotionDetection) std::shared_future sub_called_future(sub_called.get_future()); auto openvino_emotionRecognition_callback = - [&sub_called](const openvino_people_msgs::msg::EmotionsStamped::SharedPtr msg) -> void { + [&sub_called](const object_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 openvino_people_msgs::msg::AgeGenderStamped::SharedPtr msg) -> void { + [&sub_called](const object_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 openvino_people_msgs::msg::HeadPoseStamped::SharedPtr msg) -> void { + [&sub_called](const object_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)); diff --git a/tests/src/topic/unittest_reidentification.cpp b/tests/src/topic/unittest_reidentification.cpp index cb19f460..b4fc16c2 100644 --- a/tests/src/topic/unittest_reidentification.cpp +++ b/tests/src/topic/unittest_reidentification.cpp @@ -14,8 +14,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -69,7 +69,7 @@ TEST(UnitTestPersonReidentification, testReidentification) std::shared_future sub_called_future(sub_called.get_future()); auto openvino_reidentification_callback = - [&sub_called](const openvino_people_msgs::msg::ReidentificationStamped::SharedPtr msg) -> void { + [&sub_called](const object_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)); diff --git a/tests/src/topic/unittest_segmentationCheck.cpp b/tests/src/topic/unittest_segmentationCheck.cpp index 97e10a85..33d76d5c 100644 --- a/tests/src/topic/unittest_segmentationCheck.cpp +++ b/tests/src/topic/unittest_segmentationCheck.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include @@ -67,7 +67,7 @@ TEST(UnitTestObjectDetection, testObjectDetection) std::shared_future sub_called_future(sub_called.get_future()); auto openvino_faceDetection_callback = - [&sub_called](const openvino_people_msgs::msg::ObjectsInMasks::SharedPtr msg) -> void { + [&sub_called](const object_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)); diff --git a/tests/src/topic/unittest_vehicleDetectionCheck.cpp b/tests/src/topic/unittest_vehicleDetectionCheck.cpp index 30649361..41781526 100644 --- a/tests/src/topic/unittest_vehicleDetectionCheck.cpp +++ b/tests/src/topic/unittest_vehicleDetectionCheck.cpp @@ -14,10 +14,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -71,7 +71,7 @@ TEST(UnitTestPersonReidentification, testReidentification) std::shared_future sub_called_future(sub_called.get_future()); auto openvino_vehicle_callback = - [&sub_called](const openvino_people_msgs::msg::LicensePlateStamped::SharedPtr msg) -> void { + [&sub_called](const object_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));