Merge pull request #24 from RachelRen05/update_R3

Update r3
intel · Dec 6, 2018 · e9f690d · e9f690d
2 parents 800ddb9 + 470c326
commit e9f690d
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 22 deletions.
diff --git a/doc/BINARY_VERSION_README.md b/doc/BINARY_VERSION_README.md
@@ -116,7 +116,7 @@ This project is a ROS2 wrapper for CV API of [OpenVINO™](https://software.inte
 	```
 * run object detection sample code with paramters extracted from [yaml](https://github.com/intel/ros2_openvino_toolkit/blob/master/sample/param/pipeline_object.yaml).
 	```bash
-	ros2 run dynamic_vino_sample object_detection_with_params -config /opt/openvino_toolkit/ros2_openvino_toolkit/sample/param/pipeline_object.yaml
+	ros2 run dynamic_vino_sample pipeline_with_params -config /opt/openvino_toolkit/ros2_openvino_toolkit/sample/param/pipeline_object.yaml
 	```
 
 ## 6. Interfaces

diff --git a/doc/OPEN_SOURCE_CODE_README.md b/doc/OPEN_SOURCE_CODE_README.md
@@ -85,6 +85,7 @@ This project is a ROS2 wrapper for CV API of [OpenVINO™](https://software.inte
 		mkdir ~/code && cd ~/code
 		git clone https://github.com/opencv/dldt.git
 		cd dldt/inference-engine/
+		git checkout 2018_R3
 		./install_dependencies.sh
 		mkdir build && cd build
 		cmake -DCMAKE_BUILD_TYPE=Release ..
@@ -97,6 +98,7 @@ This project is a ROS2 wrapper for CV API of [OpenVINO™](https://software.inte
 		cd ~/code
 		git clone https://github.com/opencv/open_model_zoo.git
 		cd open_model_zoo/demos/
+		git checkout e238a1ac6bfacf133be223dd9debade7bfcf7dc5
 		mkdir build && cd build
 		cmake -DCMAKE_BUILD_TYPE=Release /opt/openvino_toolkit/dldt/inference-engine
 		make -j8
@@ -179,7 +181,7 @@ This project is a ROS2 wrapper for CV API of [OpenVINO™](https://software.inte
 	```
 * run object detection sample code with paramters extracted from [yaml](https://github.com/intel/ros2_openvino_toolkit/blob/master/sample/param/pipeline_object_oss.yaml).
 	```bash
-	ros2 run dynamic_vino_sample object_detection_with_params -config /opt/openvino_toolkit/ros2_openvino_toolkit/sample/param/pipeline_object_oss.yaml
+	ros2 run dynamic_vino_sample pipeline_with_params -config /opt/openvino_toolkit/ros2_openvino_toolkit/sample/param/pipeline_object_oss.yaml
 	```
 
 ## 6. Interfaces

diff --git a/sample/param/pipeline_people.yaml b/sample/param/pipeline_people.yaml
@@ -22,18 +22,18 @@ Pipelines:
       engine: CPU
       label: to/be/set/xxx.labels
       batch: 16
-  outputs: [ImageWindow, RViz]
+  outputs: [ImageWindow, RosTopic, RViz]
   confidence_threshold: 0.2
   connects:
     - left: StandardCamera
       right: [FaceDetection]
     - left: FaceDetection
-      right: [AgeGenderRecognition, EmotionRecognition, HeadPoseEstimation, ImageWindow, RViz]
+      right: [AgeGenderRecognition, EmotionRecognition, HeadPoseEstimation, ImageWindow, RosTopic, RViz]
     - left: AgeGenderRecognition
-      right: [ImageWindow, RViz]
+      right: [ImageWindow, RosTopic, RViz]
     - left: EmotionRecognition
-      right: [ImageWindow, RViz]
+      right: [ImageWindow, RosTopic, RViz]
     - left: HeadPoseEstimation
-      right: [ImageWindow, RViz]
+      right: [ImageWindow, RosTopic, RViz]
 
 Common:
diff --git a/sample/param/pipeline_people_oss.yaml b/sample/param/pipeline_people_oss.yaml
@@ -1,39 +1,39 @@
 Pipelines:
 - name: people
-  inputs: [StandardCamera ]
+  inputs: [StandardCamera]
   infers:
-    - name: face_detection
+    - name: FaceDetection
       model: /opt/openvino_toolkit/open_model_zoo/model_downloader/Transportation/object_detection/face/pruned_mobilenet_reduced_ssd_shared_weights/dldt/face-detection-adas-0001.xml 
       engine: CPU
       label: to/be/set/xxx.labels
       batch: 1
-    - name: age_gender_detection
+    - name: AgeGenderRecognition
       model: /opt/openvino_toolkit/open_model_zoo/model_downloader/Retail/object_attributes/age_gender/dldt/age-gender-recognition-retail-0013.xml 
       engine: CPU
       label: to/be/set/xxx.labels
       batch: 16
-    - name: emotion_detection
+    - name: EmotionRecognition
       model: /opt/openvino_toolkit/open_model_zoo/model_downloader/Retail/object_attributes/emotions_recognition/0003/dldt/emotions-recognition-retail-0003.xml
       engine: CPU
       label: to/be/set/xxx.labels
       batch: 16
-    - name: head_pose_detection
+    - name: HeadPoseEstimation
       model: /opt/openvino_toolkit/open_model_zoo/model_downloader/Transportation/object_attributes/headpose/vanilla_cnn/dldt/head-pose-estimation-adas-0001.xml
       engine: CPU
       label: to/be/set/xxx.labels
       batch: 16
-  outputs: [ImageWindow]
+  outputs: [ImageWindow, RosTopic, RViz]
   confidence_threshold: 0.2
   connects:
     - left: StandardCamera
-      right: [face_detection]
-    - left: face_detection
-      right: [age_gender_detection, emotion_detection, head_pose_detection, ImageWindow, RosTopic]
-    - left: age_gender_detection
-      right: [ImageWindow]
-    - left: emotion_detection
-      right: [ImageWindow]
-    - left: head_pose_detection
-      right: [ImageWindow]
+      right: [FaceDetection]
+    - left: FaceDetection
+      right: [AgeGenderRecognition, EmotionRecognition, HeadPoseEstimation, ImageWindow, RosTopic, RViz]
+    - left: AgeGenderRecognition
+      right: [ImageWindow, RosTopic, RViz]
+    - left: EmotionRecognition
+      right: [ImageWindow, RosTopic, RViz]
+    - left: HeadPoseEstimation
+      right: [ImageWindow, RosTopic, RViz]
 
 OpenvinoCommon:
diff --git a/script/environment_setup.sh b/script/environment_setup.sh
@@ -233,6 +233,7 @@ if [ "$DLDT" == "1" ]; then
   mkdir -p  ~/code && cd ~/code
   git clone https://github.com/opencv/dldt.git
   cd dldt/inference-engine/
+  git checkout 2018_R3
   mkdir build && cd build
   cmake -DCMAKE_BUILD_TYPE=Release ..
   make -j8
@@ -249,6 +250,7 @@ if [ "$MODEL_ZOO" == "1" ]; then
   mkdir -p ~/code && cd ~/code
   git clone https://github.com/opencv/open_model_zoo.git
   cd open_model_zoo/demos/
+  git checkout e238a1ac6bfacf133be223dd9debade7bfcf7dc5
   mkdir build && cd build
   cmake -DCMAKE_BUILD_TYPE=Release /opt/openvino_toolkit/dldt/inference-engine
   make -j8