Row provenance TODOs

lukstafi · lukstafi · commit bd6c5ef0f729 · 2025-09-20T11:05:01.000+02:00
diff --git a/tensor/row.ml b/tensor/row.ml
@@ -160,6 +160,7 @@ type provenance_origin = { sh_id : int; kind : kind } [@@deriving sexp, compare,
 (* List of origins, maintained as deduplicated and sorted *)
 type provenance = provenance_origin list [@@deriving sexp, compare, equal, hash]
 
+let empty_provenance = []
 let provenance ~sh_id ~kind = [ { sh_id; kind } ]
 
 (* Merge two provenances by combining and deduplicating their origins *)
@@ -171,7 +172,7 @@ type t = { dims : dim list; bcast : bcast; prov : provenance }
 
 type row = t [@@deriving equal, sexp]
 
-let get_row_for_var ?(prov = []) v = { dims = []; bcast = Row_var { v; beg_dims = [] }; prov }
+let get_row_for_var prov v = { dims = []; bcast = Row_var { v; beg_dims = [] }; prov }
 
 let dims_label_assoc dims =
   let f = function Var { label = Some l; _ } as d -> Some (l, d) | _ -> None in
@@ -400,7 +401,7 @@ let collect_factors dims =
 
 let known_dims_product dims = match collect_factors dims with Some (_, []) -> true | _ -> false
 
-let rec row_conjunction ?(prov = []) ~origin stage constr1 constr2 =
+let rec row_conjunction ~prov ~origin stage constr1 constr2 =
   let elems_mismatch n1 n2 =
     raise
     @@ Shape_error
diff --git a/tensor/row.mli b/tensor/row.mli
@@ -45,6 +45,7 @@ val dim_to_string : print_style -> dim -> string
 type provenance [@@deriving sexp, compare, equal, hash]
 
 val provenance : sh_id:int -> kind:kind -> provenance
+val empty_provenance : provenance
 val merge_provenance : provenance -> provenance -> provenance
 
 type row_var [@@deriving sexp, compare, equal, hash]
@@ -59,10 +60,11 @@ type bcast =
   | Broadcastable  (** The shape does not have more axes of this kind, but is "polymorphic". *)
 [@@deriving equal, hash, compare, sexp, variants]
 
-type t = { dims : dim list; bcast : bcast; prov : provenance } [@@deriving equal, hash, compare, sexp]
+type t = { dims : dim list; bcast : bcast; prov : provenance }
+[@@deriving equal, hash, compare, sexp]
 
 val dims_label_assoc : t -> (string * dim) list
-val get_row_for_var : ?prov:provenance -> row_var -> t
+val get_row_for_var : provenance -> row_var -> t
 
 type environment [@@deriving sexp_of]
 
diff --git a/tensor/shape.ml b/tensor/shape.ml
@@ -1267,7 +1267,7 @@ let set_dim delayed_var_ref dim =
           {
             (* TODO: actually, the Row.provenance should be the one of the shape that the row variable
                is in, should be stored in `Row and in env_row_var. *)
-            r = [ Row.get_row_for_var row_var ];
+            r = [ Row.get_row_for_var Row.empty_provenance row_var ];
             constr = Total_elems { numerator = Num_elems dim; divided_by = [] };
             origin =
               [
@@ -1283,6 +1283,7 @@ let set_dim delayed_var_ref dim =
         :: !active_constraints
 
 let set_equal delayed_ref1 delayed_ref2 =
+  (* TODO: use provenance from the row variables once we have it there. *)
   match (delayed_ref1, delayed_ref2) with
   | { var_ref = { solved_dim = Some dim1; _ }; _ }, { var_ref = { solved_dim = Some dim2; _ }; _ }
     ->
@@ -1331,8 +1332,8 @@ let set_equal delayed_ref1 delayed_ref2 =
       active_constraints :=
         Row.Row_eq
           {
-            r1 = Row.get_row_for_var row_var1;
-            r2 = Row.get_row_for_var row_var2;
+            r1 = Row.get_row_for_var Row.empty_provenance row_var1;
+            r2 = Row.get_row_for_var Row.empty_provenance row_var2;
             origin =
               [
                 {
@@ -1351,7 +1352,7 @@ let set_equal delayed_ref1 delayed_ref2 =
       active_constraints :=
         Row.Rows_constr
           {
-            r = [ Row.get_row_for_var row_var ];
+            r = [ Row.get_row_for_var Row.empty_provenance row_var ];
             constr =
               Total_elems
                 {

Original file line number	Diff line number	Diff line change
`@@ -1267,7 +1267,7 @@ let set_dim delayed_var_ref dim =`
`1267`	`1267`	`{`
`1268`	`1268`	`(* TODO: actually, the Row.provenance should be the one of the shape that the row variable`
`1269`	`1269`	is in, should be stored in `Row and in env_row_var. *)
`1270`		`- r = [ Row.get_row_for_var row_var ];`
	`1270`	`+ r = [ Row.get_row_for_var Row.empty_provenance row_var ];`
`1271`	`1271`	`constr = Total_elems { numerator = Num_elems dim; divided_by = [] };`
`1272`	`1272`	`origin =`
`1273`	`1273`	`[`
`@@ -1283,6 +1283,7 @@ let set_dim delayed_var_ref dim =`
`1283`	`1283`	`:: !active_constraints`
`1284`	`1284`
`1285`	`1285`	`let set_equal delayed_ref1 delayed_ref2 =`
	`1286`	`+ (* TODO: use provenance from the row variables once we have it there. *)`
`1286`	`1287`	`match (delayed_ref1, delayed_ref2) with`
`1287`	`1288`	`\| { var_ref = { solved_dim = Some dim1; _ }; _ }, { var_ref = { solved_dim = Some dim2; _ }; _ }`
`1288`	`1289`	`->`
`@@ -1331,8 +1332,8 @@ let set_equal delayed_ref1 delayed_ref2 =`
`1331`	`1332`	`active_constraints :=`
`1332`	`1333`	`Row.Row_eq`
`1333`	`1334`	`{`
`1334`		`- r1 = Row.get_row_for_var row_var1;`
`1335`		`- r2 = Row.get_row_for_var row_var2;`
	`1335`	`+ r1 = Row.get_row_for_var Row.empty_provenance row_var1;`
	`1336`	`+ r2 = Row.get_row_for_var Row.empty_provenance row_var2;`
`1336`	`1337`	`origin =`
`1337`	`1338`	`[`
`1338`	`1339`	`{`
`@@ -1351,7 +1352,7 @@ let set_equal delayed_ref1 delayed_ref2 =`
`1351`	`1352`	`active_constraints :=`
`1352`	`1353`	`Row.Rows_constr`
`1353`	`1354`	`{`
`1354`		`- r = [ Row.get_row_for_var row_var ];`
	`1355`	`+ r = [ Row.get_row_for_var Row.empty_provenance row_var ];`
`1355`	`1356`	`constr =`
`1356`	`1357`	`Total_elems`
`1357`	`1358`	`{`