Skip to content

Conversation

@ChloeWu1
Copy link
Contributor

Dockerfile and docker instruction for ov2.0 have been added. Need merge to the branch of ros2.

vi ~/ros2_openvino_toolkit/docker/Dockerfile
docker build --build-arg ROS_VERSION=foxy-desktop --build-arg VERSION=foxy -t ros2_foxy_openvino_202201 .
```
**Note**:Proxy may need to set, please check dockerfile before building.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add a new arg for Proxy setting to command "docer build xxxx"?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Build arg of proxy has been added. Thanks.

omz_downloader --print_all
```

* Download the optimized Intermediate Representation (IR) of model (execute once), for example:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's time to make a model.lst config file, in order to simply the model opti/installation steps?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The download_model.lst and convert_model.lst have been added under the data folder. The docker instruction has been updated.

# Make sure you set http-proxy in below commands if your environment needs.
# RUN apt-key adv --keyserver-options http-proxy=your_proxy --keyserver keys.gnupg.net --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE || apt-key adv --keyserver-options http-proxy=your_proxy --keyserver hkp://keyserver.ubuntu.com:80 --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE || apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE
RUN add-apt-repository "deb https://librealsense.intel.com/Debian/apt-repo bionic main" -u \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bionic is suit for ubuntu18.0*, but ubuntu20.04(foxy, galactic) is on behalf of focal.
bionic may instead by $(lsb_release -cs).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. Thanks

RUN git clone -b ros2-development https://github.com/IntelRealSense/realsense-ros.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 No newline at end of file
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No newline at end of file

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. Thanks.

@LewisLiuPub LewisLiuPub merged commit 3f3a62a into intel:ros2 Dec 6, 2022
LewisLiuPub added a commit that referenced this pull request Apr 21, 2023
* Adding the jenkinsfile for galactic branch

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

* Updating the Jenkinsfile for PR test

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

* Enable environment information for email.

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

* Upgrade Code to support OpenVINO API2.0 (ver 2022.1/2)

* adapt API 2.0 for engines

Signed-off-by: Fan, Tao <tao.fan@intel.com>

* fix callback

Signed-off-by: Fan, Tao <tao.fan@intel.com>

* base model: fix read model api

Signed-off-by: Fan, Tao <tao.fan@intel.com>

* fix start interence api

Signed-off-by: Fan, Tao <tao.fan@intel.com>

* fix updateLayerProperty parameter type

Signed-off-by: Fan, Tao <tao.fan@intel.com>

* adapt API2022.1

* fix inputinfo

* fix inputinfo of segmentation model

* fix version api

* fix header files

* fix get tensor of base_inference header file

* fix version info

Signed-off-by: Fan,Tao <tao.fan@intel.com>

* adapt for object segmentation inferences API

Signed-off-by: Fan,Tao <tao.fan@intel.com>

* fix object segmentation enqueue and updateLayerProperty

Signed-off-by: Fan,Tao <tao.fan@intel.com>

* fix person_attribs_detection

* age_gender_detection

* fix age_gender_detection

* fix face detection and object detection(ssd)

Signed-off-by: Fan,Tao <tao.fan@intel.com>

* fix emotions_detenction_model

* fix variable name

* fix updateLayerProperty param type

* fix head_pose_detection

* fix license plate detection

Signed-off-by: Fan,Tao <tao.fan@intel.com>

* fix vehicle attribs detection

Signed-off-by: Fan,Tao <tao.fan@intel.com>

* fix person_attribs_detection_model

* fix base_attribute

* fix object detection(yolov2)

* fix person_reidentification and ssd_model_attr

* fix age gender detection

Signed-off-by: Fan,Tao <tao.fan@intel.com>

* fix emotions_detection

* fix head pose detection

Signed-off-by: Fan,Tao <tao.fan@intel.com>

* fix person reidentification

Signed-off-by: Fan,Tao <tao.fan@intel.com>

* fix person_attribs_detection

* more fix to object segmentation, still bug

Signed-off-by: Fan,Tao <tao.fan@intel.com>

* update quick_start_doc for Galactic_Ubuntu20.04

* update quick_start_doc for Galactic_Ubuntu20.04_ov2.0

* Revert "update quick_start_doc for Galactic_Ubuntu20.04"

This reverts commit 2e5646c.

* fix segmentation typo and correct fetch output

Signed-off-by: Fan,Tao <tao.fan@intel.com>

* clean up code and fix typo

Signed-off-by: Fan,Tao <tao.fan@intel.com>

* fix CMakeLists

* add NCHW and NHWC layout compatibility for object_segmentation and object_detection_ssd model

Signed-off-by: Fan, Tao <tao.fan@intel.com>

* fix doc for branch galactic ov2.0

* clean code and fix CMakeLists

* code refine: move input&output info definition to base attribute

Signed-off-by: Fan, Tao <tao.fan@intel.com>

* fix typo

* fix param name for new API

* fix param name getModel

* fix typo

* add mkdir for label

Signed-off-by: Fan, Tao <tao.fan@intel.com>
Signed-off-by: Fan,Tao <tao.fan@intel.com>
Co-authored-by: wujiawei <jiawei.wu@intel.com>

