From 38ee2603a7faf46d4283daaf73e455912307f0ff Mon Sep 17 00:00:00 2001 From: MediaPipe Team Date: Mon, 9 Dec 2019 13:01:04 -0800 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: 87e46800807001e01d686fd7bcc2533714556920 --- mediapipe/calculators/tflite/tflite_inference_calculator.cc | 2 +- mediapipe/docs/install.md | 2 +- mediapipe/docs/object_tracking_mobile_gpu.md | 4 ++-- setup_opencv.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mediapipe/calculators/tflite/tflite_inference_calculator.cc b/mediapipe/calculators/tflite/tflite_inference_calculator.cc index de693865b..241319644 100644 --- a/mediapipe/calculators/tflite/tflite_inference_calculator.cc +++ b/mediapipe/calculators/tflite/tflite_inference_calculator.cc @@ -464,7 +464,7 @@ REGISTER_CALCULATOR(TfLiteInferenceCalculator); // Get model name. if (!options.model_path().empty()) { - auto model_path = options.model_path(); + std::string model_path = options.model_path(); ASSIGN_OR_RETURN(model_path_, mediapipe::PathToResourceAsFile(model_path)); } else { diff --git a/mediapipe/docs/install.md b/mediapipe/docs/install.md index cdee42746..ff563f657 100644 --- a/mediapipe/docs/install.md +++ b/mediapipe/docs/install.md @@ -380,7 +380,7 @@ To build and run iOS apps: 4. Install the needed packages. ```bash - username@DESKTOP-TMVLBJ1:~$ sudo apt-get update && sudo apt-get install -y --no-install-recommends build-essential git python zip adb openjdk-8-jdk + username@DESKTOP-TMVLBJ1:~$ sudo apt-get update && sudo apt-get install -y build-essential git python zip adb openjdk-8-jdk ``` 5. Install Bazel (0.24.1 and above required). diff --git a/mediapipe/docs/object_tracking_mobile_gpu.md b/mediapipe/docs/object_tracking_mobile_gpu.md index aacd1f288..2e2c551f0 100644 --- a/mediapipe/docs/object_tracking_mobile_gpu.md +++ b/mediapipe/docs/object_tracking_mobile_gpu.md @@ -5,7 +5,7 @@ This doc focuses on the that performs object detection and tracking. Note that object detection is using TensorFlow Lite on GPU while tracking is using CPU. -For overall context on hand detection and hand tracking, please read this +For overall context on object detection and tracking, please read this [Google Developer Blog](https://mediapipe.page.link/objecttrackingblog). ![object_tracking_android_gpu_gif](images/mobile/object_tracking_android_gpu.gif) @@ -437,7 +437,7 @@ node: { ### Renderer Subgraph -![hand_renderer_gpu_subgraph.pbtxt](images/mobile/object_tracking_renderer_gpu_subgraph.png) +![object_tracking_renderer_gpu_subgraph.pbtxt](images/mobile/object_tracking_renderer_gpu_subgraph.png) [Source pbtxt file](https://github.com/google/mediapipe/tree/master/mediapipe/graphs/tracking/subgraphs/renderer_gpu.pbtxt) diff --git a/setup_opencv.sh b/setup_opencv.sh index fcf1be7a5..8e4209eb6 100644 --- a/setup_opencv.sh +++ b/setup_opencv.sh @@ -49,7 +49,7 @@ cmake .. -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=/usr/local \ -DBUILD_opencv_rgbd=OFF -DBUILD_opencv_saliency=OFF -DBUILD_opencv_shape=OFF \ -DBUILD_opencv_structured_light=OFF -DBUILD_opencv_surface_matching=OFF \ -DBUILD_opencv_world=OFF -DBUILD_opencv_xobjdetect=OFF -DBUILD_opencv_xphoto=OFF -make -j +make -j 16 sudo make install rm -rf /tmp/build_opencv echo "OpenCV has been built. You can find the header files and libraries in /usr/local/include/opencv4/opencv2 and /usr/local/lib"