Revert "lint only python_black (#2698)"

This reverts commit 087be5c.

Author: sramakintel

Diff for: benchmarks/common/base_benchmark_util.py

@@ -37,7 +37,7 @@
 ONLINE_CPUS_LIST = "On-line CPU(s) list:"
 
 
-class CPUInfo:
+class CPUInfo():
     """CPU information class."""
 
     def __init__(self):
@@ -56,9 +56,7 @@ def _get_core_membind_info():
         :rtype: List[List[str, Any]]
         """
         args = ["lscpu", "--parse=CPU,Core,Socket,Node"]
-        process_lscpu = subprocess.check_output(args, universal_newlines=True).split(
-            "\n"
-        )
+        process_lscpu = subprocess.check_output(args, universal_newlines=True).split("\n")
 
         # Get information about core, node, socket and cpu. On a machine with no NUMA nodes, the last column is empty
         # so regex also check for empty string on the last column
@@ -102,15 +100,13 @@ def _sort_membind_info(membind_bind_info):
 
                 # Add core info
                 if cpu_id == core_id:
-                    core_info.update(
-                        {
-                            core_id: {
-                                "cpu_id": cpu_id,
-                                "node_id": node_id,
-                                "socket_id": socket_id,
-                            },
-                        }
-                    )
+                    core_info.update({
+                        core_id: {
+                            "cpu_id": cpu_id,
+                            "node_id": node_id,
+                            "socket_id": socket_id,
+                        },
+                    })
                 else:
                     # Add information about Hyper Threading
                     core_info[core_id]["ht_cpu_id"] = cpu_id
@@ -186,10 +182,10 @@ def binding_information(self):
 
 
 class PlatformUtil:
-    """
+    '''
     This module implements a platform utility that exposes functions that
     detects platform information.
-    """
+    '''
 
     def __init__(self, args):
         self.args = args
@@ -260,14 +256,13 @@ def _get_cpuset(self):
     def linux_init(self):
         lscpu_cmd = "lscpu"
         try:
-            lscpu_output = subprocess.check_output(
-                [lscpu_cmd], stderr=subprocess.STDOUT
-            )
+            lscpu_output = subprocess.check_output([lscpu_cmd],
+                                                   stderr=subprocess.STDOUT)
             # handle python2 vs 3 (bytes vs str type)
             if isinstance(lscpu_output, bytes):
-                lscpu_output = lscpu_output.decode("utf-8")
+                lscpu_output = lscpu_output.decode('utf-8')
 
-            cpu_info = lscpu_output.split("\n")
+            cpu_info = lscpu_output.split('\n')
 
         except Exception as e:
             print("Problem getting CPU info: {}".format(e))
@@ -301,9 +296,7 @@ def linux_init(self):
                 for node in range(0, self.num_numa_nodes):
                     if line.find(NUMA_NODE_CPU_RANGE_STR_.format(str(node))) == 0:
                         range_for_node = line.split(":")[1].strip()
-                        range_list_for_node = self._get_list_from_string_ranges(
-                            range_for_node
-                        )
+                        range_list_for_node = self._get_list_from_string_ranges(range_for_node)
                         core_list_per_node[node] = range_list_for_node
 
         # Try to get the cpuset.cpus info, since lscpu does not know if the cpuset is limited
@@ -317,11 +310,7 @@ def linux_init(self):
             # machine, so let's avoid unnecessary complexity and don't bother with the cpuset_cpu list.
             # The cpuset_cpus list will also get populated if the num_cores arg is being specified,
             # since this list will be used to create the numactl args in base_model_init.py
-            if (
-                (online_cpus_list != "" and online_cpus_list != cpuset)
-                or online_cpus_list == ""
-                or num_cores_arg != -1
-            ):
+            if (online_cpus_list != "" and online_cpus_list != cpuset) or online_cpus_list == "" or num_cores_arg != -1:
                 self.cpuset_cpus = self._get_list_from_string_ranges(cpuset)
 
         # Uses numactl get the core number for each numa node and adds the cores for each
@@ -334,55 +323,38 @@ def linux_init(self):
         else:
             cores_per_node = self.num_cores_per_socket
         if hasattr(self.args, "numa_cores_per_instance"):
-            if (
-                self.num_numa_nodes > 0
-                and self.args.numa_cores_per_instance is not None
-            ):
+            if self.num_numa_nodes > 0 and self.args.numa_cores_per_instance is not None:
                 try:
                     # Get the list of cores
-                    cpu_array_command = (
-                        "numactl -H | grep 'node [0-9]* cpus:' |"
+                    cpu_array_command = \
+                        "numactl -H | grep 'node [0-9]* cpus:' |" \
                         "sed 's/.*node [0-9]* cpus: *//' | head -{0} |cut -f1-{1} -d' '".format(
-                            self.num_numa_nodes, int(cores_per_node)
-                        )
-                    )
+                            self.num_numa_nodes, int(cores_per_node))
                     cpu_array = subprocess.Popen(
-                        cpu_array_command,
-                        shell=True,
-                        stdout=subprocess.PIPE,
-                        stderr=subprocess.PIPE,
-                    ).stdout.readlines()
+                        cpu_array_command, shell=True, stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE).stdout.readlines()
 
                     for node_cpus in cpu_array:
                         node_cpus = str(node_cpus).lstrip("b'").replace("\\n'", " ")
