[Test/Py/CodeClean] reduce code complexity

Code clean, reduce complexity.
- use itertool to remove multi loops
- separate code blocks

Signed-off-by: Jaeyun <jy1210.jung@samsung.com>

Author: jaeyun-jung

tests/gen24bBMP.py

@@ -16,18 +16,6 @@
 import sys
 
 
-##
-# @brief Convert given data to bytes
-# @param[in] data The data to be converted to bytes array
-# @return bytes converted from the data
-#
-def convert_to_bytes(data):
-    if isinstance(data, bytes):
-        return data
-    else:
-        return pack("<B", data)
-
-
 ##
 # @brief Save bitmap "data" to "filename"
 # @param[in] filename The filename to be saves as a .bmp file.

tests/nnstreamer_converter/generateGoldenTestResult.py

@@ -15,6 +15,7 @@
 import os
 
 sys.path.append(os.path.dirname(os.path.abspath(os.path.dirname(__file__))))
+from test_utils import convert_to_bytes
 import gen24bBMP as bmp
 
 # Allow to create specific cases only if proper argument is given
@@ -144,21 +145,21 @@
     s = b''
     for y in range(0, 100):
         for x in range(0, 100):
-            s += bmp.convert_to_bytes(buf[y * 100 + x])
+            s += convert_to_bytes(buf[y * 100 + x])
     bmp.write('testcase_1_0.golden', s)
 
     s = b''
     for i in range(1, 3):
         for y in range(0, 100):
             for x in range(0, 100):
-                s += bmp.convert_to_bytes(buf[y * 100 + x + i * 100 * 100])
+                s += convert_to_bytes(buf[y * 100 + x + i * 100 * 100])
     bmp.write('testcase_1_1.golden', s)
 
     for i in range(0, 3):
         s = b''
         for y in range(0, 100):
             for x in range(0, 100):
-                s += bmp.convert_to_bytes(buf[y * 100 + x + i * 100 * 100])
+                s += convert_to_bytes(buf[y * 100 + x + i * 100 * 100])
         bmp.write('testcase_2_' + str(i) + '.golden', s)
 
     string = bmp.gen_BMP_stream('testsequence', 'testcase_stream.golden', 1)
@@ -167,23 +168,23 @@
     for i in range(0, 10):
         for y in range(0, 16):
             for x in range(0, 16):
-                s += bmp.convert_to_bytes(string[i][y * 16 + x])
+                s += convert_to_bytes(string[i][y * 16 + x])
     bmp.write('testcase_stream_1_0.golden', s)
 
     s = b''
     for i in range(0, 10):
         for j in range(1, 3):
             for y in range(0, 16):
                 for x in range(0, 16):
-                    s += bmp.convert_to_bytes(string[i][j * 16 * 16 + y * 16 + x])
+                    s += convert_to_bytes(string[i][j * 16 * 16 + y * 16 + x])
     bmp.write('testcase_stream_1_1.golden', s)
 
     for j in range(0, 3):
         s = b''
         for i in range(0, 10):
             for y in range(0, 16):
                 for x in range(0, 16):
-                    s += bmp.convert_to_bytes(string[i][j * 16 * 16 + y * 16 + x])
+                    s += convert_to_bytes(string[i][j * 16 * 16 + y * 16 + x])
         bmp.write('testcase_stream_2_' + str(j) + '.golden', s)
 
 if target == -1 or target == 12:

tests/nnstreamer_filter_caffe2/checkLabel.py

@@ -15,8 +15,7 @@
 import string
 
 sys.path.append(os.path.dirname(os.path.abspath(os.path.dirname(__file__))))
-from gen24bBMP import convert_to_bytes
-from test_utils import read_file
+from test_utils import convert_to_bytes, read_file
 
 
 bytearr = read_file(sys.argv[1])

tests/nnstreamer_filter_custom/checkScaledTensor.py

@@ -13,53 +13,15 @@
 import sys
 
 sys.path.append(os.path.dirname(os.path.abspath(os.path.dirname(__file__))))
