at: move images folder to inside experiment folder

Signed-off-by: Vitor Bandeira <[email protected]>

Author: vvbandeira

flow/test/test_autotuner.sh

@@ -39,9 +39,9 @@ fi
 echo "Running Autotuner plotting smoke test"
 all_experiments=$(ls -d ./flow/logs/${PLATFORM}/${DESIGN_NAME}/smoke-test-tune*)
 all_experiments=$(basename -a $all_experiments)
-for expt in $all_experiments; do
+for experiment in $all_experiments; do
   python3 tools/AutoTuner/src/autotuner/utils/plot.py \
     --platform ${PLATFORM} \
     --design ${DESIGN_NAME} \
-    --experiment $expt
+    --experiment ${experiment}
 done

flow/util/uploadMetadata.py

@@ -167,8 +167,7 @@ def upload_data(db, datafile, platform, design, variant, args, rules):
 
 
 def get_rules(platform, design, variant):
-    runFilename = f"rules-{variant}.json"
-    dataFile = os.path.join("designs", platform, design, runFilename)
+    dataFile = os.path.join("designs", platform, design, f"rules-{variant}.json")
     data = {}
     if os.path.exists(dataFile):
         with open(dataFile) as f:
@@ -177,14 +176,11 @@ def get_rules(platform, design, variant):
     return data
 
 
-# Initialize Firebase Admin SDK with service account credentials
+# Initialize Firebase Admin SDK with service account credentials and client
 firebase_admin.initialize_app(credentials.Certificate(args.cred))
-# Initialize Firestore client
 db = firestore.client()
 
-runFilename = f"metadata-{args.variant}.json"
-
-for reportDir, dirs, files in sorted(os.walk("reports", topdown=False)):
+for reportDir, _, _ in sorted(os.walk("reports", topdown=False)):
     dirList = reportDir.split(os.sep)
     if len(dirList) != 4:
         continue
@@ -193,7 +189,7 @@ def get_rules(platform, design, variant):
     platform = dirList[1]
     design = dirList[2]
     variant = dirList[3]
-    dataFile = os.path.join(reportDir, runFilename)
+    dataFile = os.path.join(reportDir, f"metadata-{args.variant}.json")
     if not os.path.exists(dataFile):
         print(f"[WARN] No data file for {platform} {design} {variant}.")
         continue

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

@@ -203,7 +203,7 @@ def main(platform: str, design: str, experiment: str):
         root_dir, f"./flow/logs/{platform}/{design}/{experiment}"
     )
     img_dir = os.path.join(
-        root_dir, f"./flow/reports/images/{platform}/{design}/{experiment}"
+        root_dir, f"./flow/reports/{platform}/{design}/{experiment}/images"
     )
     print("Processing results from", results_dir)
     os.makedirs(img_dir, exist_ok=True)