Don't debug at log level 1

lukstafi · lukstafi · commit c94954d06c23 · 2025-02-24T11:04:28.000+01:00
diff --git a/lib/row.ml b/lib/row.ml
@@ -530,7 +530,7 @@ let subst_row (env : environment) ({ dims; bcast; id } : t) : t =
                 id;
               }))
 
-let%debug_sexp rec unify_dim ~stage (eq : dim * dim) (env : environment) : constraint_ list * environment =
+let%debug5_sexp rec unify_dim ~stage (eq : dim * dim) (env : environment) : constraint_ list * environment =
   let dim1 : dim = subst_dim env @@ fst eq and dim2 : dim = subst_dim env @@ snd eq in
   match (dim1, dim2) with
   | Dim { label = Some l1; _ }, Dim { label = Some l2; _ } when not (String.equal l1 l2) ->
@@ -590,7 +590,7 @@ let drop_from_end l n = List.rev @@ List.drop (List.rev l) n
 let take_from_end (l : dim list) (n : int) : dim list = List.rev @@ List.take (List.rev l) n
 
 (* Equate two rows, no broadcasting. Does not resolve inequalities. *)
-let%debug_sexp rec unify_row ~stage (eq : t * t) (env : environment) : constraint_ list * environment =
+let%debug5_sexp rec unify_row ~stage (eq : t * t) (env : environment) : constraint_ list * environment =
   let rec solve (ineqs, env) = function
     | Dim_eq { d1; d2 } ->
         let more_ineqs, env = unify_dim ~stage (d1, d2) env in
@@ -733,7 +733,7 @@ let%debug_sexp rec unify_row ~stage (eq : t * t) (env : environment) : constrain
       | Ok eqs ->
           List.fold ~init:([], env) ~f:(fun acc (d1, d2) -> solve acc (Dim_eq { d1; d2 })) eqs)
 
-let%debug_sexp solve_dim_ineq ~(stage : stage) ~(cur : dim) ~(subr : dim) (env : environment) :
+let%debug5_sexp solve_dim_ineq ~(stage : stage) ~(cur : dim) ~(subr : dim) (env : environment) :
     constraint_ list * environment =
   let nonredundant ?(more = []) v vs =
     Utils.sorted_diff ~compare:compare_dim_var
