fixes based on new tests

Author: ngc92

src/libkernelbot/report.py

@@ -269,24 +269,29 @@ def generate_system_info(system: SystemInfo):
 """
 
 
+def _handle_crash_report(report: RunResultReport, run_result: EvalResult):
+    if run_result.compilation is not None and not run_result.compilation.success:
+        _generate_compile_report(report, run_result.compilation)
+        return True
+
+    if not run_result.run.success:
+        _generate_crash_report(report, run_result.run)
+        return True
+
+    return False
+
+
 def generate_report(result: FullResult) -> RunResultReport:  # noqa: C901
     runs = result.runs
     report = RunResultReport()
     report.add_text(generate_system_info(result.system))
 
     if "test" in runs:
         test_run = runs["test"]
-
-        if test_run.compilation is not None and not test_run.compilation.success:
-            _generate_compile_report(report, test_run.compilation)
+        if _handle_crash_report(report, test_run):
             return report
 
         test_run = test_run.run
-
-        if not test_run.success:
-            _generate_crash_report(report, test_run)
-            return report
-
         if not test_run.passed:
             _generate_test_report(report, test_run)
             return report
@@ -296,47 +301,30 @@ def generate_report(result: FullResult) -> RunResultReport:  # noqa: C901
 
     if "benchmark" in runs:
         bench_run = runs["benchmark"]
-        if bench_run.compilation is not None and not bench_run.compilation.success:
-            _generate_compile_report(report, bench_run.compilation)
-            return report
-
-        bench_run = bench_run.run
-        if not bench_run.success:
-            _generate_crash_report(report, bench_run)
+        if _handle_crash_report(report, bench_run):
             return report
 
         report.add_log(
             "Benchmarks",
-            make_benchmark_log(bench_run),
+            make_benchmark_log(bench_run.run),
         )
 
     if "profile" in runs:
         prof_run = runs["profile"]
-        if prof_run.compilation is not None and not prof_run.compilation.success:
-            _generate_compile_report(report, prof_run.compilation)
-            return report
-
-        prof_run = prof_run.run
-        if not prof_run.success:
-            _generate_crash_report(report, prof_run)
+        if _handle_crash_report(report, prof_run):
             return report
 
         report.add_log(
             "Profiling",
-            make_profile_log(prof_run),
+            make_profile_log(prof_run.run),
         )
 
     if "leaderboard" in runs:
         bench_run = runs["leaderboard"]
-        if bench_run.compilation is not None and not bench_run.compilation.success:
-            _generate_compile_report(report, bench_run.compilation)
+        if _handle_crash_report(report, bench_run):
             return report
 
         bench_run = bench_run.run
-        if not bench_run.success:
-            _generate_crash_report(report, bench_run)
-            return report
-
         report.add_log(
             "Ranked Benchmark",
             make_benchmark_log(bench_run),

src/libkernelbot/submission.py

@@ -150,6 +150,7 @@ def _get_popcorn_directives(submission: str) -> dict:  # noqa: C901
             arg = args[1].strip().lower()
             if len(args) < 3:
                 raise KernelBotError(f"!POPCORN directive missing argument: {line}")
+
             #  allow both versions of the argument
             if arg == "gpu":
                 arg = "gpus"
@@ -163,11 +164,7 @@ def _get_popcorn_directives(submission: str) -> dict:  # noqa: C901
             if arg == "gpus":
                 popcorn_info["gpus"] = args[2:]
             elif arg == "leaderboard":
-                popcorn_info["leaderboard"] = args[2].strip()
-                if len(popcorn_info["leaderboard"]) == 0:
-                    raise KernelBotError(
-                        "No leaderboard specified in !POPCORN Leaderboard directive"
-                    )
+                popcorn_info["leaderboard"] = args[2]
     return popcorn_info
 
 
@@ -194,6 +191,6 @@ def compute_score(result: FullResult, task: LeaderboardTask, submission_id: int)
         elif task.ranking_by == RankCriterion.GEOM:
             score = math.pow(math.prod(scores), 1.0 / num_benchmarks)
         else:
-            raise KernelBotError(f"Invalid submission mode {task.ranking_by}")
+            raise KernelBotError(f"Invalid ranking criterion {task.ranking_by}")
 
     return score

src/libkernelbot/task.py

@@ -196,5 +196,8 @@ def build_task_config(
         return {
             "sources": sources,
             "headers": headers,
+            "defines": task.config.defines,
+            "compile_flags": task.config.compile_flags,
             "include_dirs": task.config.include_dirs,
+            **common,
         }