Tweaks

benchmarks/flops/benchfile.py

@@ -8,16 +8,14 @@ class FlopsBenchmarch(Package):
 
     def build_run_plan(self) -> "Command":
         import milabench.commands as cmd
-
+        main = self.dirs.code / self.main_script
+        pack = cmd.PackCommand(self, *self.argv, lazy=True)
+
         use_stdout = True
 
         if use_stdout:
-            main = self.dirs.code / self.main_script
-            pack = cmd.PackCommand(self, *self.argv, lazy=True)
             return pack.use_stdout()
         else:
-            main = self.dirs.code / self.main_script
-            pack = cmd.PackCommand(self, *self.argv, lazy=True)
             pack = cmd.VoirCommand(pack, cwd=main.parent)
             return pack
 

benchmate/benchmate/monitor.py

@@ -19,16 +19,21 @@
 
 
 def auto_push():
+    # use_stdout = int(os.getenv("MILABENCH_USE_STDOUT", 0))
+    mb_managed = int(os.getenv("MILABENCH_MANAGED", 0))
+
     # Milabench managed: we need to push metrics to it
-    if int(os.getenv("MILABENCH_MANAGED", 0)) == 1:
-
+    if mb_managed == 1:
         # Using voir, DATA_FD is defined as well
         ov = current_overseer.get()
         if ov is not None:
             return ov.give
-
+        
         # Not using Voir, using structured stdout
-        return sumggle_push()
+        if int(os.getenv("MILABENCH_USE_STDOUT", 0)) == 1:
+            return sumggle_push()
+
+        raise RuntimeError("Could not find something to push to")
 
     # Not using milabench; using stdout
     return file_push()

milabench/commands/executors.py

@@ -32,6 +32,9 @@ async def execute(pack, *args, cwd=None, env={}, external=False, use_stdout=Fals
     sized_args = scale_argv(pack, args)
     final_args = resolve_argv(pack, sized_args)
 
+    if use_stdout:
+        exec_env["MILABENCH_USE_STDOUT"] = "1"
+
     return await run(
         final_args,
         **kwargs,

milabench/report.py

@@ -525,12 +525,12 @@ def pandas_to_string(df, formatters=_formatters):
     # Compute column size
     col_size = defaultdict(int)
     for index, row in df.iterrows():
-        col_size["bench"] = max(col_size["bench"], len(index))
+        col_size["bench"] = max(col_size["bench"], len(index), len("bench"))
         for col, val in zip(columns, row):
             fmt = formatters.get(col)
             if fmt is not None:
                 val = fmt(val)
-                col_size[col] = max(col_size[col], len(val))
+                col_size[col] = max(col_size[col], len(val), len(col))
 
     # Generate report
     sep = " | "