Skip to content

Commit d394ebe

Browse files
committed
Missing from previous commit
1 parent 35ef10d commit d394ebe

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

arrayjit/lib/indexing.ml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ type projections = {
139139
*)
140140
product_iterators : symbol array;
141141
(** The product space iterators (concatentation of the relevant batch, output, input axes) for
142-
iterating over the [product_space] axes, where same axes are at same array indices. *)
142+
iterating over the [product_space] axes, where same axes are at same array indices.
143+
These may be shared; lowering creates fresh symbols for loop indices. *)
143144
project_lhs : axis_index array;
144145
(** A projection that takes an [product_space]-bound index and produces an index into the
145146
result of an operation. *)

tensor/row.mli

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ and dim =
3636
| Dim of solved_dim
3737
| Affine of { stride : int; over : dim; conv : convolution option; stride_offset : int }
3838
(** An affine transformation of a dimension. When [conv] is [None], this is a simple strided
39-
dimension. When [conv] is [Some], this includes convolution parameters.
40-
Invariants: [stride > 0], [dilation > 0] (when present), [0 <= stride_offset < stride]. *)
39+
dimension. When [conv] is [Some], this includes convolution parameters. Invariants:
40+
[stride > 0], [dilation > 0] (when present), [0 <= stride_offset < stride]. *)
4141
[@@deriving equal, hash, compare, sexp]
4242

4343
val get_dim : d:int -> ?label:string -> ?proj_id:int -> unit -> dim
@@ -224,4 +224,5 @@ val get_product_proj : proj_env -> dim -> (proj_id * int) option
224224

225225
val proj_to_iterator_exn : proj_env -> proj_id -> Ir.Indexing.symbol
226226
(** [proj_to_iterator_exn proj_env p] returns the iterator for [p] in [proj_env]. Raises
227-
[Invalid_argument] if [p] is not an iterator. *)
227+
[Invalid_argument] if [p] is not an iterator. Note that symbols go through substitution when
228+
lowering, so these iterators are not the same as the ones in the generated code. *)
Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,11 @@
1-
TODO
1+
Retrieving commandline, environment, or config file variable ocannl_log_level
2+
Found 0, in the config file
3+
HERE: test/einsum/test_interleave.ml:14:21
4+
┌────────────────────────────────┐
5+
│[2]: interleave shape 0:6 │
6+
│┌┬─────────────────────────────┐│
7+
│││axis 0 ││
8+
│├┼─────────────────────────────┤│
9+
│││ 1.00 4.00 ... 3.00 6.00 ││
10+
│└┴─────────────────────────────┘│
11+
└────────────────────────────────┘

0 commit comments

Comments
 (0)