@@ -911,7 +911,7 @@ let%debug_sexp solve_dim_ineq ~(stage : stage) ~(cur : dim) ~(subr : dim) (env :
 
 let global_template_cache = Hashtbl.Poly.create ()
 
-let%debug_sexp solve_row_ineq ~(stage : stage) ~(cur : t) ~(subr : t) (env : environment) :
+let%debug5_sexp solve_row_ineq ~(stage : stage) ~(cur : t) ~(subr : t) (env : environment) :
     constraint_ list * environment =
   let nonredundant ?(more = []) v vs =
     Utils.sorted_diff ~compare:compare_row_var
@@ -1145,7 +1145,7 @@ let%debug_sexp solve_row_ineq ~(stage : stage) ~(cur : t) ~(subr : t) (env : env
   | { bcast = Row_var _ | Broadcastable; _ }, { bcast = Row_var _ | Broadcastable; _ } ->
       (Row_ineq { cur; subr } :: ineqs, env)
 
-let%debug_sexp close_dim_terminal ~(stage : stage) (env : environment) (dim : dim) : constraint_ list =
+let%debug5_sexp close_dim_terminal ~(stage : stage) (env : environment) (dim : dim) : constraint_ list =
   match dim with
   | Dim _ -> []
   | Var v -> (
@@ -1160,7 +1160,7 @@ let%debug_sexp close_dim_terminal ~(stage : stage) (env : environment) (dim : di
 
 let last_dim_is dims d2 = match List.last dims with Some (Dim { d; _ }) -> d = d2 | _ -> false
 
-let%debug_sexp rec eliminate_row_constraint ~lub (r : row) (constr : row_constraint) env : constraint_ list =
+let%debug5_sexp rec eliminate_row_constraint ~lub (r : row) (constr : row_constraint) env : constraint_ list =
   match r with
   | { bcast = Broadcastable; _ } ->
       (* The environment is unchanged, as apply_row_constraint would update only the constr. *)
@@ -1223,7 +1223,7 @@ let close_row_terminal ~(stage : stage) (env : environment) ({ dims; bcast; id }
       | _ when is_stage5_up stage -> []
       | _ -> Terminal_row r1 :: term_dims ())
 
-let%debug_sexp eliminate_dim_entry v ~lub constr =
+let%debug5_sexp eliminate_dim_entry v ~lub constr =
   match (lub, constr) with
   | _, Unconstrained_dim | _, At_least_dim 1 -> None
   | Some (Dim { d; _ } as lub), At_least_dim d2 when d2 > d ->
@@ -1234,7 +1234,7 @@ let%debug_sexp eliminate_dim_entry v ~lub constr =
   | Some lub, At_least_dim _ -> Some (Dim_eq { d1 = Var v; d2 = lub })
   | None, At_least_dim d -> Some (Dim_eq { d1 = Var v; d2 = get_dim ~d () })
 
-let%debug_sexp eliminate_variables (env : environment) ({ dims; bcast; id } as _r : row) : constraint_ list =
+let%debug5_sexp eliminate_variables (env : environment) ({ dims; bcast; id } as _r : row) : constraint_ list =
   let f = function
     | Var v as d1 ->
         Some
@@ -1259,7 +1259,7 @@ let%debug_sexp eliminate_variables (env : environment) ({ dims; bcast; id } as _
 
 let empty_env = { dim_env = Map.empty (module Dim_var); row_env = Map.empty (module Row_var) }
 
-let%debug_sexp solve_inequalities ~(stage : stage) (ineqs : constraint_ list) (env : environment) :
+let%debug4_sexp solve_inequalities ~(stage : stage) (ineqs : constraint_ list) (env : environment) :
     constraint_ list * environment =
   let rec solve (ineqs : constraint_ list) (env : environment) : constraint_ list * environment =
     let f (ineqs, env) (ineq : constraint_) =
@@ -1410,7 +1410,7 @@ type proj_equation =
           e.g. for broadcasted-to axes of a tensor assigned a constant. *)
 [@@deriving compare, equal, sexp]
 
-let%debug_sexp get_proj_equations (inequalities : constraint_ list) proj_axis_env (env : environment) :
+let%debug4_sexp get_proj_equations (inequalities : constraint_ list) proj_axis_env (env : environment) :
     proj_equation list =
   let to_proj : dim -> proj = function
     | Var v when Map.mem proj_axis_env v -> Solved (Map.find_exn proj_axis_env v)
@@ -1460,7 +1460,7 @@ let%debug_sexp get_proj_equations (inequalities : constraint_ list) proj_axis_en
   in
   List.concat_map inequalities ~f
 
-let%debug_sexp solve_proj_equations (eqs : proj_equation list) : proj_env =
+let%debug4_sexp solve_proj_equations (eqs : proj_equation list) : proj_env =
   let v_env = dim_hashtbl () in
   let p_solved = ref [] in
   let p_dims = ref [] in
diff --git a/lib/shape.ml b/lib/shape.ml
@@ -336,7 +336,7 @@ let einsum_slot_spec_to_dims_bio ~generative ~sh_id ~row_var_env ~dim_var_env la
 
 type proj_axis_env = Arrayjit.Indexing.axis_index Row.dim_map [@@deriving sexp]
 
-let%debug_sexp get_inequalities ({ shape = cur_sh; logic; id = _ } as _upd : update_step) :
+let%debug4_sexp get_inequalities ({ shape = cur_sh; logic; id = _ } as _upd : update_step) :
     proj_axis_env * Row.constraint_ list =
   let generative =
     [
@@ -599,7 +599,7 @@ let apply_env_update ~eliminate_variables env update_step =
     List.concat_map ~f:(Row.eliminate_variables env) @@ all_rows update_step
   else []
 
-let%debug_sexp propagate_shapes (update_step : update_step) : unit =
+let%debug4_sexp propagate_shapes (update_step : update_step) : unit =
   (* Allow the derivation of constraints to depend on the shapes (currently, only Batch_slice
      does). *)
   ignore (apply_env_update ~eliminate_variables:false !state update_step);
@@ -611,7 +611,7 @@ let%debug_sexp propagate_shapes (update_step : update_step) : unit =
   ignore (apply_env_update ~eliminate_variables:false env update_step);
   state := env
 
-let%debug_sexp finish_inference (() : unit) : unit =
+let%debug4_sexp finish_inference (() : unit) : unit =
   (* TODO: optimize to keep all needed information in unsolved, rather than starting with all
      constraints. *)
   let unsolved, env = Row.solve_inequalities ~stage:Stage2 !active_constraints !state in
@@ -894,7 +894,7 @@ let axis_keys_to_idcs (sh : t) : int axis_map =
   Array.rev_inplace idcs;
   Map.of_alist_exn (module AxisKey) @@ Array.to_list @@ Array.mapi idcs ~f:(fun i key -> (key, i))
 
-let%debug_sexp default_display_indices (sh: t): int array =
+let%debug5_sexp default_display_indices (sh: t): int array =
   let axes = axis_keys_to_idcs sh |> Map.map ~f:(fun _ -> 0) in
   let occupied = Array.create ~len:5 false in
   let set_occu prio =
diff --git a/todo.md b/todo.md
@@ -2,4 +2,5 @@
 
 ppx_cd: reduce code duplication
 ppx_cd: get rid of binary_op and use binary_ops table instead {cm:2025-01-28}
-Tensor.print_tree should never force memory modes
+Tensor.print_tree should never force memory modes
+get C compiler from `ocamlc -config`
