validation prints immediatly in case of single job

validation/validate.py

@@ -6,7 +6,7 @@ import signal
 import subprocess
 import sys
 from concurrent.futures import ProcessPoolExecutor, as_completed
-from contextlib import redirect_stderr, redirect_stdout
+from contextlib import nullcontext, redirect_stderr, redirect_stdout
 from itertools import groupby
 from pathlib import Path
 from tempfile import TemporaryDirectory
@@ -44,36 +44,43 @@ def run_validation_job(job):
             enabled=False,
             verbose=options["verbose"],
         )
+
+        def validate():
+            try:
+                return validate_network(
+                    onnx_path,
+                    reporter=reporter,
+                    model_index=index,
+                    model_total=options["model_total"],
+                    verbose=options["verbose"],
+                    mode=options["mode"],
+                    **options["validation_kwargs"],
+                )
+            except Exception as exc:
+                print_validation_error(reporter, rel, exc)
+                return ValidationResult(False, pimsim_status=PIMSIM_NOT_RUN)
+            finally:
+                reporter.finish()
+
         sys.stdout.flush()
         sys.stderr.flush()
-        saved_stdout = os.dup(1)
-        saved_stderr = os.dup(2)
-        try:
-            with open(log_path, "w", encoding="utf-8", buffering=1) as log:
-                os.dup2(log.fileno(), 1)
-                os.dup2(log.fileno(), 2)
-                with redirect_stdout(log), redirect_stderr(log):
-                    try:
-                        result = validate_network(
-                            onnx_path,
-                            reporter=reporter,
-                            model_index=index,
-                            model_total=options["model_total"],
-                            verbose=options["verbose"],
-                            mode=options["mode"],
-                            **options["validation_kwargs"],
-                        )
-                    except Exception as exc:
-                        result = ValidationResult(False, pimsim_status=PIMSIM_NOT_RUN)
-                        print_validation_error(reporter, rel, exc)
-                    finally:
-                        reporter.finish()
-        finally:
-            os.dup2(saved_stdout, 1)
-            os.dup2(saved_stderr, 2)
-            os.close(saved_stdout)
-            os.close(saved_stderr)
-        completed.append((str(rel), result, str(log_path)))
+        if log_path is None:
+            result = validate()
+        else:
+            saved_stdout = os.dup(1)
+            saved_stderr = os.dup(2)
+            try:
+                with open(log_path, "w", encoding="utf-8", buffering=1) as log:
+                    os.dup2(log.fileno(), 1)
+                    os.dup2(log.fileno(), 2)
+                    with redirect_stdout(log), redirect_stderr(log):
+                        result = validate()
+            finally:
+                os.dup2(saved_stdout, 1)
+                os.dup2(saved_stderr, 2)
+                os.close(saved_stdout)
+                os.close(saved_stderr)
+        completed.append((str(rel), result, str(log_path) if log_path else None))
     return completed
 
 
@@ -214,7 +221,7 @@ def main():
 
     print(Style.BRIGHT + f"Found {len(onnx_files)} ONNX file(s) to validate." + Style.RESET_ALL)
     print(f"Operations root: {operations_dir}")
-    print(f"Parallel jobs: {a.jobs}")
+    print(f"Max parallel jobs: {a.jobs}")
     print("=" * 72)
 
     mode = MODE_FULL
@@ -268,7 +275,8 @@ def main():
         list(group)
         for _, group in groupby(indexed_files, key=lambda indexed_path: indexed_path[1].parent)
     ]
-    with TemporaryDirectory(prefix="raptor-validation-") as log_dir:
+    print_directly = min(a.jobs, len(workspace_groups)) == 1
+    with (nullcontext(None) if print_directly else TemporaryDirectory(prefix="raptor-validation-")) as log_dir:
         jobs = [
             (
                 [
@@ -276,7 +284,7 @@ def main():
                         index,
                         onnx_path,
                         onnx_path.relative_to(operations_dir),
-                        Path(log_dir) / f"{index}.log",
+                        Path(log_dir) / f"{index}.log" if log_dir else None,
                     )
                     for index, onnx_path in workspace_group
                 ],
@@ -289,16 +297,22 @@ def main():
             )
             for workspace_group in workspace_groups
         ]
-        with ProcessPoolExecutor(max_workers=a.jobs) as executor:
-            futures = [executor.submit(run_validation_job, job) for job in jobs]
-            for future in as_completed(futures):
-                completed_group = future.result()
+        with (nullcontext(None) if print_directly else ProcessPoolExecutor(max_workers=a.jobs)) as executor:
+            completed_groups = (
+                map(run_validation_job, jobs)
+                if print_directly
+                else (future.result() for future in as_completed(
+                    executor.submit(run_validation_job, job) for job in jobs
+                ))
+            )
+            for completed_group in completed_groups:
                 for rel, result, log_path in completed_group:
-                    reporter.suspend()
-                    output = Path(log_path).read_text(encoding="utf-8", errors="replace")
-                    if output:
-                        print(output, end="" if output.endswith("\n") else "\n")
-                    reporter.resume()
+                    if log_path:
+                        reporter.suspend()
+                        output = Path(log_path).read_text(encoding="utf-8", errors="replace")
+                        if output:
+                            print(output, end="" if output.endswith("\n") else "\n")
+                        reporter.resume()
                     reporter.advance()
                     reporter.record_result(result.passed)
                     results[rel] = result