Merge pull request #3019 from luarss/topic/bump-ray

[Autotuner] Bump versions 2

Author: vvbandeira

tools/AutoTuner/requirements.txt

@@ -1,4 +1,4 @@
-ray[default,tune]==2.9.3
+ray[default,tune]==2.43.0
 ax-platform>=0.3.3,<=0.3.7
 hyperopt==0.2.7
 optuna==3.6.0

tools/AutoTuner/src/autotuner/distributed.py

@@ -120,11 +120,9 @@ def setup(self, config):
         Setup current experiment step.
         """
         # We create the following directory structure:
-        #      1/     2/         3/       4/                5/   6/
-        # <repo>/<logs>/<platform>/<design>/<experiment>/<id>/<cwd>
-        # Run by Ray in directory specified by `local_dir`
-        repo_dir = os.getcwd() + "/../" * 6
-        self.repo_dir = os.path.abspath(repo_dir)
+        #      1/     2/         3/       4/           5/
+        # <repo>/<logs>/<platform>/<design>/<experiment/<cwd>
+        self.repo_dir = os.path.abspath(LOCAL_DIR + "/../" * 4)
         self.parameters = parse_config(
             config=config,
             base_dir=self.repo_dir,
@@ -666,7 +664,7 @@ def main():
             mode="min",
             num_samples=args.samples,
             fail_fast=False,
-            local_dir=LOCAL_DIR,
+            storage_path=LOCAL_DIR,
             resume=args.resume,
             stop={"training_iteration": args.iterations},
             resources_per_trial={"cpu": os.cpu_count() / args.jobs},

tools/AutoTuner/src/autotuner/utils.py

@@ -292,21 +292,23 @@ def openroad(
     base_dir,
     parameters,
     flow_variant,
-    path="",
     install_path=None,
 ):
     """
     Run OpenROAD-flow-scripts with a given set of parameters.
     """
     # Make sure path ends in a slash, i.e., is a folder
     flow_variant = f"{args.experiment}/{flow_variant}"
-    if path != "":
-        log_path = f"{path}/{flow_variant}/"
-        report_path = log_path.replace("logs", "reports")
-        run_command(args, f"mkdir -p {log_path}")
-        run_command(args, f"mkdir -p {report_path}")
-    else:
-        log_path = report_path = os.getcwd() + "/"
+    log_path = os.path.abspath(
+        os.path.join(base_dir, f"flow/logs/{args.platform}/{args.design}", flow_variant)
+    )
+    report_path = os.path.abspath(
+        os.path.join(
+            base_dir, f"flow/reports/{args.platform}/{args.design}", flow_variant
+        )
+    )
+    os.makedirs(log_path, exist_ok=True)
+    os.makedirs(report_path, exist_ok=True)
 
     if install_path is None:
         install_path = os.path.join(base_dir, "tools/install")
@@ -326,8 +328,8 @@ def openroad(
         args,
         make_command,
         timeout=args.timeout,
-        stderr_file=f"{log_path}error-make-finish.log",
-        stdout_file=f"{log_path}make-finish-stdout.log",
+        stderr_file=os.path.join(log_path, "error-make-finish.log"),
+        stdout_file=os.path.join(log_path, "make-finish-stdout.log"),
     )
 
     metrics_file = os.path.abspath(os.path.join(report_path, "metrics.json"))
@@ -340,8 +342,8 @@ def openroad(
     run_command(
         args,
         metrics_command,
-        stderr_file=f"{log_path}error-metrics.log",
-        stdout_file=f"{log_path}metrics-stdout.log",
+        stderr_file=os.path.join(log_path, "error-metrics.log"),
+        stdout_file=os.path.join(log_path, "metrics-stdout.log"),
     )
 
     return metrics_file
@@ -662,7 +664,6 @@ def openroad_distributed(
     args,
     repo_dir,
     config,
-    path,
     sdc_original,
     fr_original,
     install_path,
@@ -686,7 +687,6 @@ def openroad_distributed(
         base_dir=repo_dir,
         parameters=config,
         flow_variant=f"{uuid()}-{variant}",
-        path=path,
         install_path=install_path,
     )
     duration = time() - t

tools/AutoTuner/src/autotuner/utils/plot.py

@@ -76,7 +76,9 @@ def load_dir(dir: str) -> pd.DataFrame:
     params = []
     failed = []
     for params_fname in glob.glob(f"{dir}/*/params.json"):
-        metrics_fname = params_fname.replace("params.json", "metrics.json")
+        metrics_fname = params_fname.replace("params.json", "metrics.json").replace(
+            "ray", "or-0"
+        )
         try:
             with open(params_fname, "r") as f:
                 _dict = json.load(f)