Update vtr_task python files for new paths.py

Author: jgoeders

vtr_flow/scripts/python_libs/vtr/parse_vtr_flow.py

@@ -10,8 +10,11 @@
 # pylint: disable=wrong-import-position
 sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
 import vtr
+from vtr import paths
 
 # pylint: enable=wrong-import-position
+
+
 def parse_vtr_flow(arg_list):
     """
         parse vtr flow output
@@ -22,7 +25,7 @@ def parse_vtr_flow(arg_list):
 
     extra_params = arg_list[2:]
     if parse_config_file is None:
-        parse_config_file = vtr.find_vtr_file("vtr_benchmarks.txt")
+        parse_config_file = str(paths.vtr_benchmarks_parse_path)
 
     parse_patterns = vtr.load_parse_patterns(str(parse_config_file))
 

vtr_flow/scripts/python_libs/vtr/parse_vtr_task.py

@@ -30,7 +30,6 @@
     InspectError,
     VtrError,
     create_jobs,
-    find_vtr_file,
 )
 
 # pylint: enable=wrong-import-position

vtr_flow/scripts/python_libs/vtr/paths.py

@@ -35,3 +35,8 @@
 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/python_libs/vtr/task.py

@@ -9,13 +9,13 @@
 from vtr import (
     VtrError,
     InspectError,
-    find_vtr_root,
     load_list_file,
     load_parse_results,
     get_next_run_dir,
     find_task_dir,
     load_script_param,
     get_latest_run_dir,
+    paths,
 )
 
 # pylint: disable=too-many-instance-attributes, too-many-arguments, too-many-locals,too-few-public-methods
@@ -559,7 +559,7 @@ def resolve_vtr_source_file(config, filename, base_dir=""):
             return str(joined_path)
     else:
         # Relative base under the VTR flow directory
-        joined_path = Path(find_vtr_root()) / "vtr_flow" / base_dir / filename
+        joined_path = paths.vtr_flow_path / base_dir / filename
         if joined_path.exists():
             return str(joined_path)
 
@@ -581,8 +581,7 @@ def find_task_config_file(task_name):
         # Not absolute path, so check from the current directory first
         base_dirs.append(".")
 
-        vtr_root = find_vtr_root()
-        vtr_flow_tasks_dir = str(PurePath(vtr_root) / "vtr_flow" / "tasks")
+        vtr_flow_tasks_dir = str(paths.vtr_flow_path / "tasks")
 
         # Then the VTR tasks directory
         base_dirs.append(vtr_flow_tasks_dir)