From 340622fee3ae3cc47fc1a0a577b83ac75bca6a6d Mon Sep 17 00:00:00 2001 From: gineshidalgo99 Date: Wed, 3 May 2017 10:05:47 -0400 Subject: [PATCH] Fixed some wrapper & doc typos --- README.md | 2 +- doc/demo_overview.md | 2 +- examples/openpose/rtpose.cpp | 2 +- examples/tutorial_wrapper/1_user_asynchronous.cpp | 2 +- examples/tutorial_wrapper/2_user_synchronous.cpp | 2 +- include/openpose/wrapper/wrapper.hpp | 3 ++- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 1524543f..85e34530 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Library main functionality: * Image, video and webcam reader. -* Able to save the results in various format(JSON, XML, PNG, JPG, ...). +* Able to save and load the results in various formats (JSON, XML, PNG, JPG, ...). * Small display and GUI for simple result visualization. diff --git a/doc/demo_overview.md b/doc/demo_overview.md index 3add748f..9354e440 100644 --- a/doc/demo_overview.md +++ b/doc/demo_overview.md @@ -44,7 +44,7 @@ Please, in order to check all the real time pose demo options and their details, `--video input.mp4`: Input video. If omitted, it will use the webcam. -`--camera 3`: Choose webcam number (default: 0). If `--camera`, --image_dir` and `--write_video` are omitted, it is equivalent to use `--camera 0`. +`--camera 3`: Choose webcam number (default: 0). If `--camera`, `--image_dir` and `--write_video` are omitted, it is equivalent to use `--camera 0`. `--image_dir path_to_images/`: Run on all images (jpg, png, bmp, etc.) in `path_to_images/`. You can test the program with the image directory `examples/media/`. diff --git a/examples/openpose/rtpose.cpp b/examples/openpose/rtpose.cpp index f1052fd4..14d70065 100755 --- a/examples/openpose/rtpose.cpp +++ b/examples/openpose/rtpose.cpp @@ -260,7 +260,7 @@ int opRealTimePoseDemo() // Producer (use default to disable any input) // Consumer (comment or use default argument to disable any output) opWrapper.configure(wrapperStructPose, wrapperStructInput, wrapperStructOutput); - // Set to single-thread running (for debugging purposes) + // Set to single-thread running (e.g. for debugging purposes) // opWrapper.disableMultiThreading(); // Start processing diff --git a/examples/tutorial_wrapper/1_user_asynchronous.cpp b/examples/tutorial_wrapper/1_user_asynchronous.cpp index 509afa8d..4f9dc1d4 100644 --- a/examples/tutorial_wrapper/1_user_asynchronous.cpp +++ b/examples/tutorial_wrapper/1_user_asynchronous.cpp @@ -296,7 +296,7 @@ int openPoseTutorialWrapper1() // Producer (use default to disable any input) // Consumer (comment or use default argument to disable any output) opWrapper.configure(wrapperStructPose, op::WrapperStructInput{}, wrapperStructOutput); - // Set to single-thread running (for debugging purposes) + // Set to single-thread running (e.g. for debugging purposes) // opWrapper.disableMultiThreading(); op::log("Starting thread(s)", op::Priority::Max); diff --git a/examples/tutorial_wrapper/2_user_synchronous.cpp b/examples/tutorial_wrapper/2_user_synchronous.cpp index bafabf1b..ac047e48 100644 --- a/examples/tutorial_wrapper/2_user_synchronous.cpp +++ b/examples/tutorial_wrapper/2_user_synchronous.cpp @@ -358,7 +358,7 @@ int openPoseTutorialWrapper2() // Producer (use default to disable any input) // Consumer (comment or use default argument to disable any output) opWrapper.configure(wrapperStructPose, op::WrapperStructInput{}, wrapperStructOutput); - // Set to single-thread running (for debugging purposes) + // Set to single-thread running (e.g. for debugging purposes) // opWrapper.disableMultiThreading(); op::log("Starting thread(s)", op::Priority::Max); diff --git a/include/openpose/wrapper/wrapper.hpp b/include/openpose/wrapper/wrapper.hpp index a2cbfc0d..7f37845c 100644 --- a/include/openpose/wrapper/wrapper.hpp +++ b/include/openpose/wrapper/wrapper.hpp @@ -966,7 +966,8 @@ namespace op } else { - log("Debugging activated, only 1 thread running, all spWPoses have been disabled but the first one."); + log("Multi-threading disabled, only 1 thread running. All GPUs have been disabled but the first one, which is defined by" + " gpuNumberStart (in the demo, it is set with the `num_gpu_start` flag."); mThreadManager.add(mThreadId, spWPoses.at(0), queueIn, queueOut); } queueIn++;