-from test_utils import read_file
-
-
-def compare(data1, width1, height1, data2, width2, height2, innerdim):
-    if (len(data1) * width2 * height2) != (len(data2) * width1 * height1):
-        print(str(len(data1) * width2 * height2) + ' / ' + str(len(data2) * width1 * height1))
-        return 1
-
-    count = 0
-    count2 = 0
-    while count < len(data1):
-        # Terminated incorrectly
-        if (count + (innerdim * width1 * height1)) > len(data1):
-            return 2
-        if (count2 + (innerdim * width2 * height2)) > len(data2):
-            return 3
-        if count2 >= len(data2):
-            return 4
-
-        for y in range(0, height2):
-            for x in range(0, width2):
-                for c in range(0, innerdim):
-                    ix = x * width1 // width2
-                    iy = y * height1 // height2
-                    if data1[count + c + ix * innerdim + iy * width1 * innerdim] != \
-                            data2[count2 + c + x * innerdim + y * width2 * innerdim]:
-                        print('At ' + str(x) + ',' + str(y))
-                        return 5
-        count = count + innerdim * width1 * height1
-        count2 = count2 + innerdim * width2 * height2
-
-    if count > len(data1):
-        return 6
-    if count2 > len(data2):
-        return 7
-    return 0
+from test_utils import read_file, compare_scaled_tensor
 
 
 if len(sys.argv) != 8:
     exit(9)
 
-data1 = read_file(sys.argv[1])
-width1 = int(sys.argv[2])
-height1 = int(sys.argv[3])
-data2 = read_file(sys.argv[4])
-width2 = int(sys.argv[5])
-height2 = int(sys.argv[6])
+# (data, width, height)
+data1 = (read_file(sys.argv[1]), int(sys.argv[2]), int(sys.argv[3]))
+data2 = (read_file(sys.argv[4]), int(sys.argv[5]), int(sys.argv[6]))
 innerdim = int(sys.argv[7])
 
-exit(compare(data1, width1, height1, data2, width2, height2, innerdim))
+exit(compare_scaled_tensor(data1, data2, innerdim))

tests/nnstreamer_filter_python3/checkScaledTensor.py

@@ -14,55 +14,15 @@
 import sys
 
 sys.path.append(os.path.dirname(os.path.abspath(os.path.dirname(__file__))))
-from test_utils import read_file
-
-
-##
-# @brief Compare original content and scaled one
-def compare(data1, width1, height1, data2, width2, height2, innerdim):
-    if (len(data1) * width2 * height2) != (len(data2) * width1 * height1):
-        print(str(len(data1) * width2 * height2) + ' / ' + str(len(data2) * width1 * height1))
-        return 1
-
-    count = 0
-    count2 = 0
-    while count < len(data1):
-        # Terminated incorrectly
-        if (count + (innerdim * width1 * height1)) > len(data1):
-            return 2
-        if (count2 + (innerdim * width2 * height2)) > len(data2):
-            return 3
-        if count2 >= len(data2):
-            return 4
-
-        for y in range(0, height2):
-            for x in range(0, width2):
-                for c in range(0, innerdim):
-                    ix = x * width1 // width2
-                    iy = y * height1 // height2
-                    if data1[count + c + ix * innerdim + iy * width1 * innerdim] != \
-                            data2[count2 + c + x * innerdim + y * width2 * innerdim]:
-                        print('At ' + str(x) + ',' + str(y))
-                        return 5
-        count = count + innerdim * width1 * height1
-        count2 = count2 + innerdim * width2 * height2
-
-    if count > len(data1):
-        return 6
-    if count2 > len(data2):
-        return 7
-    return 0
+from test_utils import read_file, compare_scaled_tensor
 
 
 if len(sys.argv) != 8:
     exit(9)
 
-data1 = read_file(sys.argv[1])
-width1 = int(sys.argv[2])
-height1 = int(sys.argv[3])
-data2 = read_file(sys.argv[4])
-width2 = int(sys.argv[5])
-height2 = int(sys.argv[6])
+# (data, width, height)
+data1 = (read_file(sys.argv[1]), int(sys.argv[2]), int(sys.argv[3]))
+data2 = (read_file(sys.argv[4]), int(sys.argv[5]), int(sys.argv[6]))
 innerdim = int(sys.argv[7])
 
-exit(compare(data1, width1, height1, data2, width2, height2, innerdim))
+exit(compare_scaled_tensor(data1, data2, innerdim))

tests/nnstreamer_filter_pytorch/checkLabel.py

@@ -14,8 +14,7 @@
 import string
 
 sys.path.append(os.path.dirname(os.path.abspath(os.path.dirname(__file__))))
-from gen24bBMP import convert_to_bytes
-from test_utils import read_file
+from test_utils import convert_to_bytes, read_file
 
 
 # Verify that the output of test case verifies the filename of the input

