[MVQA] Change mv_infer_test order

Change-Id: I5a156f2192ec59fdf276413843af06852d47c2e4
Signed-off-by: Kwang Son <k.son@samsung.com>

diff --git a/script/mvqa/db.py b/script/mvqa/db.py
index 9190239..ba0b737 100644 (file)
--- a/script/mvqa/db.py
+++ b/script/mvqa/db.py
@@ -133,7 +133,12 @@ class Session:
         pass
 
     def verify(self, result, label):
-        pass
+        rv = result.decode('utf-8')
+        trunk = rv[rv.find('callback:'):]
+        time_target = 'time : '
+        task_time = trunk[trunk.find(
+            time_target) + len(time_target): trunk.find('(ms)')]
+        return (int(task_time), trunk[:trunk.find('(ms)')])
 
     def get_db_meta(self):
         for ele in self.nas_config:
@@ -222,7 +227,7 @@ class FaceCascadeDetection(Session):
 class FaceDetectionTFlite(FaceCascadeDetection):
     def run(self, item):
         file_path = os.path.basename(item)
-        command = '3\n2\n1\n5\n1\n6\n' + \
+        command = '3\n5\n1\n7\n1\n8\n' + \
             os.path.join(self.work_dir, file_path) + '\n2\n2\n'
         subp = subprocess.run(['sdb', 'shell', 'mv_infer_test_suite'],
                               stdout=subprocess.PIPE, input=command.encode('UTF-8'))
@@ -234,7 +239,7 @@ class FaceDetectionTFlite(FaceCascadeDetection):
         time_target = 'time : '
         task_time = trunk[trunk.find(
             time_target) + len(time_target): trunk.find('(ms)')]
-        return (task_time, trunk[:trunk.find('(ms)')])
+        return (int(task_time), trunk[:trunk.find('(ms)')])
 
 
 class ImageClassification(Session):
@@ -255,14 +260,6 @@ class ImageClassification(Session):
                               stdout=subprocess.PIPE, input=command.encode('UTF-8'))
         return subp.stdout
 
-    def verify(self, result, label):
-        rv = result.decode('utf-8')
-        trunk = rv[rv.find('callback:'):]
-        time_target = 'time : '
-        task_time = trunk[trunk.find(
-            time_target) + len(time_target): trunk.find('(ms)')]
-        return (task_time, trunk[:trunk.find('(ms)')])
-
     def clean(self, item):
         file_path = os.path.basename(item)
         os.system('sdb shell rm ' + os.path.join(self.work_dir, file_path))
@@ -287,14 +284,6 @@ class ObjectDetection(Session):
                               stdout=subprocess.PIPE, input=command.encode('UTF-8'))
         return subp.stdout
 
-    def verify(self, result, label):
-        rv = result.decode('utf-8')
-        trunk = rv[rv.find('callback:'):]
-        time_target = 'time : '
-        task_time = trunk[trunk.find(
-            time_target) + len(time_target): trunk.find('(ms)')]
-        return (task_time, trunk[:trunk.find('(ms)')])
-
     def clean(self, item):
         file_path = os.path.basename(item)
         os.system('sdb shell rm ' + os.path.join(self.work_dir, file_path))