updated help text

zohartal · Jul 12, 2020 · 8aba789 · 8aba789
1 parent 466c91d
commit 8aba789
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 30 deletions.
diff --git a/c/detectNet.h b/c/detectNet.h
@@ -87,7 +87,7 @@
             "  --alpha=ALPHA         overlay alpha blending value, range 0-255 (default: 120)\n"					\
 		  "  --overlay=OVERLAY     detection overlay flags (e.g. --overlay=box,labels,conf)\n"					\
 		  "                        valid combinations are:  'box', 'labels', 'conf', 'none'\n"					\
-		  "  --profile             enable layer profiling in TensorRT\n"
+		  "  --profile             enable layer profiling in TensorRT\n\n"
 
 
 /**

diff --git a/c/imageNet.h b/c/imageNet.h
@@ -64,7 +64,7 @@
 		  "  --input-blob=INPUT   name of the input layer (default is '" IMAGENET_DEFAULT_INPUT "')\n" 	\
 		  "  --output-blob=OUTPUT name of the output layer (default is '" IMAGENET_DEFAULT_OUTPUT "')\n" 	\
 		  "  --batch-size=BATCH   maximum batch size (default is 1)\n"								\
-		  "  --profile            enable layer profiling in TensorRT\n"
+		  "  --profile            enable layer profiling in TensorRT\n\n"
 
 
 /**

diff --git a/c/segNet.h b/c/segNet.h
@@ -74,7 +74,7 @@
             "  --alpha=ALPHA        overlay alpha blending value, range 0-255 (default: 120)\n"			\
 		  "  --visualize=VISUAL   visualization flags (e.g. --visualize=overlay,mask)\n"				\
 		  "                       valid combinations are:  'overlay', 'mask'\n"						\
-		  "  --profile            enable layer profiling in TensorRT\n"
+		  "  --profile            enable layer profiling in TensorRT\n\n"
 
 
 /**

diff --git a/examples/detectnet/detectnet.cpp b/examples/detectnet/detectnet.cpp
@@ -23,9 +23,6 @@
 #include "videoSource.h"
 #include "videoOutput.h"
 
-#include "logging.h"
-#include "commandLine.h"
-
 #include "detectNet.h"
 
 #include <signal.h>
@@ -59,10 +56,10 @@ int usage()
 	printf("    input_URI       resource URI of input stream  (see videoSource below)\n");
 	printf("    output_URI      resource URI of output stream (see videoOutput below)\n\n");
 
-	printf("%s\n", detectNet::Usage());
-	printf("%s\n", videoSource::Usage());
-	printf("%s\n", videoOutput::Usage());
-	printf("%s\n", Log::Usage());
+	printf("%s", detectNet::Usage());
+	printf("%s", videoSource::Usage());
+	printf("%s", videoOutput::Usage());
+	printf("%s", Log::Usage());
 
 	return 0;
 }

diff --git a/examples/imagenet/imagenet.cpp b/examples/imagenet/imagenet.cpp
@@ -24,9 +24,6 @@
 #include "videoOutput.h"
 
 #include "cudaFont.h"
-#include "commandLine.h"
-#include "logging.h"
-
 #include "imageNet.h"
 
 #include <signal.h>
@@ -60,10 +57,10 @@ int usage()
 	printf("    input_URI       resource URI of input stream  (see videoSource below)\n");
 	printf("    output_URI      resource URI of output stream (see videoOutput below)\n\n");
 
-	printf("%s\n", imageNet::Usage());
-	printf("%s\n", videoSource::Usage());
-	printf("%s\n", videoOutput::Usage());
-	printf("%s\n", Log::Usage());
+	printf("%s", imageNet::Usage());
+	printf("%s", videoSource::Usage());
+	printf("%s", videoOutput::Usage());
+	printf("%s", Log::Usage());
 
 	return 0;
 }

diff --git a/examples/segnet/segnet.cpp b/examples/segnet/segnet.cpp
@@ -26,20 +26,17 @@
 #include "cudaOverlay.h"
 #include "cudaMappedMemory.h"
 
-#include "logging.h"
-#include "commandLine.h"
-
 #include "segNet.h"
 
 #include <signal.h>
 
 
 #ifdef HEADLESS
-	#define IS_HEADLESS() "headless"	// run without display
-	#define DEFAULT_VISUALIZATION "overlay"
+	#define IS_HEADLESS() "headless"             // run without display
+	#define DEFAULT_VISUALIZATION "overlay"      // output overlay only
 #else
-	#define IS_HEADLESS() (const char*)NULL
-	#define DEFAULT_VISUALIZATION "overlay|mask"
+	#define IS_HEADLESS() (const char*)NULL      // use display (if attached)
+	#define DEFAULT_VISUALIZATION "overlay|mask" // output overlay + mask
 #endif
 
 

diff --git a/python/examples/detectnet.py b/python/examples/detectnet.py
@@ -29,7 +29,8 @@
 
 # parse the command line
 parser = argparse.ArgumentParser(description="Locate objects in a live camera stream using an object detection DNN.", 
-						   formatter_class=argparse.RawTextHelpFormatter, epilog=jetson.inference.detectNet.Usage())
+                                 formatter_class=argparse.RawTextHelpFormatter, epilog=jetson.inference.detectNet.Usage() +
+                                 jetson.utils.videoSource.Usage() + jetson.utils.videoOutput.Usage() + jetson.utils.logUsage())
 
 parser.add_argument("input_URI", type=str, default="", nargs='?', help="URI of the input stream")
 parser.add_argument("output_URI", type=str, default="", nargs='?', help="URI of the output stream")

diff --git a/python/examples/imagenet.py b/python/examples/imagenet.py
@@ -30,7 +30,8 @@
 
 # parse the command line
 parser = argparse.ArgumentParser(description="Classify a live camera stream using an image recognition DNN.", 
-						   formatter_class=argparse.RawTextHelpFormatter, epilog=jetson.inference.imageNet.Usage())
+                                 formatter_class=argparse.RawTextHelpFormatter, epilog=jetson.inference.imageNet.Usage() +
+                                 jetson.utils.videoSource.Usage() + jetson.utils.videoOutput.Usage() + jetson.utils.logUsage())
 
 parser.add_argument("input_URI", type=str, default="", nargs='?', help="URI of the input stream")
 parser.add_argument("output_URI", type=str, default="", nargs='?', help="URI of the output stream")

diff --git a/python/examples/my-detection.py b/python/examples/my-detection.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
 #

diff --git a/python/examples/my-recognition.py b/python/examples/my-recognition.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
 #

diff --git a/python/examples/segnet.py b/python/examples/segnet.py
@@ -25,14 +25,14 @@
 import jetson.utils
 
 import argparse
-import ctypes
 import sys
 
 from segnet_utils import *
 
 # parse the command line
 parser = argparse.ArgumentParser(description="Segment a live camera stream using an semantic segmentation DNN.", 
-						   formatter_class=argparse.RawTextHelpFormatter, epilog=jetson.inference.segNet.Usage())
+                                 formatter_class=argparse.RawTextHelpFormatter, epilog=jetson.inference.segNet.Usage() +
+                                 jetson.utils.videoSource.Usage() + jetson.utils.videoOutput.Usage() + jetson.utils.logUsage())
 
 parser.add_argument("input_URI", type=str, default="", nargs='?', help="URI of the input stream")
 parser.add_argument("output_URI", type=str, default="", nargs='?', help="URI of the output stream")