Fix 3: solver_registry — score_network gate after validate, reject if (None,None,None)

neurogolf_solver/solvers/solver_registry.py

@@ -15,6 +15,7 @@ from .mode import s_mode_fill
 from .conv import solve_conv_fixed, solve_conv_variable, solve_conv_diffshape, solve_conv_var_diff
 from ..data_loader import get_exs, fixed_shapes
 from ..validators import validate
+from ..profiler import score_network
 from ..constants import EXCLUDED_TASKS, MAX_ONNX_FILESIZE
 
 # Analytical solvers registry — order matters (cheaper first)
@@ -53,6 +54,27 @@ def _check_size(path):
         return False
 
 
+def _check_scoreable(path):
+    """Return True if score_network returns valid scores (not None).
+    A model that can't be scored will be REJECTED by Kaggle."""
+    macs, memory, params = score_network(path)
+    if macs is None or memory is None or params is None:
+        return False
+    return True
+
+
+def _accept_model(path, td, providers):
+    """Full acceptance check: size + validate (outputs) + scoreable.
+    Returns True only if model would be accepted by Kaggle."""
+    if not _check_size(path):
+        return False
+    if not validate(path, td, providers):
+        return False
+    if not _check_scoreable(path):
+        return False
+    return True
+
+
 def solve_task(tn, td, outdir, providers, conv_budget=30.0, excluded_tasks=None):
     """Solve a single ARC-AGI task.
     
@@ -75,9 +97,7 @@ def solve_task(tn, td, outdir, providers, conv_budget=30.0, excluded_tasks=None)
             if model is None:
                 continue
             onnx.save(model, path)
-            if not _check_size(path):
-                continue  # oversized, skip to next solver
-            if validate(path, td, providers):
+            if _accept_model(path, td, providers):
                 return True, sname, os.path.getsize(path), time.time() - t_start, path
         except:
             pass
@@ -94,12 +114,12 @@ def solve_task(tn, td, outdir, providers, conv_budget=30.0, excluded_tasks=None)
         if fixed_in:
             result = solve_conv_fixed(td, path, providers, time_budget=conv_time / 2)
             if result is not None:
-                if _check_size(path):
+                if _check_size(path) and _check_scoreable(path):
                     sname, model = result
                     return True, sname, os.path.getsize(path), time.time() - t_start, path
         result = solve_conv_variable(td, path, providers, time_budget=conv_time)
         if result is not None:
-            if _check_size(path):
+            if _check_size(path) and _check_scoreable(path):
                 sname, model = result
                 return True, sname, os.path.getsize(path), time.time() - t_start, path
     else:
@@ -109,13 +129,13 @@ def solve_task(tn, td, outdir, providers, conv_budget=30.0, excluded_tasks=None)
             if OH <= IH and OW <= IW:
                 result = solve_conv_diffshape(td, path, providers, time_budget=conv_time)
                 if result is not None:
-                    if _check_size(path):
+                    if _check_size(path) and _check_scoreable(path):
                         sname, model = result
                         return True, sname, os.path.getsize(path), time.time() - t_start, path
 
         result = solve_conv_var_diff(td, path, providers, time_budget=conv_time)
         if result is not None:
-            if _check_size(path):
+            if _check_size(path) and _check_scoreable(path):
                 sname, model = result
                 return True, sname, os.path.getsize(path), time.time() - t_start, path