simplify pimcomp compare workflow

validation/raptor_validation/raptor.py

@@ -1,5 +1,6 @@
 import re
 import shlex
+import shutil
 import subprocess
 from pathlib import Path
 from colorama import Fore, Style
@@ -43,6 +44,10 @@ def _format_command(cmd):
 def compile_with_raptor(network_path, raptor_onnx_path: Path, output_base: Path,
                         crossbar_size, crossbar_count, core_count,
                         raptor_extra_args, cwd, verbose, reporter, timeout_sec):
+    pim_dir = Path(output_base).parent / "pim"
+    if pim_dir.exists():
+        shutil.rmtree(pim_dir)
+
     # Define the arguments, with the possibility to set crossbar size and count
     args = [
         network_path,

validation/raptor_validation/validate_one.py

@@ -23,6 +23,16 @@ STAGE_TITLES = (
     "Compare Outputs",
     "Run Non-functional Simulation",
 )
+STAGE_COLORS = {
+    STAGE_TITLES[0]: Fore.BLUE,
+    STAGE_TITLES[1]: Fore.MAGENTA,
+    STAGE_TITLES[2]: Fore.YELLOW,
+    STAGE_TITLES[3]: Fore.GREEN,
+    STAGE_TITLES[4]: Fore.CYAN,
+    STAGE_TITLES[5]: Fore.MAGENTA,
+    STAGE_TITLES[6]: Fore.YELLOW,
+    STAGE_TITLES[7]: Fore.BLUE,
+}
 STAGE_COUNT = len(STAGE_TITLES)
 GENERATED_DIR_NAMES = ("inputs", "outputs", "raptor", "runner", "simulation")
 
@@ -294,17 +304,7 @@ def clean_workspace_artifacts(workspace_dir, model_stem):
 
 
 def print_stage(reporter, model_index, model_total, model_name, title):
-    stage_colors = {
-        STAGE_TITLES[0]: Fore.BLUE,
-        STAGE_TITLES[1]: Fore.MAGENTA,
-        STAGE_TITLES[2]: Fore.YELLOW,
-        STAGE_TITLES[3]: Fore.GREEN,
-        STAGE_TITLES[4]: Fore.CYAN,
-        STAGE_TITLES[5]: Fore.MAGENTA,
-        STAGE_TITLES[6]: Fore.YELLOW,
-        STAGE_TITLES[7]: Fore.BLUE,
-    }
-    color = stage_colors.get(title, Fore.WHITE)
+    color = STAGE_COLORS.get(title, Fore.WHITE)
     reporter.log(Style.BRIGHT + color + f"[{title}]" + Style.RESET_ALL)
     reporter.set_stage(model_index, model_total, model_name, title)