network updates

dusty-nv · Jun 19, 2020 · ff66dbd · ff66dbd
1 parent 8924629
commit ff66dbd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/c/segNet.cpp b/c/segNet.cpp
@@ -670,6 +670,18 @@ bool segNet::Process( void* image, uint32_t width, uint32_t height, imageFormat
 		return false;
 	}
 
+	if( !imageFormatIsRGB(format) )
+	{
+		LogError(LOG_TRT "segNet -- unsupported image format (%s)\n", imageFormatToStr(format));
+		LogError(LOG_TRT "          supported formats are:\n");
+		LogError(LOG_TRT "              * rgb8\n");		
+		LogError(LOG_TRT "              * rgba8\n");		
+		LogError(LOG_TRT "              * rgb32f\n");		
+		LogError(LOG_TRT "              * rgba32f\n");
+
+		return cudaErrorInvalidValue;
+	}
+
 	PROFILER_BEGIN(PROFILER_PREPROCESS);
 
 	if( IsModelType(MODEL_ONNX) )

diff --git a/c/segNet.cu b/c/segNet.cu
@@ -22,7 +22,7 @@
 
 #include "cudaUtility.h"
 #include "cudaVector.h"
-#include "imageFormat.h"
+#include "segNet.h"
 
 
 // gpuSegOverlay
@@ -168,7 +168,16 @@ cudaError_t cudaSegOverlay( void* input, uint32_t in_width, uint32_t in_height,
 		return cudaErrorInvalidValue;
 
 	if( !imageFormatIsRGB(format) )
+	{
+		LogError(LOG_TRT "segNet -- unsupported image format (%s)\n", imageFormatToStr(format));
+		LogError(LOG_TRT "          supported formats are:\n");
+		LogError(LOG_TRT "              * rgb8\n");		
+		LogError(LOG_TRT "              * rgba8\n");		
+		LogError(LOG_TRT "              * rgb32f\n");		
+		LogError(LOG_TRT "              * rgba32f\n");
+
 		return cudaErrorInvalidValue;
+	}
 
 	// launch kernel
 	const dim3 blockDim(8, 8);

diff --git a/c/tensorNet.cpp b/c/tensorNet.cpp
@@ -944,7 +944,7 @@ bool tensorNet::LoadNetwork( const char* prototxt_path_, const char* model_path_
 		mModelType = model_fmt;
 		mModelPath = model_path;
 
-		LogSuccess(LOG_TRT "device %s, %s initialized.\n", deviceTypeToStr(device), mModelPath.c_str());	
+		LogSuccess(LOG_TRT "device %s, initialized %s\n", deviceTypeToStr(device), mModelPath.c_str());	
 		return true;
 	}
 
@@ -1025,7 +1025,7 @@ bool tensorNet::LoadNetwork( const char* prototxt_path_, const char* model_path_
 			return false;
 	}
 
-	LogSuccess(LOG_TRT "device %s, %s loaded\n", deviceTypeToStr(device), model_path.c_str());
+	LogSuccess(LOG_TRT "device %s, loaded %s\n", deviceTypeToStr(device), model_path.c_str());
 
 
 	/*