* add dockerfile and instruction (#247)

* add dockerfile and instruction

* add build arg of proxy

* add model lists for omz tools and fix instruction

* add lsb param and declare support version

* remove opencv4.5.5 install

* Add the pipeline of segmentation_maskrcnn (#249)

* upgrade maskrcnn

* add maskrcnn segmentation

* add output

* fix class name

* fix pipeline manager and output

* fix segmentation pipeline

* Update ros2 doc for quick start (#248)

* update ros2 doc for quick start

* fix typo

* fix yaml model path

* fix vehicle attribs and license plate (#252)

Signed-off-by: Fan, Tao <tao.fan@intel.com>

Signed-off-by: Fan, Tao <tao.fan@intel.com>

* Enable klocwork checking for Jenkins CI (#250)

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

* Update Documents and related build files (#253)

* refine for docker

* refine to adapt humble

* fix doc and yaml path

* fix the structure of ros2 document and add yaml configuration guide

* add the table of contents in README

* fix link

* refine for format and capital letter

* add reference link for installation

* add model and yaml link for inference table

* add table for the corresponding relation of ros2 branches

* add links to the table of contents and refine docker instruction

* update yaml configuration and add tables

* update yaml configuration

* update README format

* update README format

* add FAQ module

* update structure of table content

* update Inference Implementations table in README

* update

* update table format

* update

* refine format and add tables in README

* add feedback module in README

* fix typo in README

* add prerequisite table and fix links

* fix for topic table

* fix typo

* add link

* Support yolov5n (#256)

* initial code for supporting yolov5n

Signed-off-by: Fan,Tao <tao.fan@intel.com>

* fix code for supporting yolov5n

* fix code for yolov5n

* revert code for resize image

* fix for docker

* fix model used for people reidentification

* fix copyright 2018-2022

* fix bug for person attribs detection

* add doc for yolov5 converted

---------

Signed-off-by: Fan,Tao <tao.fan@intel.com>
Co-authored-by: Fan,Tao <tao.fan@intel.com>

* Fixing the bug of conflict resources for Jenkins CI (#257)

* Enable klocwork checking for Jenkins CI

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

* Fix the bug of conflict resources for Jenkins CI

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

---------

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

* rename package for release

* rename to openvino_node

* disable face reidentification pipeline

* rename package for release (#258)

* rename package for release

* rename to openvino_node

* Update the openvino2022.1 to 2022.3 for the docker (#264)

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

* Enable GitHub action ci (#267)

* Enable the ros2 openvino toolkit CI test for Github action

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

* Add the ci launch file

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

* Update ros2_branch.yml

* Add the log file

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

* Enable GitHub action CI

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

---------

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

* Setting the version for XTestRunner update. (#268)

* Fix segmentation (#269)

* update code to align with new version of maskrcnn segmentation model (layout=NHWC)

Signed-off-by: Liu, Wei Zhi <wei.zhi.liu@intel.com>

* update code to align with new version of deeplabv3 segmentation model.

Signed-off-by: Liu, Wei Zhi <wei.zhi.liu@intel.com>

* Update run.sh (#270)

* fix build error.

Signed-off-by: Liu, Wei Zhi <wei.zhi.liu@intel.com>

* update yaml file to use new version of maskrcnn segmentation model.

Signed-off-by: Liu, Wei Zhi <wei.zhi.liu@intel.com>

---------

Signed-off-by: Liu, Wei Zhi <wei.zhi.liu@intel.com>
Co-authored-by: huangjiafengx <jiafengx.huang@intel.com>

* Use object_msgs instead of openvino_people_msgs (#265)

* use object_msgs instead of openvino_people_msgs.

Signed-off-by: Liu, Wei Zhi <wei.zhi.liu@intel.com>

* update README by using object_msgs instead of openvino_people_msgs

Signed-off-by: Liu, Wei Zhi <wei.zhi.liu@intel.com>

---------

Signed-off-by: Liu, Wei Zhi <wei.zhi.liu@intel.com>

* Enable segmentation and yolov5 for github action. (#271)

* Add the segmentation CI test for github action

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

* Enable the segmentation cases for Github Action CI.

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

* Enable the segmentation cases for Github Action CI.

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

* Enable the segmentation cases for Github Action CI.

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

---------

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

* Update the Document for openvino version (#272)

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

* Enable ci for master (#274)

* update CI configurations to support branch master

Signed-off-by: Liu, Wei Zhi <wei.zhi.liu@intel.com>

* fix issues on the file Dockerfile for CI caes.

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

* Fix GitHub action ci issue (#276)

* Enable ci for master

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

* Sloving the Github action CI fail.

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

---------

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

---------

Signed-off-by: Liu, Wei Zhi <wei.zhi.liu@intel.com>
Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>
Co-authored-by: huangjiafengx <jiafengx.huang@intel.com>

* Removing the picture no using. (#277)

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>

---------

Signed-off-by: huangjiafengx <jiafengx.huang@intel.com>
Signed-off-by: Fan, Tao <tao.fan@intel.com>
Signed-off-by: Fan,Tao <tao.fan@intel.com>
Signed-off-by: Liu, Wei Zhi <wei.zhi.liu@intel.com>
Co-authored-by: huangjiafengx <jiafengx.huang@intel.com>
Co-authored-by: Fan,Tao <83325325+fantao015@users.noreply.github.com>
Co-authored-by: wujiawei <jiawei.wu@intel.com>
Co-authored-by: Fan,Tao <tao.fan@intel.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants