Merge pull request #90 from KchnKchn/benchmark

Benchmark fix
itlab-vision · Oct 2, 2019 · 9dc9bc9 · 9dc9bc9
2 parents 2b46ee6 + e55915a
commit 9dc9bc9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/benchmark/config_parser.py b/src/benchmark/config_parser.py
@@ -134,11 +134,11 @@ def __init__(self, batch_size, mode, plugin, plugin_path, async_request_count, i
             raise ValueError('Iteration count is required parameter. \
                 Iteration count can only take values: integer greater than zero.')
         if self.mode == 'Sync':
-            if self._parameter_not_is_none(thread_count) and self._int_value_is_correct(thread_count):
-                self.nthreads = int(thread_count)
-            else:
-                raise ValueError('Thread count is required parameter for sync mode. \
-                    Thread count can only take values: integer greater than zero.')
+            if self._parameter_not_is_none(thread_count):
+                if self._int_value_is_correct(thread_count):
+                    self.nthreads = int(thread_count)
+                else:
+                    raise ValueError('Thread count can only take values: integer greater than zero.')
             if self._parameter_not_is_none(min_inference_time) and self._float_value_is_correct(min_inference_time):
                 self.min_inference_time = float(min_inference_time)
             else:
@@ -150,11 +150,11 @@ def __init__(self, batch_size, mode, plugin, plugin_path, async_request_count, i
             else:
                 raise ValueError('Async requiest count is required parameter for async mode. \
                     Async requiest count can only take values: integer greater than zero.')
-            if self._parameter_not_is_none(stream_count) and self._int_value_is_correct(stream_count):
-                self.nstreams = stream_count
-            else:
-                raise ValueError('Stream count is required parameter for async mode. \
-                    Stream count can only take values: integer greater than zero.')
+            if self._parameter_not_is_none(stream_count):
+                if self._int_value_is_correct(stream_count):
+                    self.nstreams = stream_count
+                else:
+                    raise ValueError('Stream count can only take values: integer greater than zero.')
 
 
 class test:

diff --git a/src/benchmark/output.py b/src/benchmark/output.py
@@ -33,6 +33,8 @@ def create_table_row(model, dataset, param, average_time, latency, fps):
     parameters.update({'Min inference time(s)' : param.min_inference_time})
     other_param = ''
     for key in parameters:
+        if key == 'Min inference time(s)' and parameters[key] == 0.0:
+            continue
         if parameters[key] != None:
             other_param += '{}: {}, '.format(key, parameters[key])
     other_param = other_param[:-2]