More updates to use paths.py in py scripts

Author: jgoeders

run_reg_test.py

@@ -15,11 +15,7 @@
 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 (
-    find_vtr_file,
-    find_vtr_root,
-    RawDefaultHelpFormatter,
-)
+from vtr import RawDefaultHelpFormatter, paths
 
 # pylint: enable=wrong-import-position, import-error
 BASIC_VERBOSITY = 1
@@ -196,7 +192,7 @@ def vtr_command_main(arg_list, prog=None):
 
 def display_qor(reg_test):
     """ Display the qor tests script files to be run outside of this script """
-    test_dir = Path(find_vtr_root()) / "vtr_flow/tasks/regression_tests" / reg_test
+    test_dir = paths.regression_tests_path / reg_test
     if not (test_dir / "qor_geomean.txt").is_file():
         print("QoR results do not exist ({}/qor_geomean.txt)".format(str(test_dir)))
         return 1
@@ -242,14 +238,14 @@ def display_qor(reg_test):
 def run_odin_test(args, test_name):
     """ Run ODIN II test with given test name """
     odin_reg_script = [
-        find_vtr_file("verify_odin.sh"),
+        str(paths.odin_verify_path),
         "--clean",
         "-C",
-        find_vtr_file("output_on_error.conf"),
+        str(paths.odin_output_on_error_path),
         "--nb_of_process",
         str(args.j),
         "--test",
-        "{}/ODIN_II/regression_test/benchmark/".format(find_vtr_root()),
+        "{}/regression_test/benchmark/".format(str(paths.odin_path)),
     ]
     if test_name == "odin_reg_full":
         odin_reg_script[-1] += "suite/full_suite"
@@ -285,14 +281,7 @@ def run_odin_test(args, test_name):
 
 def collect_task_list(reg_test):
     """ create a list of task files """
-    task_list_filepath = (
-        Path(find_vtr_root())
-        / "vtr_flow"
-        / "tasks"
-        / "regression_tests"
-        / reg_test
-        / "task_list.txt"
-    )
+    task_list_filepath = paths.tasks_path / "regression_tests" / reg_test / "task_list.txt"
     if not task_list_filepath.is_file():
         raise IOError("Test does not exist: {}".format(reg_test))
     return str(task_list_filepath)

vtr_flow/scripts/python_libs/vtr/parse_vtr_task.py

@@ -30,6 +30,7 @@
     InspectError,
     VtrError,
     create_jobs,
+    paths,
 )
 
 # pylint: enable=wrong-import-position
@@ -363,7 +364,7 @@ def check_two_files(
 
     # Verify that all params and pass requirement metric are included in both the result files
     # We do not worry about non-pass_requriements elements being different or missing
-    pass_req_filepath = find_vtr_file(config.pass_requirements_file)
+    pass_req_filepath = str(paths.pass_requirements_path / config.pass_requirements_file)
     pass_requirements = load_pass_requirements(pass_req_filepath)
 
     for metric in pass_requirements.keys():

vtr_flow/scripts/python_libs/vtr/paths.py

@@ -7,13 +7,13 @@
 
 # VTR Paths
 vtr_flow_path = root_path / "vtr_flow"
-scripts_path = vtr_flow_path / "scripts"
-build_path = root_path / "build"
 
 # ODIN paths
 odin_path = root_path / "ODIN_II"
 odin_exe_path = odin_path / "odin_II"
 odin_cfg_path = vtr_flow_path / "misc" / "basic_odin_config_split.xml"
+odin_verify_path = odin_path / "verify_odin.sh"
+odin_output_on_error_path = odin_path / "regression_test" / ".library" / "output_on_error.conf"
 
 # ABC paths
 abc_path = root_path / "abc"
@@ -29,14 +29,23 @@
 vpr_path = root_path / "vpr"
 vpr_exe_path = vpr_path / "vpr"
 
+# Flow scripts
+scripts_path = vtr_flow_path / "scripts"
+run_vtr_flow_path = scripts_path / "run_vtr_flow.py"
+flow_template_path = scripts_path / "flow_script_template.txt"
+
+# Task files
+tasks_path = vtr_flow_path / "tasks"
+regression_tests_path = tasks_path / "regression_tests"
+
+# Parsing files
+parse_path = vtr_flow_path / "parse"
+vtr_benchmarks_parse_path = parse_path / "parse_config" / "common" / "vtr_benchmarks.txt"
+pass_requirements_path = parse_path / "pass_requirements"
+
 # Other scripts
 blackbox_latches_script_path = scripts_path / "blackbox_latches.pl"
 restore_multiclock_latch_old_script_path = scripts_path / "restore_multiclock_latch_information.pl"
 restore_multiclock_latch_script_path = scripts_path / "restore_multiclock_latch.pl"
 valgrind_supp = vpr_path / "valgrind.supp"
 lsan_supp = vpr_path / "lsan.supp"
-
-# Task files
-vtr_benchmarks_parse_path = (
-    vtr_flow_path / "parse" / "parse_config" / "common" / "vtr_benchmarks.txt"
-)

vtr_flow/scripts/run_vtr_task.py

@@ -22,8 +22,6 @@
 
 from vtr import (
     load_list_file,
-    find_vtr_file,
-    find_vtr_root,
     format_elapsed_time,
     RawDefaultHelpFormatter,
     argparse_str2bool,
@@ -40,6 +38,7 @@
     create_jobs,
     calc_geomean,
     summarize_qor,
+    paths,
 )
 from vtr.error import VtrError, InspectError, CommandError
 
@@ -359,7 +358,7 @@ def create_run_script(args, job, work_dir):
     human_readable_memory_est = format_human_readable_memory(memory_estimate)
     Path(work_dir).mkdir(parents=True)
     run_script_file = Path(work_dir) / "vtr_flow.sh"
-    template = find_vtr_file("flow_script_template.txt")
+    template = str(paths.flow_template_path)
     with open(template, "r") as in_file:
         template_string = in_file.readlines()
         template_string = "".join(template_string)
@@ -434,11 +433,11 @@ def run_vtr_flow_process(queue, run_dirs, job, script):
     with open(vtr_flow_out, "w+") as out_file:
         with redirect_stdout(out_file):
             if script == "run_vtr_flow.py":
-                out = run_vtr_flow(job.run_command(), find_vtr_file("run_vtr_flow.py"))
+                out = run_vtr_flow(job.run_command(), str(paths.run_vtr_flow_path))
             else:
                 out = subprocess.call(
-                    [find_vtr_file(script)] + job.run_command(),
-                    cwd=find_vtr_root(),
+                    [str(paths.scripts_path / script)] + job.run_command(),
+                    cwd=str(paths.root_path),
                     stdout=out_file,
                 )