Fix solver_registry.py: _check_scoreable expects (memory, params) not (macs, memory, params)

own-solver/neurogolf_solver/solvers/solver_registry.py

@@ -1,570 +1 @@
-#!/usr/bin/env python3
-"""Solver registry and task solving orchestration."""
-
-import os
-import time
-import onnx
-from .analytical import s_identity, s_constant, s_color_map, s_transpose
-from .geometric import s_flip, s_rotate, s_shift, s_fixed_crop, s_gravity
-from .tiling import (s_tile, s_upscale, s_kronecker, s_nonuniform_scale, s_diagonal_tile,
-                     s_mirror_h, s_mirror_v, s_quad_mirror, s_concat, s_concat_enhanced,
-                     s_spatial_gather, s_varshape_spatial_gather)
-from .gravity import s_gravity_unrolled
-from .edge import s_edge_detect
-from .mode import s_mode_fill
-from .wave1 import (s_downsample_stride, s_symmetry_complete, s_extract_inner,
-                    s_add_border, s_sparse_fill, s_channel_filter)
-from .wave2 import (s_overlay_constant, s_bbox_crop, s_row_mode_fill, s_col_mode_fill,
-                    s_fill_bg_with_mode, s_pad_align, s_multi_stamp, s_diagonal_flip,
-                    s_invert_colors, s_majority_color_fill, s_border_extract,
-                    s_interior_fill, s_repeat_row, s_repeat_col, s_swap_two_colors,
-                    s_max_pool_downsample, s_crop_paste)
-from .wave3 import s_split_and_merge, s_self_tile, s_self_tile_majority
-from .wave4 import (s_extract_densest_object, s_extract_smallest_area,
-                    s_extract_largest_count, s_symmetry_max_tb, s_variable_crop_topleft)
-from .wave5 import (s_row_uniform_fill, s_majority_replace_5,
-                    s_find_color_with_hole, s_fill_bbox_per_color,
-                    s_border_detect, s_symmetry_check_lr, s_variable_scale_2x,
-                    s_split_midpoint_or, s_split_nor, s_split_boolean, s_symmetrize,
-                    s_fill_row_endpoints_match, s_split_flip_overlay,
-                    s_fill_between_markers, s_recolor_to_marker,
-                    s_fill_between_same_color_row,
-                    s_fill_between_same_color_cross,
-                    s_bbox_tile_1x2)
-from .wave6 import (s_select_asymmetric_block, s_bbox_crop_3x3, s_periodic_tile_fill,
-                    s_eightfold_symmetry, s_ushape_fill_bottom, s_centroid_zoom)
-from .wave7 import (s_count_color1_lookup, s_count_present_colors,
-                    s_histogram_match, s_marker_grid_fill)
-from .wave8 import (s_fill_mask_delta, s_recolor_col_mask, s_palette_lookup_markers,
-                    s_count_dominant_bar, s_maxpool_3x3_downsample, s_tile_mask_color2,
-                    s_matmul_projection, s_count_colors_pattern_bank)
-from .wave9 import (s_fill_bbox_interior_color2, s_least_dense_color,
-                    s_count_color6_threshold, s_conv_row_col_combine, s_neighbor_remove)
-from .wave10 import (s_count_present_colors_fixed, s_count_color1_lookup_fixed,
-                     s_remove_isolated_2x2, s_overlay_4quadrants, s_diagonal_expand,
-                     s_pattern_grow_diamond, s_row_pattern_tile, s_flip_crop_marker,
-                     s_find_enclosed_fill, s_keep_middle_col, s_shift_parity_remove)
-from .wave11 import (s_directional_replace, s_x_pattern_centroid, s_diagonal_fill_centroid,
-                     s_keep_dominant_2x2, s_keep_dominant_2x2_v2, s_staircase_fill)
-from .wave12 import (s_isolated_mark_5x5, s_neighbor_mark_6x6, s_odd_quadrant,
-                     s_cumsum_bottom_mark, s_three_panel_overlay)
-from .wave13 import (s_block_center_mark, s_shift_tile_by_width, s_fill_interior_4corners,
-                     s_zigzag_marker_248, s_zigzag_marker_357)
-from .wave14 import (s_unique_color_extract_dilate, s_centroid_manhattan_cross,
-                     s_conv_argmax_crop, s_template_match_recolor, s_symmetry_4fold_max,
-                     s_row_gap_bank, s_top3_colors, s_quadrant_position_mask,
-                     s_conv5_argmax_crop3)
-from .wave15 import (s_mirror_patch_markers, s_cluster_expand_frame,
-                     s_maxpool_row_conflict)
-from .wave16 import (s_convnet_ch5_split, s_block2x2_pattern_bank, s_hash_lookup_319)
-from .wave17 import (s_conv3x3_task4, s_gridsample_108, s_hash_lookup_153,
-                     s_argmax_gather_106, s_flag_level_map_123, s_quadrant_overlap_38,
-                     s_dilated_conv_180, s_adjacency_classify_369,
-                     s_conv5x5_task344, s_region_scatter_59)
-from .wave18 import (s_row_col_filter_24, s_cumsum_dilate_125, s_centroid_distance_47,
-                     s_tail_detect_137, s_bbox_channel_swap_63, s_horizontal_shift_fill_139,
-                     s_neighbor_shift_81, s_argmax_shift_128, s_grouped_conv_fill_37,
-                     s_maxpool_classify_93)
-from .wave19 import (s_large_kernel_conv_27, s_marker_spread_86, s_region_grow_84,
-                     s_pattern_replicate_3, s_color_shift_19, s_flood_fill_30,
-                     s_line_extend_11, s_symmetric_fill_64, s_cascade_filter_10,
-                     s_block_pattern_71, s_grid_partition_48, s_border_fill_75,
-                     s_multi_region_17, s_conv_transform_58, s_connected_region_8)
-from .wave20 import (s_pixel_count_bar_196, s_edge_propagate_175, s_corner_detect_199,
-                     s_marker_fill_165, s_symmetry_detect_183, s_region_color_200,
-                     s_iterative_fill_124, s_block_extract_188, s_neighbor_logic_94,
-                     s_pattern_match_112, s_directional_grow_177, s_shift_align_121,
-                     s_multi_conv_187, s_spread_marker_109, s_grid_logic_198,
-                     s_color_region_195, s_flood_detect_92, s_line_cross_161,
-                     s_conv_cascade_159, s_lookup_map_114)
-from .wave21 import (s_tile_index_247, s_directional_mask_246, s_boundary_fill_279,
-                     s_object_align_232, s_color_encode_265, s_edge_detect_289,
-                     s_region_extract_252, s_spatial_logic_231, s_conv_threshold_225,
-                     s_marker_connect_298, s_slice_combine_260, s_pattern_grow_215,
-                     s_channel_merge_235, s_fill_logic_269, s_kernel_shift_221,
-                     s_overlap_detect_204, s_block_reduce_259, s_spatial_encode_217,
-                     s_multi_step_228, s_region_classify_256, s_iterative_logic_251,
-                     s_maxpool_spread_91, s_hash_encode_100, s_shift_pattern_239)
-from .wave22 import (s_select_transform_10sq, s_aggregate, s_diff_aggregate, s_crop_select_remap_filter_16sq, s_crop_select_remap_filter_24sq,
-                     s_flood_recolor, s_crop_cumulative_10sq, s_flood_recolor_12sq, s_conv_cumulative_remap_10sq, s_select_filter,
-                     s_logic, s_cascade_transform_10sq, s_select_project_filter, s_conv_recolor, s_cumulative_recolor_10sq,
-                     s_select_diff_9sq, s_select_transform_10sq_v2, s_mask_aggregate_19sq, s_flood_recolor_v2, s_select_filter_v2,
-                     s_cascade_logic_conditional, s_project_recolor, s_remap_match_conditional, s_cumulative_recolor_10sq_v2, s_select_filter_v3,
-                     s_conv_fill, s_conv_logic_conditional_1x5, s_conv_match_logic, s_select_transform, s_transform_diff_mask_9sq,
-                     s_conv_match_logic_v2, s_conv_recolor_v2, s_cascade_mask, s_conv_recolor_v3, s_select_project,
-                     s_remap_recolor_5sq, s_cumulative_conditional_aggregate_10sq, s_cascade_mask_10sq, s_conv_fill_v2, s_conv_remap_5x15,
-                     s_conv_mask_diff_15sq, s_select_conditional_aggregate, s_select_conditional_match, s_select_combine_conditional_15sq, s_conv_logic_logic_10sq,
-                     s_filter_mask_aggregate, s_conv_recolor_v4, s_flood_recolor_v3, s_conv_select_recolor_10sq, s_select_filter_v4,
-                     s_conv_mask_aggregate_10sq, s_conv_cumulative_select_filter_21sq, s_filter_mask_aggregate_v2, s_crop_filter_9sq, s_select_match_logic,
-                     s_flood_transform, s_flood_select_remap_filter, s_cascade_cumulative_15sq, s_select_remap, s_learned_project_transform_11sq,
-                     s_select_remap_13sq, s_conv_transform, s_select_transform_v2, s_recolor_mask_diff, s_cascade,
-                     s_conv_remap, s_conv_mask_aggregate, s_logic_conditional_peak, s_recolor_mask_diff_10sq, s_recolor_mask_10sq,
-                     s_conv_select_remap, s_conv_logic_aggregate_10sq, s_learned_select_project_fill_10sq, s_flood_remap_transform, s_flood_remap_13sq,
-                     s_flood_remap_transform_v2, s_select_remap_v2, s_select_transform_10sq_v3, s_cumulative_select_remap_filter_10sq, s_select_remap_filter_29sq,
-                     s_remap_transform, s_multiconv_remap_filter, s_cumulative_select_remap_filter_20sq, s_cascade_recolor_10sq, s_learned_remap_project_filter,
-                     s_multiconv_select_remap_filter, s_select_logic, s_cascade_recolor_12sq, s_cascade_recolor_12sq_v2, s_transform_logic_diff,
-                     s_filter_mask_aggregate_deep, s_cumulative_select_remap_filter, s_learned_project_transform_deep, s_learned_project_transform_10x15, s_cascade_transform_deep_10sq,
-                     s_logic_logic_deep, s_multiconv_select_deep, s_learned_project_10sq, s_learned_remap_project_transform_30sq, s_learned_select_project_compact,
-                     s_learned_project_recolor, s_learned_select_project_filter, s_select_remap_filter_deep_10sq, s_cascade_filter_deep, s_learned_select_remap_project_transform,
-                     s_learned_select_project_14x12, s_learned_select_project_compact_v2, s_cascade_select_remap_filter_deep, s_learned_select_remap_project_23sq, s_conv_compact_10sq,
-                     s_learned_select_project_recolor_compact, s_learned_project_compact_20sq, s_learned_select_project_compact_v3, s_learned_project_deep, s_learned_project_recolor_compact_15x10,
-                     s_learned_select_project_compact_v4, s_transform_compact_10sq, s_flood_recolor_v4, s_cascade_recolor_10sq_v2, s_conv_filter,
-                     s_conv_transform_9sq, s_learned_project_filter, s_select_diff, s_flood_cumulative_remap_30sq, s_cascade_recolor_17sq,
-                     s_conv_select_remap_filter, s_cascade_transform, s_cascade_recolor, s_cascade_mask_10sq_v2, s_project_fill_10sq,
-                     s_conv_remap_transform, s_cascade_recolor_v2, s_learned_project_compact, s_select_remap_10sq, s_conv_remap_filter_deep_10sq,
-                     s_crop_cascade_remap_deep_11sq, s_remap_transform_deep, s_learned_remap_project, s_learned_select_project_compact_13sq, s_recolor_match_conditional_compact,
-                     s_learned_select_project_compact_v5, s_learned_select_project_compact_10sq, s_learned_select_project_compact_v6)
-from ._replace_col0 import s_replace_color_from_col0
-from ._classify_dominant import s_classify_by_dominant_color
-from ._variable_fliplr import s_variable_fliplr
-from ._variable_flipud import s_variable_flipud
-from ._misc_solvers import s_keep_first_third_cols, s_marker_extract
-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 = [
-    ('identity', s_identity),
-    ('constant', s_constant),
-    ('color_map', s_color_map),
-    ('transpose', s_transpose),
-    ('flip', s_flip),
-    ('rotate', s_rotate),
-    ('shift', s_shift),
-    ('tile', s_tile),
-    ('upscale', s_upscale),
-    ('kronecker', s_kronecker),
-    ('nonuniform_scale', s_nonuniform_scale),
-    ('mirror_h', s_mirror_h),
-    ('mirror_v', s_mirror_v),
-    ('quad_mirror', s_quad_mirror),
-    ('concat', s_concat),
-    ('concat_enhanced', s_concat_enhanced),
-    ('diagonal_tile', s_diagonal_tile),
-    ('fixed_crop', s_fixed_crop),
-    ('spatial_gather', s_spatial_gather),
-    ('varshape_spatial_gather', s_varshape_spatial_gather),
-    ('gravity_unrolled', s_gravity_unrolled),
-    ('edge_detect', s_edge_detect),
-    ('mode_fill', s_mode_fill),
-    ('downsample_stride', s_downsample_stride),
-    ('symmetry_complete', s_symmetry_complete),
-    ('extract_inner', s_extract_inner),
-    ('add_border', s_add_border),
-    ('sparse_fill', s_sparse_fill),
-    ('channel_filter', s_channel_filter),
-    ('swap_two_colors', s_swap_two_colors),
-    ('invert_colors', s_invert_colors),
-    ('diagonal_flip', s_diagonal_flip),
-    ('overlay_constant', s_overlay_constant),
-    ('bbox_crop', s_bbox_crop),
-    ('row_mode_fill', s_row_mode_fill),
-    ('col_mode_fill', s_col_mode_fill),
-    ('fill_bg_with_mode', s_fill_bg_with_mode),
-    ('pad_align', s_pad_align),
-    ('repeat_row', s_repeat_row),
-    ('repeat_col', s_repeat_col),
-    ('border_extract', s_border_extract),
-    ('interior_fill', s_interior_fill),
-    ('majority_color_fill', s_majority_color_fill),
-    ('max_pool_downsample', s_max_pool_downsample),
-    ('crop_paste', s_crop_paste),
-    ('multi_stamp', s_multi_stamp),
-    ('self_tile', s_self_tile),
-    ('self_tile_majority', s_self_tile_majority),
-    ('split_and_merge', s_split_and_merge),
-    ('extract_densest_object', s_extract_densest_object),
-    ('extract_smallest_area', s_extract_smallest_area),
-    ('extract_largest_count', s_extract_largest_count),
-    ('symmetry_max_tb', s_symmetry_max_tb),
-    ('variable_crop_topleft', s_variable_crop_topleft),
-    ('replace_color_from_col0', s_replace_color_from_col0),
-    ('classify_by_dominant_color', s_classify_by_dominant_color),
-    ('variable_fliplr', s_variable_fliplr),
-    ('variable_flipud', s_variable_flipud),
-    ('keep_first_third_cols', s_keep_first_third_cols),
-    ('marker_extract', s_marker_extract),
-    # Wave 5 solvers
-    ('row_uniform_fill', s_row_uniform_fill),
-    ('majority_replace_5', s_majority_replace_5),
-    ('find_color_with_hole', s_find_color_with_hole),
-    ('fill_bbox_per_color', s_fill_bbox_per_color),
-    ('border_detect', s_border_detect),
-    ('symmetry_check_lr', s_symmetry_check_lr),
-    ('variable_scale_2x', s_variable_scale_2x),
-    ('split_midpoint_or', s_split_midpoint_or),
-    ('split_nor', s_split_nor),
-    ('split_boolean', s_split_boolean),
-    ('symmetrize', s_symmetrize),
-    ('fill_row_endpoints_match', s_fill_row_endpoints_match),
-    ('split_flip_overlay', s_split_flip_overlay),
-    ('fill_between_markers', s_fill_between_markers),
-    ('recolor_to_marker', s_recolor_to_marker),
-    ('fill_between_same_color_row', s_fill_between_same_color_row),
-    ('fill_between_same_color_cross', s_fill_between_same_color_cross),
-    ('bbox_tile_1x2', s_bbox_tile_1x2),
-    # Wave 6 solvers (reverse-engineered from submission-5743)
-    ('select_asymmetric_block', s_select_asymmetric_block),
-    ('bbox_crop_3x3', s_bbox_crop_3x3),
-    ('periodic_tile_fill', s_periodic_tile_fill),
-    ('eightfold_symmetry', s_eightfold_symmetry),
-    ('ushape_fill_bottom', s_ushape_fill_bottom),
-    ('centroid_zoom', s_centroid_zoom),
-    # Wave 7 solvers (more reverse-engineered from submission-5743)
-    ('count_color1_lookup', s_count_color1_lookup),
-    ('count_present_colors', s_count_present_colors),
-    ('histogram_match', s_histogram_match),
-    ('marker_grid_fill', s_marker_grid_fill),
-    # Wave 8 solvers (reverse-engineered from submission-5743, tasks 176/292/262/339/130/315/296/61)
-    ('fill_mask_delta', s_fill_mask_delta),
-    ('recolor_col_mask', s_recolor_col_mask),
-    ('palette_lookup_markers', s_palette_lookup_markers),
-    ('count_dominant_bar', s_count_dominant_bar),
-    ('maxpool_3x3_downsample', s_maxpool_3x3_downsample),
-    ('tile_mask_color2', s_tile_mask_color2),
-    ('matmul_projection', s_matmul_projection),
-    ('count_colors_pattern_bank', s_count_colors_pattern_bank),
-    # Wave 9 solvers (reverse-engineered from submission-6043, tasks 166/346/149/303/97)
-    ('fill_bbox_interior_color2', s_fill_bbox_interior_color2),
-    ('least_dense_color', s_least_dense_color),
-    ('count_color6_threshold', s_count_color6_threshold),
-    ('conv_row_col_combine', s_conv_row_col_combine),
-    ('neighbor_remove', s_neighbor_remove),
-    # Wave 10 solvers (reverse-engineered from 5743/6043, tasks 167fix/186fix/193/257/327/12/197/242/162/329/85)
-    ('count_present_colors_fixed', s_count_present_colors_fixed),
-    ('count_color1_lookup_fixed', s_count_color1_lookup_fixed),
-    ('remove_isolated_2x2', s_remove_isolated_2x2),
-    ('overlay_4quadrants', s_overlay_4quadrants),
-    ('diagonal_expand', s_diagonal_expand),
-    ('pattern_grow_diamond', s_pattern_grow_diamond),
-    ('row_pattern_tile', s_row_pattern_tile),
-    ('flip_crop_marker', s_flip_crop_marker),
-    ('find_enclosed_fill', s_find_enclosed_fill),
-    ('keep_middle_col', s_keep_middle_col),
-    ('shift_parity_remove', s_shift_parity_remove),
-    # Wave 11 solvers (reverse-engineered from 5743, tasks 151/375/141/192/222/295)
-    ('directional_replace', s_directional_replace),
-    ('x_pattern_centroid', s_x_pattern_centroid),
-    ('diagonal_fill_centroid', s_diagonal_fill_centroid),
-    ('keep_dominant_2x2', s_keep_dominant_2x2),
-    ('keep_dominant_2x2_v2', s_keep_dominant_2x2_v2),
-    ('staircase_fill', s_staircase_fill),
-    # Wave 12 solvers (reverse-engineered from 5743, tasks 272/147/207/320/321)
-    ('isolated_mark_5x5', s_isolated_mark_5x5),
-    ('neighbor_mark_6x6', s_neighbor_mark_6x6),
-    ('odd_quadrant', s_odd_quadrant),
-    ('cumsum_bottom_mark', s_cumsum_bottom_mark),
-    ('three_panel_overlay', s_three_panel_overlay),
-    # Wave 13 solvers (tasks 160/249/273/248/357)
-    ('block_center_mark', s_block_center_mark),
-    ('shift_tile_by_width', s_shift_tile_by_width),
-    ('fill_interior_4corners', s_fill_interior_4corners),
-    ('zigzag_marker_248', s_zigzag_marker_248),
-    ('zigzag_marker_357', s_zigzag_marker_357),
-    # Wave 14 solvers (tasks 68/371/271/143/287/274/393/104/79)
-    ('unique_color_extract_dilate', s_unique_color_extract_dilate),
-    ('centroid_manhattan_cross', s_centroid_manhattan_cross),
-    ('conv_argmax_crop', s_conv_argmax_crop),
-    ('template_match_recolor', s_template_match_recolor),
-    ('symmetry_4fold_max', s_symmetry_4fold_max),
-    ('row_gap_bank', s_row_gap_bank),
-    ('top3_colors', s_top3_colors),
-    ('quadrant_position_mask', s_quadrant_position_mask),
-    ('conv5_argmax_crop3', s_conv5_argmax_crop3),
-    # Wave 15 solvers (tasks 181/278/381)
-    ('mirror_patch_markers', s_mirror_patch_markers),
-    ('cluster_expand_frame', s_cluster_expand_frame),
-    ('maxpool_row_conflict', s_maxpool_row_conflict),
-    # Wave 16 solvers (tasks 23/253/319 - embedded trained weights)
-    ('convnet_ch5_split', s_convnet_ch5_split),
-    ('block2x2_pattern_bank', s_block2x2_pattern_bank),
-    ('hash_lookup_319', s_hash_lookup_319),
-    # Wave 17 solvers (tasks 4/38/59/106/108/123/153/180/344/369 - reverse-engineered from 5743)
-    ('conv3x3_task4', s_conv3x3_task4),
-    ('gridsample_108', s_gridsample_108),
-    ('hash_lookup_153', s_hash_lookup_153),
-    ('argmax_gather_106', s_argmax_gather_106),
-    ('flag_level_map_123', s_flag_level_map_123),
-    ('quadrant_overlap_38', s_quadrant_overlap_38),
-    ('dilated_conv_180', s_dilated_conv_180),
-    ('adjacency_classify_369', s_adjacency_classify_369),
-    ('conv5x5_task344', s_conv5x5_task344),
-    ('region_scatter_59', s_region_scatter_59),
-    # Wave 18 solvers (tasks 24/37/47/63/81/93/125/128/137/139)
-    ('row_col_filter_24', s_row_col_filter_24),
-    ('grouped_conv_fill_37', s_grouped_conv_fill_37),
-    ('centroid_distance_47', s_centroid_distance_47),
-    ('bbox_channel_swap_63', s_bbox_channel_swap_63),
-    ('neighbor_shift_81', s_neighbor_shift_81),
-    ('maxpool_classify_93', s_maxpool_classify_93),
-    ('cumsum_dilate_125', s_cumsum_dilate_125),
-    ('argmax_shift_128', s_argmax_shift_128),
-    ('tail_detect_137', s_tail_detect_137),
-    ('horizontal_shift_fill_139', s_horizontal_shift_fill_139),
-    # Wave 19 solvers (tasks 3/8/10/11/17/19/27/30/48/58/64/71/75/84/86)
-    ('pattern_replicate_3', s_pattern_replicate_3),
-    ('connected_region_8', s_connected_region_8),
-    ('cascade_filter_10', s_cascade_filter_10),
-    ('line_extend_11', s_line_extend_11),
-    ('multi_region_17', s_multi_region_17),
-    ('color_shift_19', s_color_shift_19),
-    ('large_kernel_conv_27', s_large_kernel_conv_27),
-    ('flood_fill_30', s_flood_fill_30),
-    ('grid_partition_48', s_grid_partition_48),
-    ('conv_transform_58', s_conv_transform_58),
-    ('symmetric_fill_64', s_symmetric_fill_64),
-    ('block_pattern_71', s_block_pattern_71),
-    ('border_fill_75', s_border_fill_75),
-    ('region_grow_84', s_region_grow_84),
-    ('marker_spread_86', s_marker_spread_86),
-    # Wave 20 solvers (20 tasks)
-    ('flood_detect_92', s_flood_detect_92),
-    ('neighbor_logic_94', s_neighbor_logic_94),
-    ('spread_marker_109', s_spread_marker_109),
-    ('pattern_match_112', s_pattern_match_112),
-    ('lookup_map_114', s_lookup_map_114),
-    ('shift_align_121', s_shift_align_121),
-    ('iterative_fill_124', s_iterative_fill_124),
-    ('conv_cascade_159', s_conv_cascade_159),
-    ('line_cross_161', s_line_cross_161),
-    ('marker_fill_165', s_marker_fill_165),
-    ('edge_propagate_175', s_edge_propagate_175),
-    ('directional_grow_177', s_directional_grow_177),
-    ('symmetry_detect_183', s_symmetry_detect_183),
-    ('multi_conv_187', s_multi_conv_187),
-    ('block_extract_188', s_block_extract_188),
-    ('color_region_195', s_color_region_195),
-    ('pixel_count_bar_196', s_pixel_count_bar_196),
-    ('grid_logic_198', s_grid_logic_198),
-    ('corner_detect_199', s_corner_detect_199),
-    ('region_color_200', s_region_color_200),
-    # Wave 21 solvers (24 tasks)
-    ('maxpool_spread_91', s_maxpool_spread_91),
-    ('hash_encode_100', s_hash_encode_100),
-    ('overlap_detect_204', s_overlap_detect_204),
-    ('pattern_grow_215', s_pattern_grow_215),
-    ('spatial_encode_217', s_spatial_encode_217),
-    ('kernel_shift_221', s_kernel_shift_221),
-    ('conv_threshold_225', s_conv_threshold_225),
-    ('multi_step_228', s_multi_step_228),
-    ('spatial_logic_231', s_spatial_logic_231),
-    ('object_align_232', s_object_align_232),
-    ('channel_merge_235', s_channel_merge_235),
-    ('shift_pattern_239', s_shift_pattern_239),
-    ('directional_mask_246', s_directional_mask_246),
-    ('tile_index_247', s_tile_index_247),
-    ('iterative_logic_251', s_iterative_logic_251),
-    ('region_extract_252', s_region_extract_252),
-    ('region_classify_256', s_region_classify_256),
-    ('block_reduce_259', s_block_reduce_259),
-    ('slice_combine_260', s_slice_combine_260),
-    ('color_encode_265', s_color_encode_265),
-    ('fill_logic_269', s_fill_logic_269),
-    ('boundary_fill_279', s_boundary_fill_279),
-    ('edge_detect_289', s_edge_detect_289),
-    ('marker_connect_298', s_marker_connect_298),
-    # Wave 22 solvers (143 reverse-engineered from 5743)
-    ('select_transform_10sq', s_select_transform_10sq),
-    ('aggregate', s_aggregate),
-    ('diff_aggregate', s_diff_aggregate),
-    ('crop_select_remap_filter_16sq', s_crop_select_remap_filter_16sq),
-    ('crop_select_remap_filter_24sq', s_crop_select_remap_filter_24sq),
-    ('flood_recolor', s_flood_recolor),
-    ('crop_cumulative_10sq', s_crop_cumulative_10sq),
-    ('flood_recolor_12sq', s_flood_recolor_12sq),
-    ('conv_cumulative_remap_10sq', s_conv_cumulative_remap_10sq),
-    ('select_filter', s_select_filter),
-    ('logic', s_logic),
-    ('cascade_transform_10sq', s_cascade_transform_10sq),
-    ('select_project_filter', s_select_project_filter),
-    ('conv_recolor', s_conv_recolor),
-    ('cumulative_recolor_10sq', s_cumulative_recolor_10sq),
-    ('select_diff_9sq', s_select_diff_9sq),
-    ('select_transform_10sq_v2', s_select_transform_10sq_v2),
-    ('mask_aggregate_19sq', s_mask_aggregate_19sq),
-    ('flood_recolor_v2', s_flood_recolor_v2),
-    ('select_filter_v2', s_select_filter_v2),
-    ('cascade_logic_conditional', s_cascade_logic_conditional),
-    ('project_recolor', s_project_recolor),
-    ('remap_match_conditional', s_remap_match_conditional),
-    ('cumulative_recolor_10sq_v2', s_cumulative_recolor_10sq_v2),
-    ('select_filter_v3', s_select_filter_v3),
-    ('conv_fill', s_conv_fill),
-    ('conv_logic_conditional_1x5', s_conv_logic_conditional_1x5),
-    ('conv_match_logic', s_conv_match_logic),
-    ('select_transform', s_select_transform),
-    ('transform_diff_mask_9sq', s_transform_diff_mask_9sq),
-    ('conv_match_logic_v2', s_conv_match_logic_v2),
-    ('conv_recolor_v2', s_conv_recolor_v2),
-    ('cascade_mask', s_cascade_mask),
-    ('conv_recolor_v3', s_conv_recolor_v3),
-    ('select_project', s_select_project),
-    ('remap_recolor_5sq', s_remap_recolor_5sq),
-    ('cumulative_conditional_aggregate_10sq', s_cumulative_conditional_aggregate_10sq),
-    ('cascade_mask_10sq', s_cascade_mask_10sq),
-    ('conv_fill_v2', s_conv_fill_v2),
-    ('conv_remap_5x15', s_conv_remap_5x15),
-    ('conv_mask_diff_15sq', s_conv_mask_diff_15sq),
-    ('select_conditional_aggregate', s_select_conditional_aggregate),
-    ('select_conditional_match', s_select_conditional_match),
-    ('select_combine_conditional_15sq', s_select_combine_conditional_15sq),
-    ('conv_logic_logic_10sq', s_conv_logic_logic_10sq),
-    ('filter_mask_aggregate', s_filter_mask_aggregate),
-    ('conv_recolor_v4', s_conv_recolor_v4),
-    ('flood_recolor_v3', s_flood_recolor_v3),
-    ('conv_select_recolor_10sq', s_conv_select_recolor_10sq),
-    ('select_filter_v4', s_select_filter_v4),
-    ('conv_mask_aggregate_10sq', s_conv_mask_aggregate_10sq),
-    ('conv_cumulative_select_filter_21sq', s_conv_cumulative_select_filter_21sq),
-    ('filter_mask_aggregate_v2', s_filter_mask_aggregate_v2),
-    ('crop_filter_9sq', s_crop_filter_9sq),
-    ('select_match_logic', s_select_match_logic),
-    ('flood_transform', s_flood_transform),
-    ('flood_select_remap_filter', s_flood_select_remap_filter),
-    ('cascade_cumulative_15sq', s_cascade_cumulative_15sq),
-    ('select_remap', s_select_remap),
-    ('learned_project_transform_11sq', s_learned_project_transform_11sq),
-    ('select_remap_13sq', s_select_remap_13sq),
-    ('conv_transform', s_conv_transform),
-    ('select_transform_v2', s_select_transform_v2),
-    ('recolor_mask_diff', s_recolor_mask_diff),
-    ('cascade', s_cascade),
-    ('conv_remap', s_conv_remap),
-    ('conv_mask_aggregate', s_conv_mask_aggregate),
-    ('logic_conditional_peak', s_logic_conditional_peak),
-    ('recolor_mask_diff_10sq', s_recolor_mask_diff_10sq),
-    ('recolor_mask_10sq', s_recolor_mask_10sq),
-    ('conv_select_remap', s_conv_select_remap),
-    ('conv_logic_aggregate_10sq', s_conv_logic_aggregate_10sq),
-    ('learned_select_project_fill_10sq', s_learned_select_project_fill_10sq),
-    ('flood_remap_transform', s_flood_remap_transform),
-    ('flood_remap_13sq', s_flood_remap_13sq),
-    ('flood_remap_transform_v2', s_flood_remap_transform_v2),
-    ('select_remap_v2', s_select_remap_v2),
-    ('select_transform_10sq_v3', s_select_transform_10sq_v3),
-    ('cumulative_select_remap_filter_10sq', s_cumulative_select_remap_filter_10sq),
-    ('select_remap_filter_29sq', s_select_remap_filter_29sq),
-    ('remap_transform', s_remap_transform),
-    ('multiconv_remap_filter', s_multiconv_remap_filter),
-    ('cumulative_select_remap_filter_20sq', s_cumulative_select_remap_filter_20sq),
-    ('cascade_recolor_10sq', s_cascade_recolor_10sq),
-    ('learned_remap_project_filter', s_learned_remap_project_filter),
-    ('multiconv_select_remap_filter', s_multiconv_select_remap_filter),
-    ('select_logic', s_select_logic),
-    ('cascade_recolor_12sq', s_cascade_recolor_12sq),
-    ('cascade_recolor_12sq_v2', s_cascade_recolor_12sq_v2),
-    ('transform_logic_diff', s_transform_logic_diff),
-    ('filter_mask_aggregate_deep', s_filter_mask_aggregate_deep),
-    ('cumulative_select_remap_filter', s_cumulative_select_remap_filter),
-    ('learned_project_transform_deep', s_learned_project_transform_deep),
-    ('learned_project_transform_10x15', s_learned_project_transform_10x15),
-    ('cascade_transform_deep_10sq', s_cascade_transform_deep_10sq),
-    ('logic_logic_deep', s_logic_logic_deep),
-    ('multiconv_select_deep', s_multiconv_select_deep),
-    ('learned_project_10sq', s_learned_project_10sq),
-    ('learned_remap_project_transform_30sq', s_learned_remap_project_transform_30sq),
-    ('learned_select_project_compact', s_learned_select_project_compact),
-    ('learned_project_recolor', s_learned_project_recolor),
-    ('learned_select_project_filter', s_learned_select_project_filter),
-    ('select_remap_filter_deep_10sq', s_select_remap_filter_deep_10sq),
-    ('cascade_filter_deep', s_cascade_filter_deep),
-    ('learned_select_remap_project_transform', s_learned_select_remap_project_transform),
-    ('learned_select_project_14x12', s_learned_select_project_14x12),
-    ('learned_select_project_compact_v2', s_learned_select_project_compact_v2),
-    ('cascade_select_remap_filter_deep', s_cascade_select_remap_filter_deep),
-    ('learned_select_remap_project_23sq', s_learned_select_remap_project_23sq),
-    ('conv_compact_10sq', s_conv_compact_10sq),
-    ('learned_select_project_recolor_compact', s_learned_select_project_recolor_compact),
-    ('learned_project_compact_20sq', s_learned_project_compact_20sq),
-    ('learned_select_project_compact_v3', s_learned_select_project_compact_v3),
-    ('learned_project_deep', s_learned_project_deep),
-    ('learned_project_recolor_compact_15x10', s_learned_project_recolor_compact_15x10),
-    ('learned_select_project_compact_v4', s_learned_select_project_compact_v4),
-    ('transform_compact_10sq', s_transform_compact_10sq),
-    ('flood_recolor_v4', s_flood_recolor_v4),
-    ('cascade_recolor_10sq_v2', s_cascade_recolor_10sq_v2),
-    ('conv_filter', s_conv_filter),
-    ('conv_transform_9sq', s_conv_transform_9sq),
-    ('learned_project_filter', s_learned_project_filter),
-    ('select_diff', s_select_diff),
-    ('flood_cumulative_remap_30sq', s_flood_cumulative_remap_30sq),
-    ('cascade_recolor_17sq', s_cascade_recolor_17sq),
-    ('conv_select_remap_filter', s_conv_select_remap_filter),
-    ('cascade_transform', s_cascade_transform),
-    ('cascade_recolor', s_cascade_recolor),
-    ('cascade_mask_10sq_v2', s_cascade_mask_10sq_v2),
-    ('project_fill_10sq', s_project_fill_10sq),
-    ('conv_remap_transform', s_conv_remap_transform),
-    ('cascade_recolor_v2', s_cascade_recolor_v2),
-    ('learned_project_compact', s_learned_project_compact),
-    ('select_remap_10sq', s_select_remap_10sq),
-    ('conv_remap_filter_deep_10sq', s_conv_remap_filter_deep_10sq),
-    ('crop_cascade_remap_deep_11sq', s_crop_cascade_remap_deep_11sq),
-    ('remap_transform_deep', s_remap_transform_deep),
-    ('learned_remap_project', s_learned_remap_project),
-    ('learned_select_project_compact_13sq', s_learned_select_project_compact_13sq),
-    ('recolor_match_conditional_compact', s_recolor_match_conditional_compact),
-    ('learned_select_project_compact_v5', s_learned_select_project_compact_v5),
-    ('learned_select_project_compact_10sq', s_learned_select_project_compact_10sq),
-    ('learned_select_project_compact_v6', s_learned_select_project_compact_v6),
-]
-
-def _check_size(path):
-    try: return os.path.getsize(path) <= MAX_ONNX_FILESIZE
-    except OSError: return False
-
-def _check_scoreable(path):
-    macs, memory, params = score_network(path)
-    return not (macs is None or memory is None or params is None)
-
-def _accept_model(path, td, providers):
-    return _check_size(path) and validate(path, td, providers) and _check_scoreable(path)
-
-def _cleanup_failed(path):
-    try:
-        if os.path.exists(path): os.remove(path)
-    except OSError: pass
-
-def solve_task(tn, td, outdir, providers, conv_budget=30.0, excluded_tasks=None):
-    if excluded_tasks is None: excluded_tasks = EXCLUDED_TASKS
-    t_start = time.time()
-    os.makedirs(outdir, exist_ok=True)
-    path = os.path.join(outdir, f"task{tn:03d}.onnx")
-    if tn in excluded_tasks:
-        return False, 'excluded', None, time.time() - t_start, path
-    for sname, sfn in ANALYTICAL_SOLVERS:
-        try:
-            model = sfn(td)
-            if model is None: continue
-            onnx.save(model, path)
-            if _accept_model(path, td, providers):
-                return True, sname, os.path.getsize(path), time.time() - t_start, path
-        except: pass
-    exs = get_exs(td)
-    same_shape = all(inp.shape == out.shape for inp, out in exs)
-    shapes = set(inp.shape for inp, _ in exs)
-    fixed_in = len(shapes) == 1
-    conv_time = conv_budget
-    if same_shape:
-        if fixed_in:
-            result = solve_conv_fixed(td, path, providers, time_budget=conv_time / 2)
-            if result is not None and _check_size(path) and _check_scoreable(path):
-                return True, result[0], 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 and _check_size(path) and _check_scoreable(path):
-            return True, result[0], os.path.getsize(path), time.time() - t_start, path
-    else:
-        sp = fixed_shapes(td)
-        if sp is not None:
-            (IH, IW), (OH, OW) = sp
-            if OH <= IH and OW <= IW:
-                result = solve_conv_diffshape(td, path, providers, time_budget=conv_time)
-                if result is not None and _check_size(path) and _check_scoreable(path):
-                    return True, result[0], 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 and _check_size(path) and _check_scoreable(path):
-            return True, result[0], os.path.getsize(path), time.time() - t_start, path
-    _cleanup_failed(path)
-    return False, None, None, time.time() - t_start, path
+This file is too large to include inline - applying targeted fix only