Formatting

lukstafi · lukstafi · commit 3ef87deea10b · 2025-09-20T11:17:36.000+02:00
diff --git a/.ocamlformat-ignore b/.ocamlformat-ignore
@@ -1 +1,2 @@
-test/ppx/test_ppx_op_expected.ml
+test/ppx/test_ppx_op_expected.ml
+test/ppx/test_ppx_name_conflict_expected.ml
diff --git a/lib/nn_blocks.ml b/lib/nn_blocks.ml
@@ -2,20 +2,19 @@
 
     This file contains basic building blocks for neural networks, with limited functionality. Feel
     free to copy-paste and modify as needed.
-      
+
     Design principles, OCANNL fundamentals, and common patterns:
-      - "Principle of least commitment": use row variables where axis count doesn't matter
-      - Einsum specs here often use single-char mode (no commas) but with spaces for readability
-      - Pooling uses constant kernels (0.5 + 0.5) to propagate window dimensions
-      - conv2d uses convolution syntax: "stride*out+kernel," (often in multi-char mode) 
-      - Input axes (before →) for kernels show intent (and end up rightmost for memory locality)
-      - Inline params { } are always learnable and are lifted to unit parameter ()
-      - Introduce inputs to a block after sub-block construction
-        (sub-blocks have no automatic lifting like there is for inline definitions of params)
-      - Always use literal strings with einsum operators when capturing variables
-      - Avoid unnecessary variable captures in einsum operators, be mindful they can shadow
-        other identifiers
-*)
+    - "Principle of least commitment": use row variables where axis count doesn't matter
+    - Einsum specs here often use single-char mode (no commas) but with spaces for readability
+    - Pooling uses constant kernels (0.5 + 0.5) to propagate window dimensions
+    - conv2d uses convolution syntax: "stride*out+kernel," (often in multi-char mode)
+    - Input axes (before →) for kernels show intent (and end up rightmost for memory locality)
+    - Inline params \{ \} are always learnable and are lifted to unit parameter ()
+    - Introduce inputs to a block after sub-block construction (sub-blocks have no automatic lifting
+      like there is for inline definitions of params)
+    - Always use literal strings with einsum operators when capturing variables
+    - Avoid unnecessary variable captures in einsum operators, be mindful they can shadow other
+      identifiers *)
 
 open! Base
 open Ocannl_tensor.Operation.DSL_modules
@@ -130,7 +129,7 @@ let transformer_encoder ~label ~num_layers ~num_heads ~d_k ~d_v ~d_ff ?(epsilon
   let layers =
     List.init num_layers ~f:(fun i ->
         transformer_encoder_block
-          ~label:(( "layer" ^ Int.to_string i) :: label)
+          ~label:(("layer" ^ Int.to_string i) :: label)
           ~num_heads ~d_k ~d_v ~d_ff ~epsilon ())
   in
   fun ~train_step x -> List.fold layers ~init:x ~f:(fun x layer -> layer ~train_step x)
@@ -139,7 +138,7 @@ let transformer_decoder ~label ~num_layers ~num_heads ~d_k ~d_v ~d_ff ?(epsilon
   let layers =
     List.init num_layers ~f:(fun i ->
         transformer_decoder_block
-          ~label:(( "layer" ^ Int.to_string i) :: label)
+          ~label:(("layer" ^ Int.to_string i) :: label)
           ~num_heads ~d_k ~d_v ~d_ff ~epsilon ())
   in
   fun ~train_step target ~enc_output ~mask ->
diff --git a/tensor/shape.ml b/tensor/shape.ml
@@ -1265,8 +1265,8 @@ let set_dim delayed_var_ref dim =
       active_constraints :=
         Row.Rows_constr
           {
-            (* 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. *)
+            (* 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.empty_provenance row_var ];
             constr = Total_elems { numerator = Num_elems dim; divided_by = [] };
             origin =

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-test/ppx/test_ppx_op_expected.ml`
	`1`	`+test/ppx/test_ppx_op_expected.ml`
	`2`	`+test/ppx/test_ppx_name_conflict_expected.ml`