Fix formatting to correct black version

Author: jgoeders

run_reg_test.py

@@ -12,9 +12,7 @@
 
 
 # pylint: disable=wrong-import-position, import-error
-sys.path.insert(
-    0, str(Path(__file__).resolve().parent / "vtr_flow/scripts/python_libs")
-)
+sys.path.insert(0, str(Path(__file__).resolve().parent / "vtr_flow/scripts/python_libs"))
 sys.path.insert(0, str(Path(__file__).resolve().parent / "vtr_flow/scripts"))
 from run_vtr_task import vtr_command_main as run_vtr_task
 from vtr import (
@@ -56,10 +54,7 @@ def vtr_command_argparser(prog=None):
     )
 
     parser = argparse.ArgumentParser(
-        prog=prog,
-        description=description,
-        epilog=epilog,
-        formatter_class=RawDefaultHelpFormatter,
+        prog=prog, description=description, epilog=epilog, formatter_class=RawDefaultHelpFormatter,
     )
 
     #
@@ -101,10 +96,7 @@ def vtr_command_argparser(prog=None):
     )
 
     parser.add_argument(
-        "-skip_qor",
-        default=False,
-        action="store_true",
-        help="Skips running the Qor tests",
+        "-skip_qor", default=False, action="store_true", help="Skips running the Qor tests",
     )
 
     parser.add_argument(
@@ -130,10 +122,7 @@ def vtr_command_argparser(prog=None):
     )
 
     parser.add_argument(
-        "-long_task_names",
-        default=False,
-        action="store_true",
-        help="Display long task names",
+        "-long_task_names", default=False, action="store_true", help="Display long task names",
     )
 
     return parser
@@ -157,9 +146,7 @@ def vtr_command_main(arg_list, prog=None):
             num_qor_failures = parse_single_test(collect_task_list(reg_test))
         elif args.check_golden:
             tests_run = True
-            num_qor_failures = parse_single_test(
-                collect_task_list(reg_test), check=True
-            )
+            num_qor_failures = parse_single_test(collect_task_list(reg_test), check=True)
         elif args.create_golden:
             # Create golden results
             num_qor_failures = 0
@@ -190,14 +177,8 @@ def vtr_command_main(arg_list, prog=None):
                 num_qor_failures += parse_single_test(
                     vtr_task_list_files, check=True, calculate=True
                 )
-                print(
-                    "\nTest '{}' had {} qor test failures".format(
-                        reg_test, num_qor_failures
-                    )
-                )
-            print(
-                "\nTest '{}' had {} run failures\n".format(reg_test, num_func_failures)
-            )
+                print("\nTest '{}' had {} qor test failures".format(reg_test, num_qor_failures))
+            print("\nTest '{}' had {} run failures\n".format(reg_test, num_func_failures))
         total_num_func_failures += num_func_failures
         total_num_qor_failures += num_qor_failures
     # Final summary
@@ -208,11 +189,7 @@ def vtr_command_main(arg_list, prog=None):
     ):
         print("All tests passed")
     elif tests_run and total_num_func_failures != 0 or total_num_qor_failures != 0:
-        print(
-            "Error: {} tests failed".format(
-                total_num_func_failures + total_num_qor_failures
-            )
-        )
+        print("Error: {} tests failed".format(total_num_func_failures + total_num_qor_failures))
 
     sys.exit(total_num_func_failures + total_num_qor_failures)
 

vtr_flow/scripts/python_libs/vtr/flow.py

