From 7d7aa11a457e90431dc2cd6ff101ff458fe2ec1f Mon Sep 17 00:00:00 2001 From: Chao Li Date: Sun, 5 May 2019 17:53:51 +0800 Subject: [PATCH] fix README and config issues Signed-off-by: Chao Li --- doc/BINARY_VERSION_README.md | 4 ++-- script/environment_setup.sh | 3 +-- script/environment_setup_binary.sh | 3 +-- vino_launch/param/pipeline_object_oss.yaml | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/doc/BINARY_VERSION_README.md b/doc/BINARY_VERSION_README.md index f4d731c8..63b11f76 100644 --- a/doc/BINARY_VERSION_README.md +++ b/doc/BINARY_VERSION_README.md @@ -177,7 +177,7 @@ sudo ln -s ~/catkin_ws/src/ros_openvino_toolkit /opt/openvino_toolkit/ros_openvi ```bash roslaunch vino_launch pipeline_image.launch ``` -* run object detection sample code input from RealSenseCamera.(connect Intel® Neural Compute Stick 2) +* run object detection sample code input from RealSenseCamera. ```bash roslaunch vino_launch pipeline_object.launch ``` @@ -185,7 +185,7 @@ sudo ln -s ~/catkin_ws/src/ros_openvino_toolkit /opt/openvino_toolkit/ros_openvi ```bash roslaunch vino_launch pipeline_object_topic.launch ``` -* run object segmentation sample code input from RealSenseCameraTopic.(connect Intel® Neural Compute Stick 2) +* run object segmentation sample code input from RealSenseCameraTopic. ```bash roslaunch vino_launch pipeline_segmentation.launch ``` diff --git a/script/environment_setup.sh b/script/environment_setup.sh index bcd0808a..903e7fb0 100755 --- a/script/environment_setup.sh +++ b/script/environment_setup.sh @@ -63,14 +63,13 @@ echo "Set OTHER_DEPENDENCY to $OTHER_DEPENDENCY" # Clean Existing Directories if [ "$CLEAN" == "1" ]; then read -n1 -p "The clean operation will delete some manually created directories, - including ~/code, ~/catkin_ws, /opt/intel, /opt/openvino_toolkit, and OpenVINO tar ball. + including ~/code, /opt/intel, /opt/openvino_toolkit, and OpenVINO tar ball. Do you want to clean existing directories[Y/N]?" answer case $answer in Y|y) echo echo "===================Cleaning...====================================" echo $ROOT_PASSWD | sudo -S rm -rf ~/code echo $ROOT_PASSWD | sudo -S rm -rf /opt/intel - rm -rf ~/catkin_ws echo $ROOT_PASSWD | sudo -S rm -rf /opt/openvino_toolkit if [[ $system_ver = "16.04" && -L "/usr/lib/x86_64-linux-gnu/libboost_python3.so" ]]; then echo $ROOT_PASSWD | sudo -S rm /usr/lib/x86_64-linux-gnu/libboost_python3.so diff --git a/script/environment_setup_binary.sh b/script/environment_setup_binary.sh index d5d6e2cb..32d54e48 100755 --- a/script/environment_setup_binary.sh +++ b/script/environment_setup_binary.sh @@ -59,13 +59,12 @@ if [ "$CLEAN" == "1" ]; then echo "===================Clean Existing Directories...====================================" read -n1 -p "The clean operation will delete some manually created directories, - including ~/code, ~/catkin_ws, /opt/intel, /opt/openvino_toolkit, and OpenVINO tar ball. + including ~/code, /opt/intel, /opt/openvino_toolkit, and OpenVINO tar ball. Do you want to clean existing directories[Y/N]?" answer case $answer in Y|y) echo echo "===================Cleaning...====================================" echo $ROOT_PASSWD | sudo -S rm -rf ~/code - rm -rf ~/catkin_ws echo $ROOT_PASSWD | sudo -S rm -rf /opt/intel echo $ROOT_PASSWD | sudo -S rm -rf /opt/openvino_toolkit if [[ $system_ver = "16.04" && -L "/usr/lib/x86_64-linux-gnu/libboost_python3.so" ]]; then diff --git a/vino_launch/param/pipeline_object_oss.yaml b/vino_launch/param/pipeline_object_oss.yaml index 4fe4ca7a..9b656fc1 100644 --- a/vino_launch/param/pipeline_object_oss.yaml +++ b/vino_launch/param/pipeline_object_oss.yaml @@ -3,7 +3,7 @@ Pipelines: inputs: [RealSenseCamera] infers: - name: ObjectDetection - model: /opt/intel/computer_vision_sdk/deployment_tools/model_downloader/object_detection/common/mobilenet-ssd/caffe/output/FP16/mobilenet-ssd.xml + model: /opt/openvino_toolkit/open_model_zoo/model_downloader/object_detection/common/mobilenet-ssd/caffe/output/FP32/mobilenet-ssd.xml engine: CPU label: to/be/set/xxx.labels batch: 16