diff --git a/README.md b/README.md index c163b5d8..88cad91a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ * [➤ Overview](#overview) * [ROS2 Version Supported](#ros2-version-supported) * [Inference Features Supported](#inference-features-supported) -* [➤ Prerequisite](#prerequisite-for-ros2-branch) +* [➤ Prerequisite](#prerequisite) * [➤ Introduction](#introduction) * [Design Architecture](#design-architecture) * [Logic Flow](#logic-flow) @@ -241,6 +241,7 @@ For the snapshot of demo results, refer to the following picture. * OpenVINO api 2.0: Refer to the OpenVINO document for [OpenVINO_api_2.0](https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html) for latest api 2.0 transition guide. # FAQ +* [How to get the IR file for yolov5?](./doc/quick_start/tutorial_for_yolov5_converted.md) * [How to build OpenVINO by source?](https://github.com/openvinotoolkit/openvino/wiki#how-to-build) * [How to build RealSense by source?](https://github.com/IntelRealSense/librealsense/blob/master/doc/installation.md) * [What is the basic command of Docker CLI?](https://docs.docker.com/engine/reference/commandline/docker/) diff --git a/data/labels/object_detection/coco.names b/data/labels/object_detection/coco.names new file mode 100755 index 00000000..16315f2b --- /dev/null +++ b/data/labels/object_detection/coco.names @@ -0,0 +1,80 @@ +person +bicycle +car +motorbike +aeroplane +bus +train +truck +boat +traffic light +fire hydrant +stop sign +parking meter +bench +bird +cat +dog +horse +sheep +cow +elephant +bear +zebra +giraffe +backpack +umbrella +handbag +tie +suitcase +frisbee +skis +snowboard +sports ball +kite +baseball bat +baseball glove +skateboard +surfboard +tennis racket +bottle +wine glass +cup +fork +knife +spoon +bowl +banana +apple +sandwich +orange +broccoli +carrot +hot dog +pizza +donut +cake +chair +sofa +pottedplant +bed +diningtable +toilet +tvmonitor +laptop +mouse +remote +keyboard +cell phone +microwave +oven +toaster +sink +refrigerator +book +clock +vase +scissors +teddy bear +hair drier +toothbrush \ No newline at end of file diff --git a/doc/quick_start/tutorial_for_yolov5_converted.md b/doc/quick_start/tutorial_for_yolov5_converted.md new file mode 100644 index 00000000..dcde6fc3 --- /dev/null +++ b/doc/quick_start/tutorial_for_yolov5_converted.md @@ -0,0 +1,88 @@ +# Tutorial_For_yolov5_Converted + +# Introduction +This document describes a method to convert YOLOv5 nano PyTorch weight files with the. pt extension to ONNX weight files, and a method to convert ONNX weight files to IR files using the OpenVINO model optimizer. This method can help OpenVINO users optimize YOLOv5n for deployment in practical applications. + +## Reference Phrase +|Term|Description| +|---|---| +|OpenVINO|Open Visual Inference & Neural Network Optimization| +|ONNX|Open Neural Network Exchange| +|YOLO|You Only Look Once| +|IR|Intermediate Representation| + +## Reference Document +|Doc|Link| +|---|---| +|OpenVINO|[openvino_2_0_transition_guide](https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html)| +|YOLOv5|[yolov5](https://github.com/ultralytics/yolov5)| + +# Convert Weight File to ONNX +* Copy YOLOv5 Repository from GitHub +``` +git clone https://github.com/ultralytics/yolov5.git +``` + +* Set Environment for Installing YOLOv5 +``` +cd yolov5 +python3 -m venv yolo_env // Create a virtual python environment +source yolo_env/bin/activate // Activate environment +pip install -r requirements.txt // Install yolov5 prerequisites +pip install onnx // Install ONNX +``` + +* Download PyTorch Weights +``` +mkdir model_convert && cd model_convert +wget https://github.com/ultralytics/yolov5/releases/download/v6.2/yolov5n.pt +``` + +* Convert PyTorch weights to ONNX weights +YOLOv5 repository provides export.py script, which can be used to convert PyTorch weight to ONNX weight. +``` +cd .. +python3 export.py --weights model_convert/yolov5n.pt --include onnx +``` + +# Convert ONNX files to IR files +After obtaining the ONNX weight file from the previous section [Convert Weight File to ONNX](#convert-weight-file-to-onnx), we can use the model optimizer to convert it to an IR file. + +* Install the OpenVINO Model Optimizer Environment +To use the model optimizer, you need to run the following command to install some necessary components (if you are still in the yolo_env virtual environment, you need to run the **deactivate** command to exit the environment or start a new terminal). +``` +python3 -m venv ov_env // Create openVINO virtual environment +source ov_env/bin/activate // Activate environment +python -m pip install --upgrade pip // Upgrade pip +pip install openvino[onnx]==2022.1.0 // Install OpenVINO for ONNX +pip install openvino-dev[onnx]==2022.1.0 // Install OpenVINO Dev Tool for ONNX +``` + +* Generate IR file +``` +cd model_convert +mo --input_model yolov5n.onnx +``` +Then we will get three files: yolov5n.xml, yolov5n.bin, and yolov5n.mapping under the model_convert folder. + +# Move to the Recommended Model Path +``` +cd ~/yolov5/model_convert +mkdir -p /opt/openvino_toolkit/models/convert/public/yolov5n/FP32/ +sudo cp yolov5n.bin yolov5n.mapping yolov5n.xml /opt/openvino_toolkit/models/convert/public/yolov5n/FP32/ +``` + +# FAQ + +

+

+How to install the python3-venv package? + +On Debian/Ubuntu systems, you need to install the python3-venv package using the following command. +``` +apt-get update +apt-get install python3-venv +``` +You may need to use sudo with that command. After installing, recreate your virtual environment. +
+

diff --git a/docker/Dockerfile b/docker/Dockerfile index b5ff38f0..3bf9fbaf 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ # ros2 openvino toolkit env master f1b1ca4d914186a1881b87f103be9c6e910c9d80 -ARG ROS_VERSION -FROM osrf/ros:${ROS_VERSION} +ARG ROS_PRE_INSTALLED_PKG +FROM osrf/ros:${ROS_PRE_INSTALLED_PKG} ARG VERSION # setting proxy env --option @@ -10,8 +10,10 @@ ARG VERSION # ENV HTTPS_PROXY="your_proxy" # ENV FTP_PROXY="your_proxy" -LABEL maintainer="Jiawei Wu " +# author information +LABEL author="Jiawei Wu " +# default shell type SHELL ["/bin/bash", "-c"] # ignore the warning @@ -54,7 +56,6 @@ pyyaml \ requests \ && apt-get install -y --no-install-recommends libboost-all-dev WORKDIR /usr/lib/x86_64-linux-gnu -RUN ln -sf libboost_python-py36.so libboost_python37.so RUN pip install --upgrade pip RUN pip install openvino-dev[tensorflow2]==2022.1 @@ -63,9 +64,7 @@ WORKDIR /root RUN mkdir -p catkin_ws/src WORKDIR /root/catkin_ws/src RUN git init && git clone https://github.com/intel/ros2_object_msgs.git \ -&& git clone -b ros2 https://github.com/intel/ros2_openvino_toolkit.git \ -&& git clone -b ${VERSION} https://github.com/ros-perception/vision_opencv.git \ -&& git clone -b ros2-development https://github.com/IntelRealSense/realsense-ros.git +&& git clone -b ros2 https://github.com/intel/ros2_openvino_toolkit.git RUN apt-get install ros-${VERSION}-diagnostic-updater WORKDIR /root/catkin_ws RUN source /opt/ros/${VERSION}/setup.bash && source /opt/intel/openvino_2022/setupvars.sh && colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release diff --git a/docker/docker_instructions_ov2.0.md b/docker/docker_instructions_ov2.0.md index 39c9e448..265fc9cb 100644 --- a/docker/docker_instructions_ov2.0.md +++ b/docker/docker_instructions_ov2.0.md @@ -12,20 +12,20 @@ Refer to: [Docker_install_guide](https://docs.docker.com/engine/install/ubuntu/) ``` cd ~/ros2_openvino_toolkit/docker/Dockerfile vi ~/ros2_openvino_toolkit/docker/Dockerfile -docker build --build-arg ROS_VERSION= --build-arg VERSION= --build-arg "HTTP_PROXY=set_your_proxy" -t ros2_openvino_202201 . +docker build --build-arg ROS_PRE_INSTALLED_PKG= --build-arg VERSION= --build-arg "HTTP_PROXY=set_your_proxy" -t ros2_openvino_202201 . ``` For example: * Build image for ros_galactic ``` cd ~/ros2_openvino_toolkit/docker/Dockerfile vi ~/ros2_openvino_toolkit/docker/Dockerfile -docker build --build-arg ROS_VERSION=galactic-desktop --build-arg VERSION=galactic --build-arg "HTTP_PROXY=set_your_proxy" -t ros2_galactic_openvino_202201 . +docker build --build-arg ROS_PRE_INSTALLED_PKG=galactic-desktop --build-arg VERSION=galactic --build-arg "HTTP_PROXY=set_your_proxy" -t ros2_galactic_openvino_202201 . ``` * Build image for ros_foxy ``` cd ~/ros2_openvino_toolkit/docker/Dockerfile vi ~/ros2_openvino_toolkit/docker/Dockerfile -docker build --build-arg ROS_VERSION=foxy-desktop --build-arg VERSION=foxy --build-arg "HTTP_PROXY=set_your_proxy" -t ros2_foxy_openvino_202201 . +docker build --build-arg ROS_PRE_INSTALLED_PKG=foxy-desktop --build-arg VERSION=foxy --build-arg "HTTP_PROXY=set_your_proxy" -t ros2_foxy_openvino_202201 . ``` ## 3. Download and load docker image diff --git a/dynamic_vino_lib/CMakeLists.txt b/dynamic_vino_lib/CMakeLists.txt index aec4c368..5b13e8b7 100644 --- a/dynamic_vino_lib/CMakeLists.txt +++ b/dynamic_vino_lib/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2018-2020 Intel Corporation +# 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. @@ -217,7 +217,7 @@ add_library(${PROJECT_NAME} SHARED src/models/vehicle_attribs_detection_model.cpp src/models/license_plate_detection_model.cpp src/models/object_detection_ssd_model.cpp - src/models/object_detection_yolov2_model.cpp + src/models/object_detection_yolov5_model.cpp src/outputs/image_window_output.cpp src/outputs/ros_topic_output.cpp src/outputs/rviz_output.cpp diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/engines/engine.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/engines/engine.hpp index 95b01f93..a3db05c1 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/engines/engine.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/engines/engine.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/engines/engine_manager.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/engines/engine_manager.hpp index dad18b62..a8a9a976 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/engines/engine_manager.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/engines/engine_manager.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018-2019 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/age_gender_detection.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/age_gender_detection.hpp index 238c3f73..b982d1fb 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/age_gender_detection.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/age_gender_detection.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_filter.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_filter.hpp index ec46271e..62c2d560 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_filter.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_filter.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_inference.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_inference.hpp index f83d4d10..e036ee9d 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_inference.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_inference.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_reidentification.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_reidentification.hpp index 17fd90f0..feb97d7d 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_reidentification.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_reidentification.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/emotions_detection.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/emotions_detection.hpp index 7f0a4609..07e07d00 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/emotions_detection.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/emotions_detection.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/face_detection.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/face_detection.hpp index 960b2af7..b4c37db1 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/face_detection.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/face_detection.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/face_reidentification.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/face_reidentification.hpp index 62215c4c..e0f6f9ac 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/face_reidentification.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/face_reidentification.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/head_pose_detection.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/head_pose_detection.hpp index 23112af4..f5d5390f 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/head_pose_detection.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/head_pose_detection.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/inference_manager.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/inference_manager.hpp index 0966a96a..b9f7bb94 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/inference_manager.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/inference_manager.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/landmarks_detection.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/landmarks_detection.hpp index a0f8aa3a..30dbf28e 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/landmarks_detection.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/landmarks_detection.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/license_plate_detection.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/license_plate_detection.hpp index 190d4338..b3adec0e 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/license_plate_detection.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/license_plate_detection.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_detection.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_detection.hpp index 6d207f88..a83a7926 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_detection.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_detection.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_segmentation.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_segmentation.hpp index f8a64f9d..081af67f 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_segmentation.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_segmentation.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_segmentation_maskrcnn.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_segmentation_maskrcnn.hpp index 11dbb044..67de05fb 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_segmentation_maskrcnn.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/object_segmentation_maskrcnn.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// Copyright (c) 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/person_attribs_detection.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/person_attribs_detection.hpp index af143533..17287f49 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/person_attribs_detection.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/person_attribs_detection.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/person_reidentification.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/person_reidentification.hpp index 9aa82d9d..048484ef 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/person_reidentification.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/person_reidentification.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/vehicle_attribs_detection.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/vehicle_attribs_detection.hpp index d011a1ff..5f40fbd8 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inferences/vehicle_attribs_detection.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inferences/vehicle_attribs_detection.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/base_input.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inputs/base_input.hpp index 695e7200..f01fd22d 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/base_input.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inputs/base_input.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/image_input.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inputs/image_input.hpp index 08874c49..e3c0d837 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/image_input.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inputs/image_input.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/image_topic.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inputs/image_topic.hpp index 196a934b..a5b25f18 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/image_topic.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inputs/image_topic.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/ip_camera.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inputs/ip_camera.hpp index 02ffb3ce..11dc2dd5 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/ip_camera.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inputs/ip_camera.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/realsense_camera.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inputs/realsense_camera.hpp index 3d399927..ff06fce8 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/realsense_camera.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inputs/realsense_camera.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/realsense_camera_topic.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inputs/realsense_camera_topic.hpp index 2b62c643..7e06bab3 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/realsense_camera_topic.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inputs/realsense_camera_topic.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/ros2_handler.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inputs/ros2_handler.hpp index 6a2ac311..7630a00e 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/ros2_handler.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inputs/ros2_handler.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/standard_camera.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inputs/standard_camera.hpp index ef63e65b..04b2a993 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/standard_camera.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inputs/standard_camera.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/video_input.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/inputs/video_input.hpp index e02a5f16..d751209a 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/inputs/video_input.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/inputs/video_input.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/age_gender_detection_model.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/models/age_gender_detection_model.hpp index c05530a4..6ef8af7b 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/age_gender_detection_model.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/models/age_gender_detection_model.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/attributes/base_attribute.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/models/attributes/base_attribute.hpp index b09b04bc..d404b888 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/attributes/base_attribute.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/models/attributes/base_attribute.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018-2020 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/base_model.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/models/base_model.hpp index 6ab777d5..64d9c89e 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/base_model.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/models/base_model.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/emotion_detection_model.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/models/emotion_detection_model.hpp index ab5a56ad..c5abd257 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/emotion_detection_model.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/models/emotion_detection_model.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/face_detection_model.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/models/face_detection_model.hpp index 11c7efae..868417e4 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/face_detection_model.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/models/face_detection_model.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/face_reidentification_model.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/models/face_reidentification_model.hpp index 845eba62..b526777c 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/face_reidentification_model.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/models/face_reidentification_model.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/head_pose_detection_model.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/models/head_pose_detection_model.hpp index 994c6307..2878eb51 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/head_pose_detection_model.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/models/head_pose_detection_model.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/landmarks_detection_model.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/models/landmarks_detection_model.hpp index f20c3065..164d2ea7 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/landmarks_detection_model.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/models/landmarks_detection_model.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/license_plate_detection_model.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/models/license_plate_detection_model.hpp index f9dfcebc..868fafc1 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/license_plate_detection_model.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/models/license_plate_detection_model.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/object_detection_ssd_model.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/models/object_detection_ssd_model.hpp index 9243d1bb..622e866b 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/object_detection_ssd_model.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/models/object_detection_ssd_model.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/object_detection_yolov2_model.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/models/object_detection_yolov5_model.hpp similarity index 74% rename from dynamic_vino_lib/include/dynamic_vino_lib/models/object_detection_yolov2_model.hpp rename to dynamic_vino_lib/include/dynamic_vino_lib/models/object_detection_yolov5_model.hpp index 1778d228..f9e2b040 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/object_detection_yolov2_model.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/models/object_detection_yolov5_model.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// Copyright (c) 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. @@ -15,8 +15,8 @@ * @brief A header file with declaration for ObjectDetectionModel Class * @file face_detection_model.h */ -#ifndef DYNAMIC_VINO_LIB__MODELS__OBJECT_DETECTION_YOLOV2_MODEL_HPP_ -#define DYNAMIC_VINO_LIB__MODELS__OBJECT_DETECTION_YOLOV2_MODEL_HPP_ +#ifndef DYNAMIC_VINO_LIB__MODELS__OBJECT_DETECTION_YOLOV5_MODEL_HPP_ +#define DYNAMIC_VINO_LIB__MODELS__OBJECT_DETECTION_YOLOV5_MODEL_HPP_ #include #include #include @@ -27,12 +27,20 @@ namespace Models * @class ObjectDetectionModel * @brief This class generates the face detection model. */ -class ObjectDetectionYolov2Model : public ObjectDetectionModel +#pragma pack(1) + typedef struct Resize { + cv::Mat resized_image; + int dw{}; + int dh{}; + } Resize_t; +#pragma pack() + +class ObjectDetectionYolov5Model : public ObjectDetectionModel { using Result = dynamic_vino_lib::ObjectDetectionResult; public: - ObjectDetectionYolov2Model(const std::string& label_loc, const std::string & model_loc, int batch_size = 1); + ObjectDetectionYolov5Model(const std::string& label_loc, const std::string & model_loc, int batch_size = 1); bool fetchResults( const std::shared_ptr & engine, @@ -55,10 +63,11 @@ class ObjectDetectionYolov2Model : public ObjectDetectionModel */ const std::string getModelCategory() const override; bool updateLayerProperty(std::shared_ptr&) override; + static Resize_t pre_process_ov(const cv::Mat &input_image); -protected: + cv::Mat input_image; + Resize_t resize_img; - int getEntryIndex(int side, int lcoords, int lclasses, int location, int entry); }; } // namespace Models -#endif // DYNAMIC_VINO_LIB__MODELS__OBJECT_DETECTION_YOLOV2_MODEL_HPP_ +#endif // DYNAMIC_VINO_LIB__MODELS__OBJECT_DETECTION_YOLOV5_MODEL_HPP_ diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/object_segmentation_maskrcnn_model.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/models/object_segmentation_maskrcnn_model.hpp index 81d45bc5..e0c64600 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/object_segmentation_maskrcnn_model.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/models/object_segmentation_maskrcnn_model.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// Copyright (c) 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/object_segmentation_model.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/models/object_segmentation_model.hpp index 7268d26a..5a527651 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/object_segmentation_model.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/models/object_segmentation_model.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/person_attribs_detection_model.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/models/person_attribs_detection_model.hpp index a87a0f8c..1e253098 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/person_attribs_detection_model.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/models/person_attribs_detection_model.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/person_reidentification_model.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/models/person_reidentification_model.hpp index 36c4086d..afbb4dcb 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/person_reidentification_model.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/models/person_reidentification_model.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/models/vehicle_attribs_detection_model.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/models/vehicle_attribs_detection_model.hpp index 83eb96f9..ff230f1d 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/models/vehicle_attribs_detection_model.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/models/vehicle_attribs_detection_model.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/base_output.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/outputs/base_output.hpp index 3bae23c2..c9267db8 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/base_output.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/outputs/base_output.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/image_window_output.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/outputs/image_window_output.hpp index 9ea76ef5..22f9b704 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/image_window_output.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/outputs/image_window_output.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_service_output.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_service_output.hpp index 5392792d..da27197b 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_service_output.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_service_output.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. 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 index cbfaf9d3..a1bcd980 100644 --- 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 @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/rviz_output.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/outputs/rviz_output.hpp index 54e7e3ec..f1cc0f4e 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/rviz_output.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/outputs/rviz_output.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/pipeline.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/pipeline.hpp index 88c4cc15..913bcc6b 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/pipeline.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/pipeline.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/pipeline_manager.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/pipeline_manager.hpp index 3c464684..3b4e210c 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/pipeline_manager.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/pipeline_manager.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/pipeline_params.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/pipeline_params.hpp index ff833276..f0deba59 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/pipeline_params.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/pipeline_params.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. @@ -55,7 +55,7 @@ const char kInferTpye_ObjectDetection[] = "ObjectDetection"; const char kInferTpye_ObjectSegmentation[] = "ObjectSegmentation"; const char kInferTpye_ObjectSegmentationMaskrcnn[] = "ObjectSegmentationMaskrcnn"; const char kInferTpye_ObjectDetectionTypeSSD[] = "SSD"; -const char kInferTpye_ObjectDetectionTypeYolov2[] = "yolov2"; +const char kInferTpye_ObjectDetectionTypeYolov5[] = "yolov5"; const char kInferTpye_PersonReidentification[] = "PersonReidentification"; const char kInferTpye_PersonAttribsDetection[] = "PersonAttribsDetection"; const char kInferTpye_LandmarksDetection[] = "LandmarksDetection"; diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/services/frame_processing_server.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/services/frame_processing_server.hpp index 056cb179..7c77cbf8 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/services/frame_processing_server.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/services/frame_processing_server.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/services/pipeline_processing_server.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/services/pipeline_processing_server.hpp index 09917765..d9b55d8c 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/services/pipeline_processing_server.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/services/pipeline_processing_server.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/slog.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/slog.hpp index e9790327..fef20a70 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/slog.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/slog.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/utils/mutex_counter.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/utils/mutex_counter.hpp index 47947928..bf1bc718 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/utils/mutex_counter.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/utils/mutex_counter.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018-2019 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/utils/version_info.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/utils/version_info.hpp index 18b98227..88a31e9e 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/utils/version_info.hpp +++ b/dynamic_vino_lib/include/dynamic_vino_lib/utils/version_info.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018-2019 Intel Corporation +// 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. diff --git a/dynamic_vino_lib/package.xml b/dynamic_vino_lib/package.xml index d432eba2..b975b4e8 100644 --- a/dynamic_vino_lib/package.xml +++ b/dynamic_vino_lib/package.xml @@ -1,7 +1,7 @@