-                        self.cpu_core_list.append(
-                            [x for x in node_cpus.split(" ") if x != ""]
-                        )
+                        self.cpu_core_list.append([x for x in node_cpus.split(" ") if x != ''])
 
                     # If we have the cpuset list, cross check that list with our core list and
                     # remove cores that are not part of the cpuset list
                     if self.cpuset_cpus is not None:
                         for socket, core_list in enumerate(self.cpu_core_list):
-                            self.cpu_core_list[socket] = [
-                                x for x in core_list if int(x) in self.cpuset_cpus
-                            ]
+                            self.cpu_core_list[socket] = [x for x in core_list if int(x) in self.cpuset_cpus]
 
                     if hasattr(self.args, "verbose") and self.args.verbose:
                         print("Core list: {}".format(self.cpu_core_list), flush=True)
 
                 except Exception as e:
-                    print(
-                        "Warning: An error occured when getting the list of cores using '{}':\n {}".format(
-                            cpu_array_command, e
-                        )
-                    )
+                    print("Warning: An error occured when getting the list of cores using '{}':\n {}".
+                          format(cpu_array_command, e))
 
         if self.cpuset_cpus is not None:
             # Reformat the cpuset_cpus list so that it's split up by node
             for node in core_list_per_node.keys():
-                core_list_per_node[node] = [
-                    x for x in core_list_per_node[node] if x in self.cpuset_cpus
-                ]
+                core_list_per_node[node] = [x for x in core_list_per_node[node] if x in self.cpuset_cpus]
             self.cpuset_cpus = core_list_per_node
 
             # Remove cores that aren't part of the cpu_core_list
@@ -410,9 +382,9 @@ def windows_init(self):
 
             # handle python2 vs 3 (bytes vs str type)
             if isinstance(wmic_output, bytes):
-                wmic_output = wmic_output.decode("utf-8")
+                wmic_output = wmic_output.decode('utf-8')
 
-            cpu_info = wmic_output.split("\r\r\n")
+            cpu_info = wmic_output.split('\r\r\n')
 
         except Exception as e:
             print("Problem getting CPU info: {}".format(e))
@@ -430,12 +402,12 @@ def windows_init(self):
             elif line.find(THREAD_COUNT_STR_) == 0:
                 num_threads = int(line.split("=")[1].strip())
 
-        self.num_cpu_sockets = len(
-            re.findall(r"\b%s\b" % re.escape(NUM_SOCKETS_STR_), wmic_output)
-        )
+        self.num_cpu_sockets = len(re.findall(
+            r'\b%s\b' % re.escape(NUM_SOCKETS_STR_), wmic_output))
 
         if self.num_cpu_sockets > 0 and num_threads:
-            self.num_threads_per_core = int(num_threads / self.num_cpu_sockets)
+            self.num_threads_per_core =\
+                int(num_threads / self.num_cpu_sockets)
 
     def mac_init(self):
         raise NotImplementedError("Mac Support not yet implemented")

Diff for: benchmarks/common/base_model_init.py

@@ -27,35 +27,30 @@
 
 
 class ModelBenchmarkUtil(BaseBenchmarkUtil):
-    """Benchmark util for int8 and fp32 models"""
+    """Benchmark util for int8 and fp32 models """
 
     def main(self):
         # Additional args that are used internally for the start script to call the model_init.py
-        arg_parser = ArgumentParser(
-            parents=[self._common_arg_parser],
-            description="Parse args for benchmark " "interface",
-        )
-
-        arg_parser.add_argument(
-            "--intelai-models",
-            help="Local path to the intelai optimized " "model scripts",
-            nargs="?",
-            dest="intelai_models",
-        )
-
-        arg_parser.add_argument(
-            "--benchmark-dir",
-            help="Local path intelai benchmark directory",
-            nargs="?",
-            dest="benchmark_dir",
-        )
-
-        arg_parser.add_argument(
-            "--use-case",
-            help="The corresponding use case of the given " "model ",
-            nargs="?",
-            dest="use_case",
-        )
+        arg_parser = ArgumentParser(parents=[self._common_arg_parser],
+                                    description='Parse args for benchmark '
+                                                'interface')
+
+        arg_parser.add_argument("--intelai-models",
+                                help="Local path to the intelai optimized "
+                                     "model scripts",
+                                nargs='?',
+                                dest="intelai_models")
+
+        arg_parser.add_argument("--benchmark-dir",
+                                help="Local path intelai benchmark directory",
+                                nargs='?',
+                                dest="benchmark_dir")
+
+        arg_parser.add_argument("--use-case",
+                                help="The corresponding use case of the given "
+                                     "model ",
+                                nargs='?',
+                                dest="use_case")
 
         args, unknown = arg_parser.parse_known_args()
         mi = self.initialize_model(args, unknown)