Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))|
</details>
</p>

Expand All @@ -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))|
</details>
</p>

Expand Down
14 changes: 7 additions & 7 deletions doc/quick_start/getting_started_with_ros2_ov2.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions docker/docker_instructions_ov2.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
183 changes: 0 additions & 183 deletions dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_topic_output.hpp

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ limitations under the License.
-->

<package format="3">
<name>pipeline_srv_msgs</name>
<name>openvino_msgs</name>
<version>0.9.0</version>
<description>A package containing pipeline service message definitions.</description>
<author email="yang1.lu@intel.com">Yang Lu</author>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <yaml-cpp/yaml.h>
#include <map>
Expand Down Expand Up @@ -148,4 +148,4 @@ class ParamManager // singleton
};

} // namespace Params
#endif // VINO_PARAM_LIB__PARAM_MANAGER_HPP_
#endif // OPENVINO_PARAM_LIB__PARAM_MANAGER_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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_
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
-->

<package format="2">
<name>vino_param_lib</name>
<name>openvino_param_lib</name>
<version>0.9.0</version>
<description>Library for ROS2 OpenVINO parameter management</description>
<maintainer email="wei.zhi.liu@intel.com">Weizhi Liu</maintainer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <vino_param_lib/slog.hpp>
#include "openvino_param_lib/param_manager.hpp"
#include <openvino_param_lib/slog.hpp>
#include <yaml-cpp/yaml.h>
#include <fstream>
#include <iostream>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
File renamed without changes.
Loading