tests/nnstreamer_filter_tensorflow/checkLabel.py

@@ -15,8 +15,7 @@
 import string
 
 sys.path.append(os.path.dirname(os.path.abspath(os.path.dirname(__file__))))
-from gen24bBMP import convert_to_bytes
-from test_utils import read_file
+from test_utils import convert_to_bytes, read_file
 
 
 bytearr = read_file(sys.argv[1])

tests/nnstreamer_filter_tensorflow2_lite/checkLabel.py

@@ -14,8 +14,7 @@
 import string
 
 sys.path.append(os.path.dirname(os.path.abspath(os.path.dirname(__file__))))
-from gen24bBMP import convert_to_bytes
-from test_utils import read_file, read_label
+from test_utils import convert_to_bytes, read_file, read_label
 
 
 onehot = read_file(sys.argv[1])

tests/nnstreamer_filter_tensorflow_lite/checkLabel.py

@@ -14,8 +14,7 @@
 import string
 
 sys.path.append(os.path.dirname(os.path.abspath(os.path.dirname(__file__))))
-from gen24bBMP import convert_to_bytes
-from test_utils import read_file, read_label
+from test_utils import convert_to_bytes, read_file, read_label
 
 
 onehot = read_file(sys.argv[1])

tests/nnstreamer_filter_tensorrt/CheckMnist.py

@@ -14,7 +14,7 @@
 import os
 
 sys.path.append(os.path.dirname(os.path.abspath(os.path.dirname(__file__))))
-from gen24bBMP import convert_to_bytes
+from test_utils import convert_to_bytes
 
 
 def get_label(fname):

tests/nnstreamer_repo_lstm/generateTestCase.py

@@ -13,8 +13,6 @@
 
 from __future__ import print_function
 
-import sys
-import os
 import array as arr
 import numpy as np
 

tests/nnstreamer_repo_rnn/generateTestCase.py

@@ -16,14 +16,7 @@
 
 from __future__ import print_function
 
-import sys
-import os
 import array as arr
-import struct
-import string
-
-sys.path.append(os.path.dirname(os.path.abspath(os.path.dirname(__file__))))
-from gen24bBMP import convert_to_bytes
 
 
 def location(c, w, h):

tests/test_utils.py

@@ -12,6 +12,8 @@
 
 import sys
 import os
+from itertools import product
+from struct import pack
 
 
 ##
@@ -28,3 +30,61 @@ def read_label(filename):
     with open(filename, 'r') as f:
         lines = f.readlines()
     return lines
+
+
+##
+# @brief Write the data to file
+def write_file(filename, data):
+    with open(filename, 'wb') as f:
+        f.write(data)
+
+
+##
+# @brief Convert given data to bytes
+# @param[in] data The data to be converted to bytes array
+# @return bytes converted from the data
+def convert_to_bytes(data):
+    if isinstance(data, bytes):
+        return data
+    return pack("<B", data)
+
+
+##
+# @brief Compare original content and scaled one
+def compare_scaled_tensor(d1, d2, innerdim):
+    # data should be tuple (data, width, height)
+    data1, width1, height1 = d1
+    data2, width2, height2 = d2
+    count1 = count2 = 0
+    len1 = len(data1)
+    len2 = len(data2)
+
+    if (len1 * width2 * height2) != (len2 * width1 * height1):
+        print(str(len1 * width2 * height2) + ' / ' + str(len2 * width1 * height1))
+        return 1
+
+    while count1 < len1:
+        # Terminated incorrectly
+        if (count1 + (innerdim * width1 * height1)) > len1:
+            return 2
+        if (count2 + (innerdim * width2 * height2)) > len2:
+            return 3
+        if count2 >= len2:
+            return 4
+
+        for y, x, c in product(range(0, height2), range(0, width2), range(0, innerdim)):
+            ix = x * width1 // width2
+            iy = y * height1 // height2
+            if data1[count1 + c + ix * innerdim + iy * width1 * innerdim] != \
+                    data2[count2 + c + x * innerdim + y * width2 * innerdim]:
+                print('At ' + str(x) + ',' + str(y))
+                return 5
+
+        count1 = count1 + innerdim * width1 * height1
+        count2 = count2 + innerdim * width2 * height2
+
+    if count1 > len1:
+        return 6
+    if count2 > len2:
+        return 7
+    return 0