Update the debug msg and Add result paser for security_barrier_camera…

…_demo.

Signed-off-by: Wang, Yang <[email protected]>

demos/common/cpp/utils/include/utils/threads_common.hpp

@@ -66,10 +66,8 @@ class Worker {
     }
     void runThreads() {
         running = true;
-        slog::debug << "thread pool size: " << threadPool.size() << slog::endl;
         for (std::thread& t : threadPool) {
             t = std::thread(&Worker::threadFunc, this);
-            slog::debug << "thread is pushing now." << slog::endl;
         }
     }
     void push(std::shared_ptr<Task> task) {
@@ -79,7 +77,6 @@ class Worker {
         tasksCondVar.notify_one();
     }
     void threadFunc() {
-        slog::debug << "thread is running now." << slog::endl;
         while (running) {
             std::unique_lock<std::mutex> lk(tasksMutex);
             while (running && tasks.empty()) {

demos/security_barrier_camera_demo/cpp/main.cpp

@@ -220,8 +220,8 @@ class ClassifiersAggregator {
         std::mutex& printMutex = static_cast<ReborningVideoFrame*>(sharedVideoFrame.get())->context.classifiersAggregatorPrintMutex;
         printMutex.lock();
         if (FLAGS_r && !rawDetections.empty()) {
-            //slog::debug << "--Channel #" << sharedVideoFrame->sourceID <<"--Frame #" << sharedVideoFrame->frameId << "-----" << slog::endl;
-            slog::debug << rawDetections;
+            for (const std::string& rawDetection : rawDetections)
+                slog::debug << rawDetection << slog::endl;
             // destructor assures that none uses the container
             for (const std::string& rawAttribute : rawAttributes.container) {
                 slog::debug << rawAttribute << slog::endl;
@@ -431,6 +431,7 @@ bool DetectionsProcessor::isReady() {
         classifiersAggregator = std::make_shared<ClassifiersAggregator>(sharedVideoFrame);
         std::list<Detector::Result> results;
         results = context.inferTasksContext.detector.getResults(*inferRequest, sharedVideoFrame->sourceID, sharedVideoFrame->frameId, sharedVideoFrame->frame.size(), classifiersAggregator->rawDetections);
+
         for (Detector::Result result : results) {
             switch (result.label) {
                 case 1:
@@ -833,7 +834,6 @@ int main(int argc, char* argv[]) {
                 readerCount++;
             }
         }
-        slog::debug << "Reader Count: " << readerCount << slog::endl;
 
         // Running
         worker->runThreads();

demos/security_barrier_camera_demo/cpp/net_wrappers.hpp

@@ -139,7 +139,6 @@ class Detector {
         std::list<Result> results;
         ov::Tensor output_tensor = inferRequest.get_tensor(m_detectorOutputName);
         const float* const detections = output_tensor.data<float>();
-        slog::debug << "------- Channel #" << channelID << " - Frame #" << frameID << slog::endl;
         // pretty much regular SSD post-processing
         for (int i = 0; i < maxProposalCount; i++) {
             float image_id = detections[i * objectSize + 0]; // in case of batch
@@ -159,14 +158,11 @@ class Detector {
             rect.height = static_cast<int>(detections[i * objectSize + 6] * upscale.height) - rect.y;
             results.push_back(Result{label, confidence, rect});
             std::ostringstream rawResultsStream;
-            rawResultsStream << "[" << i << "," << label << "] element, prob = " << confidence
-                        << "    (" << rect.x << "," << rect.y << ")-(" << rect.width << "," << rect.height << ")";
-
+            rawResultsStream << "ChannelId:" << channelID << ",FrameId:" << frameID << ",";
+            rawResultsStream << "ObjId:" << i << "," << label << "," << confidence
+                        << "," << rect.x << "," << rect.y << "," << rect.width << "," << rect.height;
             rawResults.push_back(rawResultsStream.str());
         }
-
-        if(results.size() != 3)
-            slog::debug << "==== Channel #" << channelID << "-Frame #" << frameID << "-ROI Number #" << results.size() << " ====" << slog::endl;
         return results;
     }
 

demos/tests/cases.py

@@ -27,11 +27,10 @@
 # TODO with Python3.7 use namedtuple defaults instead
 TestCase.__new__.__defaults__ = [],
 
-
 class Demo:
     IMPLEMENTATION_TYPES = set()
 
-    def __init__(self, name, implementation, model_keys=None, device_keys=None, test_cases=None):
+    def __init__(self, name, implementation, model_keys=None, device_keys=None, test_cases=None, parser=None):
         self.implementation = implementation
         self.subdirectory = name + '/' + implementation
         self.device_keys = device_keys
@@ -40,7 +39,8 @@ def __init__(self, name, implementation, model_keys=None, device_keys=None, test
         self.test_cases = test_cases
 
         self._exec_name = self.subdirectory.replace('/', '_')
-        self.parser = None
+        self.parser = parser
+        self.results = {}
 
         Demo.IMPLEMENTATION_TYPES.add(implementation)
 
@@ -69,9 +69,13 @@ def add_parser(self, parser):
         self.parser = parser(self)
         return self
 
-    def parse_output(self, output, test_case, device):
+    def parse_output(self, output, device, test_case_index):
         if self.parser:
-            self.parser(output, test_case, device)
+            tmp = self.parser(output)
+            if device not in self.results:
+                self.results[device] = {}
+            self.results[device][test_case_index] = tmp
+            print (self.results)
 
     def update_option(self, updated_options):
         for case in self.test_cases[:]:
@@ -122,8 +126,8 @@ def set_precisions(self, precisions, model_info):
 
 
 class CppDemo(Demo):
-    def __init__(self, name, implementation='cpp', model_keys=None, device_keys=None, test_cases=None):
-        super().__init__(name, implementation, model_keys, device_keys, test_cases)
+    def __init__(self, name, implementation='cpp', model_keys=None, device_keys=None, test_cases=None, parser=None):
+        super().__init__(name, implementation, model_keys, device_keys, test_cases, parser)
 
         self._exec_name = self._exec_name.replace('_cpp', '')
 
@@ -151,7 +155,6 @@ def join_cases(*args):
     for case in args: extra_models.update(case.extra_models)
     return TestCase(options=options, extra_models=list(case.extra_models))
 
-
 def combine_cases(*args):
     return [join_cases(*combination)
         for combination in itertools.product(*[[arg] if isinstance(arg, TestCase) else arg for arg in args])]
@@ -160,6 +163,35 @@ def combine_cases(*args):
 def single_option_cases(key, *args):
     return [TestCase(options={} if arg is None else {key: arg}) for arg in args]
 
+def security_barrier_camera_damo_parser(output):
+    output = output.split('\n')
+    channel_results = {}
+    for line in output:
+        if "ChannelID" in line:
+            print (line)
+        if "DEBUG" not in line:
+            continue
+        item = line[line.find('Channel') : ].split(',')
+        # Channel ID
+        frame_results = {}
+        channel = item[0].split(':')
+        if channel[1] not in channel_results:
+            channel_results[channel[1]] = frame_results
+
+        # Frame ID
+        object_results = {}
+        frame = item[1].split(':')
+        if frame[1] not in channel_results[channel[1]]:
+            channel_results[channel[1]][frame[1]] = object_results
+
+        # Object ID
+        label_prob_pos_results = []
+        objid = item[2].split(':')
+        if objid[1] not in channel_results[channel[1]][frame[1]]:
+            channel_results[channel[1]][frame[1]][objid[1]] = label_prob_pos_results
+        channel_results[channel[1]][frame[1]][objid[1]] = item[3:]
+
+    return channel_results
 
 
 DEMOS = [
@@ -590,9 +622,11 @@ def single_option_cases(key, *args):
     CppDemo(name='security_barrier_camera_demo',
             model_keys=['-m', '-m_lpr', '-m_va'],
             device_keys=['-d', '-d_lpr', '-d_va'],
+            parser=security_barrier_camera_damo_parser,
             test_cases=combine_cases(
         TestCase(options={'-no_show': None,
             **MONITORS,
+            '-r': None,
             '-i': DataDirectoryArg('vehicle-license-plate-detection-barrier')}),
         TestCase(options={'-m': ModelArg('vehicle-license-plate-detection-barrier-0106')}),
         single_option_cases('-m_lpr',

demos/tests/run_tests.py

@@ -33,6 +33,7 @@
 import contextlib
 import csv
 import json
+from operator import contains
 import os
 import platform
 import shlex
@@ -321,13 +322,13 @@ def option_to_args(key, value):
                                 stderr=subprocess.STDOUT, universal_newlines=True, encoding='utf-8',
                                 env=demo_environment)
                             execution_time = timeit.default_timer() - start_time
-                            demo.parse_output(output, test_case, device)
+                            demo.parse_output(output, device, test_case_index)
                         except subprocess.CalledProcessError as e:
                             print(e.output)
                             print('Exit code:', e.returncode)
                             num_failures += 1
                             execution_time = -1
-
+                        
                         if args.report_file:
                             collect_result(demo.subdirectory, device, case_model_names, execution_time, args.report_file)