@@ -139,13 +139,9 @@ def run(
     circuit_file = vtr.util.verify_file(circuit_file, "Circuit")
     if architecture_file.suffix != ".xml":
         raise vtr.VtrError(
-            "Expected Architecture file as second argument (was {})".format(
-                architecture_file.name
-            )
+            "Expected Architecture file as second argument (was {})".format(architecture_file.name)
         )
-    power_tech_file = (
-        vtr.util.verify_file(power_tech_file, "Power") if power_tech_file else None
-    )
+    power_tech_file = vtr.util.verify_file(power_tech_file, "Power") if power_tech_file else None
     temp_dir = Path(temp_dir)
     temp_dir.mkdir(parents=True, exist_ok=True)
     netlist_ext = ".blif" if ".eblif" not in circuit_file.suffixes else ".eblif"
@@ -162,9 +158,7 @@ def run(
     lec_base_netlist = circuit_file.name if "blif" in circuit_file.suffixes else None
     # Reference netlist for LEC
 
-    gen_postsynthesis_netlist = temp_dir / (
-        circuit_file.stem + "_post_synthesis" + netlist_ext
-    )
+    gen_postsynthesis_netlist = temp_dir / (circuit_file.stem + "_post_synthesis" + netlist_ext)
 
     # Copy the circuit and architecture
     circuit_copy = temp_dir / circuit_file.name
@@ -180,10 +174,7 @@ def run(
     #
     # RTL Elaboration & Synthesis
     #
-    if (
-        should_run_stage(VtrStage.odin, start_stage, end_stage)
-        and circuit_file.suffixes != ".blif"
-    ):
+    if should_run_stage(VtrStage.odin, start_stage, end_stage) and circuit_file.suffixes != ".blif":
         vtr.odin.run(
             architecture_copy,
             next_stage_netlist,
@@ -197,9 +188,7 @@ def run(
 
         next_stage_netlist = post_odin_netlist
 
-        lec_base_netlist = (
-            post_odin_netlist if not lec_base_netlist else lec_base_netlist
-        )
+        lec_base_netlist = post_odin_netlist if not lec_base_netlist else lec_base_netlist
 
     #
     # Logic Optimization & Technology Mapping
@@ -217,9 +206,7 @@ def run(
         )
 
         next_stage_netlist = post_abc_netlist
-        lec_base_netlist = (
-            post_abc_netlist if not lec_base_netlist else lec_base_netlist
-        )
+        lec_base_netlist = post_abc_netlist if not lec_base_netlist else lec_base_netlist
 
     #
     # Power Activity Estimation
@@ -243,9 +230,7 @@ def run(
 
         # Use ACE's output netlist
         next_stage_netlist = post_ace_netlist
-        lec_base_netlist = (
-            post_ace_netlist if not lec_base_netlist else lec_base_netlist
-        )
+        lec_base_netlist = post_ace_netlist if not lec_base_netlist else lec_base_netlist
 
         # Enable power analysis in VPR
         vpr_args["power"] = True
@@ -352,11 +337,7 @@ def run(
 
 
 def delete_intermediate_files(
-    next_stage_netlist,
-    post_ace_activity_file,
-    keep_result_files,
-    temp_dir,
-    power_tech_file,
+    next_stage_netlist, post_ace_activity_file, keep_result_files, temp_dir, power_tech_file,
 ):
     """
         delete intermediate files

vtr_flow/scripts/python_libs/vtr/inspect.py

@@ -88,9 +88,7 @@ def __init__(self, metric, min_value=None, max_value=None):
         super().__init__(metric)
 
         if max_value < min_value:
-            raise InspectError(
-                "Invalid range specification (max value larger than min value)"
-            )
+            raise InspectError("Invalid range specification (max value larger than min value)")
 
         self._min_value = min_value
         self._max_value = max_value
@@ -115,16 +113,10 @@ def check_passed(self, golden_value, check_value, check_string="golden value"):
                 ret_str = "both golden and check are None"
             elif check_value is None:
                 ret_value = False
-                ret_str = (
-                    "{} is {}, but check value is None".format(
-                        check_string, golden_value
-                    ),
-                )
+                ret_str = ("{} is {}, but check value is None".format(check_string, golden_value),)
             else:
                 ret_value = False
-                ret_str = "{} is None, but check value is {}".format(
-                    check_string, check_value
-                )
+                ret_str = "{} is None, but check value is {}".format(check_string, check_value)
             return (ret_value, ret_str)
 
         assert golden_value is not None
@@ -163,11 +155,7 @@ def check_passed(self, golden_value, check_value, check_string="golden value"):
             False,
             "relative value {} outside of range [{},{}] "
             "and not equal to {} value: {}".format(
-                norm_check_value,
-                self.min_value(),
-                self.max_value(),
-                check_string,
-                golden_value,
+                norm_check_value, self.min_value(), self.max_value(), check_string, golden_value,
             ),
         )
 
@@ -179,9 +167,7 @@ def __init__(self, metric, min_value=None, max_value=None, abs_threshold=None):
         super().__init__(metric)
 
         if max_value < min_value:
-            raise InspectError(
-                "Invalid range specification (max value larger than min value)"
-            )
+            raise InspectError("Invalid range specification (max value larger than min value)")
 
         self._min_value = min_value
         self._max_value = max_value
@@ -216,14 +202,10 @@ def check_passed(self, golden_value, check_value, check_string="golden value"):
                 ret_str = "both {} and check are None".format(check_string)
             elif golden_value is None:
                 ret_value = False
-                ret_str = "{} is None, but check value is {}".format(
-                    check_string, check_value
-                )
+                ret_str = "{} is None, but check value is {}".format(check_string, check_value)
             else:
                 ret_value = False
-                ret_str = "{} is {}, but check value is None".format(
-                    check_string, golden_value
-                )
+                ret_str = "{} is {}, but check value is None".format(check_string, golden_value)
 
             return (ret_value, ret_str)
 
@@ -343,13 +325,10 @@ def load_parse_patterns(parse_config_filepath):
                 default_value = components[3]
 
             if name not in parse_patterns:
-                parse_patterns[name] = ParsePattern(
-                    name, filepath, regex_str, default_value
-                )
+                parse_patterns[name] = ParsePattern(name, filepath, regex_str, default_value)
             else:
                 raise InspectError(
-                    "Duplicate parse pattern name '{}'".format(name),
-                    parse_config_filepath,
+                    "Duplicate parse pattern name '{}'".format(name), parse_config_filepath,
                 )
 
         else:
@@ -384,8 +363,7 @@ def load_pass_requirements(pass_requirements_filepath):
 
         if metric in parse_patterns:
             raise InspectError(
-                "Duplicate pass requirement for '{}'".format(metric),
-                pass_requirements_filepath,
+                "Duplicate pass requirement for '{}'".format(metric), pass_requirements_filepath,
             )
 
         func, params_str = expr.split("(")
@@ -424,9 +402,7 @@ def load_pass_requirements(pass_requirements_filepath):
             parse_patterns[metric] = EqualPassRequirement(metric)
         else:
             raise InspectError(
-                "Unexpected pass requirement function '{}' for metric '{}'".format(
-                    func, metric
-                ),
+                "Unexpected pass requirement function '{}' for metric '{}'".format(func, metric),
                 pass_requirements_filepath,
             )
 
@@ -505,9 +481,7 @@ def determine_lut_size(architecture_file):
             lut_size = max(lut_size, input_width)
 
     if saw_blif_names and lut_size == 0:
-        raise InspectError(
-            "Could not identify valid LUT size (K)", filename=architecture_file
-        )
+        raise InspectError("Could not identify valid LUT size (K)", filename=architecture_file)
 
     return lut_size
 
@@ -534,9 +508,7 @@ def determine_memory_addr_width(architecture_file):
                     mem_addr_width = max(mem_addr_width, input_width)
 
     if saw_ram and mem_addr_width == 0:
-        raise InspectError(
-            "Could not identify RAM block address width", filename=architecture_file
-        )
+        raise InspectError("Could not identify RAM block address width", filename=architecture_file)
 
     return mem_addr_width
 
@@ -545,9 +517,7 @@ def determine_min_w(log_filename):
     """
         determines the miniumum width.
     """
-    min_w_regex = re.compile(
-        r"\s*Best routing used a channel width factor of (?P<min_w>\d+)."
-    )
+    min_w_regex = re.compile(r"\s*Best routing used a channel width factor of (?P<min_w>\d+).")
     with open(log_filename) as file:
         for line in file:
             match = min_w_regex.match(line)

vtr_flow/scripts/python_libs/vtr/parse_vtr_flow.py

@@ -6,9 +6,11 @@
 from pathlib import Path
 import glob
 from collections import OrderedDict
+
 # pylint: disable=wrong-import-position
 sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
 import vtr
+
 # pylint: enable=wrong-import-position
 def parse_vtr_flow(arg_list):
     """
@@ -36,9 +38,7 @@ def parse_vtr_flow(arg_list):
     # Set defaults
     for parse_pattern in parse_patterns.values():
         metrics[parse_pattern.name()] = (
-            parse_pattern.default_value()
-            if parse_pattern.default_value() is not None
-            else ""
+            parse_pattern.default_value() if parse_pattern.default_value() is not None else ""
         )
         print(parse_pattern.name(), end="\t")
     print("")