2025-11-30 13:28.40: New job: test ahrefs/ocannl https://github.com/ahrefs/ocannl.git#refs/heads/master (bdc8695a84bed088ca0e071b412dda1a9740febe) (linux-x86_64:(lint-fmt)) Base: ocaml/opam:debian-13-ocaml-4.08@sha256:e3cc4e8fe5c00f48c72a719e3551b1d8a51c2862349a0f7507e8aa29fdf72321 ocamlformat version: version 0.28.1 (from opam) To reproduce locally: git clone --recursive "https://github.com/ahrefs/ocannl.git" -b "master" && cd "ocannl" && git reset --hard bdc8695a cat > Dockerfile <<'END-OF-DOCKERFILE' FROM ocaml/opam:debian-13-ocaml-4.08@sha256:e3cc4e8fe5c00f48c72a719e3551b1d8a51c2862349a0f7507e8aa29fdf72321 USER 1000:1000 RUN cd ~/opam-repository && (git cat-file -e 6c1b38620288b5bf349067f089a7b1fc91185d94 || git fetch origin master) && git reset -q --hard 6c1b38620288b5bf349067f089a7b1fc91185d94 && git log --no-decorate -n1 --oneline && opam update -u RUN opam depext -i dune WORKDIR /src RUN opam depext -i ocamlformat=0.28.1 COPY --chown=1000:1000 . /src/ RUN opam exec -- dune build @fmt --ignore-promoted-rules || (echo "dune build @fmt failed"; exit 2) END-OF-DOCKERFILE docker build . END-REPRO-BLOCK 2025-11-30 13:28.40: Using cache hint "ahrefs/ocannl-ocaml/opam:debian-13-ocaml-4.08@sha256:e3cc4e8fe5c00f48c72a719e3551b1d8a51c2862349a0f7507e8aa29fdf72321-debian-13-4.08_opam-2.4-ocamlformat-6c1b38620288b5bf349067f089a7b1fc91185d94" 2025-11-30 13:28.40: Using OBuilder spec: ((from ocaml/opam:debian-13-ocaml-4.08@sha256:e3cc4e8fe5c00f48c72a719e3551b1d8a51c2862349a0f7507e8aa29fdf72321) (user (uid 1000) (gid 1000)) (run (cache (opam-archives (target /home/opam/.opam/download-cache))) (network host) (shell "cd ~/opam-repository && (git cat-file -e 6c1b38620288b5bf349067f089a7b1fc91185d94 || git fetch origin master) && git reset -q --hard 6c1b38620288b5bf349067f089a7b1fc91185d94 && git log --no-decorate -n1 --oneline && opam update -u")) (run (cache (opam-archives (target /home/opam/.opam/download-cache))) (network host) (shell "opam depext -i dune")) (workdir /src) (run (cache (opam-archives (target /home/opam/.opam/download-cache))) (network host) (shell "opam depext -i ocamlformat=0.28.1")) (copy (src .) (dst /src/)) (run (shell "opam exec -- dune build @fmt --ignore-promoted-rules || (echo \"dune build @fmt failed\"; exit 2)")) ) 2025-11-30 13:28.40: Waiting for resource in pool OCluster 2025-11-30 13:28.40: Waiting for worker… 2025-11-30 13:28.40: Got resource from pool OCluster Building on bremusa.ocamllabs.io All commits already cached HEAD is now at bdc8695a Refactor Conv_spec to Affine_spec and clean up Shape module interface (from ocaml/opam:debian-13-ocaml-4.08@sha256:e3cc4e8fe5c00f48c72a719e3551b1d8a51c2862349a0f7507e8aa29fdf72321) 2025-11-30 13:28.42 ---> using "d458486dd7823c592e7ea9c88366c5f90e1939c3b51f3abbd6760272096f8a3e" from cache /: (user (uid 1000) (gid 1000)) /: (run (cache (opam-archives (target /home/opam/.opam/download-cache))) (network host) (shell "cd ~/opam-repository && (git cat-file -e 6c1b38620288b5bf349067f089a7b1fc91185d94 || git fetch origin master) && git reset -q --hard 6c1b38620288b5bf349067f089a7b1fc91185d94 && git log --no-decorate -n1 --oneline && opam update -u")) 6c1b386202 Merge pull request #28774 from Julow/release-ocamlformat-0.28.1 <><> Updating package repositories ><><><><><><><><><><><><><><><><><><><><><><> [default] Initialised default (at git+file:///home/opam/opam-repository): [INFO] opam 2.1 and 2.2 include many performance and security improvements over 2.0; please consider upgrading (https://opam.ocaml.org/doc/Install.html) Everything as up-to-date as possible (run with --verbose to show unavailable upgrades). However, you may "opam upgrade" these packages explicitly, which will ask permission to downgrade or uninstall the conflicting packages. Nothing to do. # Run eval $(opam env) to update the current shell environment 2025-11-30 13:28.42 ---> using "a7d3c7d9f6aff7dc059c465a33e7ef3fda4b4a1ee9c79bef8645b5cd4da72b96" from cache /: (run (cache (opam-archives (target /home/opam/.opam/download-cache))) (network host) (shell "opam depext -i dune")) # Detecting depexts using vars: arch=x86_64, os=linux, os-distribution=debian, os-family=debian # No extra OS packages requirements found. # All required OS packages found. # Now letting opam install the packages The following actions will be performed: - install dune 3.20.2 <><> Gathering sources ><><><><><><><><><><><><><><><><><><><><><><><><><><><><> [dune.3.20.2] found in cache <><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><> -> installed dune.3.20.2 Done. # Run eval $(opam env) to update the current shell environment 2025-11-30 13:28.42 ---> using "b8799a0f87a66bd49a9341889a0027044c03db80ad17a5edb3adaf72f166d8fd" from cache /: (workdir /src) /src: (run (cache (opam-archives (target /home/opam/.opam/download-cache))) (network host) (shell "opam depext -i ocamlformat=0.28.1")) # Detecting depexts using vars: arch=x86_64, os=linux, os-distribution=debian, os-family=debian # No extra OS packages requirements found. # All required OS packages found. # Now letting opam install the packages The following actions will be performed: - install sexplib0 v0.14.0 [required by base] - install ocamlbuild 0.16.1 [required by fpath, astring, uuseg] - install either 1.0.0 [required by ocamlformat-lib] - install menhirLib 20250912 [required by ocamlformat-lib] - install csexp 1.5.2 [required by ocamlformat] - install camlp-streams 5.0.1 [required by ocamlformat-lib] - install seq base [required by re] - install menhirSdk 20250912 [required by ocamlformat-lib] - install fix 20250919 [required by ocamlformat-lib] - install menhirCST 20250912 [required by menhir] - install ocamlfind 1.9.8 [required by ocp-indent, astring, fpath, uuseg] - install dune-build-info 3.20.2 [required by ocamlformat-lib] - install cmdliner 2.0.0 [required by ocamlformat] - install ocaml-version 4.0.3 [required by ocamlformat-lib] - install dune-configurator 3.20.2 [required by base] - install re 1.11.0 [required by ocamlformat] - install menhir 20250912 [required by ocamlformat-lib] - install topkg 1.1.1 [required by fpath, astring, uuseg] - install ocp-indent 1.9.0 [required by ocamlformat-lib] - install base v0.14.3 [required by ocamlformat-lib] - install uutf 1.0.4 [required by ocamlformat-lib] - install astring 0.8.5 [required by ocamlformat-lib] - install stdio v0.14.0 [required by ocamlformat-lib] - install uucp 15.0.0 [required by uuseg] - install fpath 0.7.3 [required by ocamlformat-lib] - install uuseg 15.0.0 [required by ocamlformat-lib] - install ocamlformat-lib 0.28.1 [required by ocamlformat] - install ocamlformat 0.28.1 ===== 28 to install ===== <><> Gathering sources ><><><><><><><><><><><><><><><><><><><><><><><><><><><><> [astring.0.8.5] found in cache [base.v0.14.3] found in cache [camlp-streams.5.0.1] found in cache [cmdliner.2.0.0] found in cache [csexp.1.5.2] found in cache [dune-build-info.3.20.2] found in cache [dune-configurator.3.20.2] found in cache [either.1.0.0] found in cache [fix.20250919] found in cache [fpath.0.7.3] found in cache [menhir.20250912] found in cache [menhirCST.20250912] found in cache [menhirLib.20250912] found in cache [menhirSdk.20250912] found in cache [ocaml-version.4.0.3] found in cache [ocamlbuild.0.16.1] found in cache [ocamlfind.1.9.8] found in cache [ocamlformat.0.28.1] found in cache [ocamlformat-lib.0.28.1] found in cache [ocp-indent.1.9.0] found in cache [re.1.11.0] found in cache [sexplib0.v0.14.0] found in cache [stdio.v0.14.0] found in cache [topkg.1.1.1] found in cache [uucp.15.0.0] found in cache [uuseg.15.0.0] found in cache [uutf.1.0.4] found in cache <><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><> -> installed seq.base -> installed camlp-streams.5.0.1 -> installed csexp.1.5.2 -> installed either.1.0.0 -> installed fix.20250919 -> installed cmdliner.2.0.0 -> installed menhirCST.20250912 -> installed menhirLib.20250912 -> installed menhirSdk.20250912 -> installed ocaml-version.4.0.3 -> installed re.1.11.0 -> installed sexplib0.v0.14.0 -> installed dune-build-info.3.20.2 -> installed dune-configurator.3.20.2 -> installed ocamlfind.1.9.8 -> installed ocp-indent.1.9.0 -> installed ocamlbuild.0.16.1 -> installed base.v0.14.3 -> installed topkg.1.1.1 -> installed stdio.v0.14.0 -> installed uutf.1.0.4 -> installed astring.0.8.5 -> installed fpath.0.7.3 -> installed menhir.20250912 -> installed uucp.15.0.0 -> installed uuseg.15.0.0 -> installed ocamlformat-lib.0.28.1 -> installed ocamlformat.0.28.1 Done. <><> ocp-indent.1.9.0 installed successfully ><><><><><><><><><><><><><><><><><> => This package requires additional configuration for use in editors. Install package 'user-setup', or manually: * for Emacs, add these lines to ~/.emacs: (add-to-list 'load-path "/home/opam/.opam/4.08/share/emacs/site-lisp") (require 'ocp-indent) * for Vim, add this line to ~/.vimrc: set rtp^="/home/opam/.opam/4.08/share/ocp-indent/vim" # Run eval $(opam env) to update the current shell environment 2025-11-30 13:28.42 ---> using "7b71439e6ac9917292b28dc59ecc075d01d03dd2ef11c372809a6cf99e594a22" from cache /src: (copy (src .) (dst /src/)) 2025-11-30 13:28.42 ---> saved as "05cd041731e44fcd3a7182f17eb2c3f52ed2765e5b74b2e5f11ec9c91e319ece" /src: (run (shell "opam exec -- dune build @fmt --ignore-promoted-rules || (echo \"dune build @fmt failed\"; exit 2)")) Warning: Invalid documentation comment: File "tensor/einsum_types.ml", line 30, characters 0-0: End of text is not allowed in '[...]' (code). File "tensor/einsum_types.ml", line 1, characters 0-0: diff --git a/_build/default/tensor/einsum_types.ml b/_build/default/tensor/.formatted/einsum_types.ml index 855e02a..e12e537 100644 --- a/_build/default/tensor/einsum_types.ml +++ b/_build/default/tensor/.formatted/einsum_types.ml @@ -4,8 +4,8 @@ open Base -(** Convolution component for affine axis specifications. *) type conv_spec = { dilation : int; kernel_label : string } [@@deriving compare, sexp] +(** Convolution component for affine axis specifications. *) (** Specification for individual axes in the einsum notation. *) type axis_spec = @@ -17,8 +17,8 @@ type axis_spec = conv : conv_spec option; (** Optional convolution: dilation*kernel. *) stride_offset : int; (** Constant offset added after stride*over. *) } - (** Affine axis specification: stride*over + stride_offset [+ dilation*kernel]. - Corresponds to [Row.Affine] in shape inference. *) + (** Affine axis specification: stride*over + stride_offset [+ dilation*kernel]. Corresponds to + [Row.Affine] in shape inference. *) [@@deriving compare, sexp] (** An index pointing to any of a shape's axes, including the kind of the axis ([Batch, Input, File "tensor/row.mli", line 1, characters 0-0: diff --git a/_build/default/tensor/row.mli b/_build/default/tensor/.formatted/row.mli index b0e346d..0c26718 100644 --- a/_build/default/tensor/row.mli +++ b/_build/default/tensor/.formatted/row.mli @@ -36,8 +36,8 @@ and dim = | Dim of solved_dim | Affine of { stride : int; over : dim; conv : convolution option; stride_offset : int } (** An affine transformation of a dimension. When [conv] is [None], this is a simple strided - dimension. When [conv] is [Some], this includes convolution parameters. - Invariants: [stride > 0], [dilation > 0] (when present), [0 <= stride_offset < stride]. *) + dimension. When [conv] is [Some], this includes convolution parameters. Invariants: + [stride > 0], [dilation > 0] (when present), [0 <= stride_offset < stride]. *) [@@deriving equal, hash, compare, sexp] val get_dim : d:int -> ?label:string -> ?proj_id:int -> unit -> dim File "tensor/shape.mli", line 1, characters 0-0: diff --git a/_build/default/tensor/shape.mli b/_build/default/tensor/.formatted/shape.mli index 5226630..55a8977 100644 --- a/_build/default/tensor/shape.mli +++ b/_build/default/tensor/.formatted/shape.mli @@ -239,5 +239,5 @@ val to_labels : t -> string array (** Uses the matrix convention of putting the input axes last. *) val parse_n5_layout : string -> int array -(** Parse a N5_layout priority string (e.g., "0,1,2") into display indices. - Only supports integer labels (Fixed_index). *) +(** Parse a N5_layout priority string (e.g., "0,1,2") into display indices. Only supports integer + labels (Fixed_index). *) File "test/einsum/test_conv_syntax.ml", line 1, characters 0-0: diff --git a/_build/default/test/einsum/test_conv_syntax.ml b/_build/default/test/einsum/.formatted/test_conv_syntax.ml index 15e3fc9..0903d3a 100644 --- a/_build/default/test/einsum/test_conv_syntax.ml +++ b/_build/default/test/einsum/.formatted/test_conv_syntax.ml @@ -8,43 +8,50 @@ let test_conv_parsing () = let spec1 = "2*o+3*k" in let labels1 = Einsum_parser.axis_labels_of_spec spec1 in printf "Test 1: Parsed '%s' successfully\n%!" spec1; - printf " Structure: %s\n\n%!" (Sexp.to_string_hum (Einsum_parser.sexp_of_parsed_axis_labels labels1)); + printf " Structure: %s\n\n%!" + (Sexp.to_string_hum (Einsum_parser.sexp_of_parsed_axis_labels labels1)); (* Test 2: Simple conv expression without coefficients (multichar - requires commas) *) let spec2 = "o+k" in let labels2 = Einsum_parser.axis_labels_of_spec spec2 in printf "Test 2: Parsed '%s' successfully\n%!" spec2; - printf " Structure: %s\n\n%!" (Sexp.to_string_hum (Einsum_parser.sexp_of_parsed_axis_labels labels2)); + printf " Structure: %s\n\n%!" + (Sexp.to_string_hum (Einsum_parser.sexp_of_parsed_axis_labels labels2)); (* Test 3: Mixed spec with comma (multichar mode) *) let spec3 = "a, 2*b+c" in let labels3 = Einsum_parser.axis_labels_of_spec spec3 in printf "Test 3: Parsed '%s' successfully\n%!" spec3; - printf " Structure: %s\n\n%!" (Sexp.to_string_hum (Einsum_parser.sexp_of_parsed_axis_labels labels3)); + printf " Structure: %s\n\n%!" + (Sexp.to_string_hum (Einsum_parser.sexp_of_parsed_axis_labels labels3)); (* Test 4: Conv expression with multiple identifiers (multichar - requires commas) *) let spec4 = "i, o+k, j" in let labels4 = Einsum_parser.axis_labels_of_spec spec4 in printf "Test 4: Parsed '%s' successfully (multichar mode)\n%!" spec4; - printf " Structure: %s\n\n%!" (Sexp.to_string_hum (Einsum_parser.sexp_of_parsed_axis_labels labels4)); + printf " Structure: %s\n\n%!" + (Sexp.to_string_hum (Einsum_parser.sexp_of_parsed_axis_labels labels4)); (* Test 5: Conv expression with multi-char identifiers (multichar) *) let spec5 = "a+bc" in let labels5 = Einsum_parser.axis_labels_of_spec spec5 in printf "Test 5: Parsed '%s' successfully (multichar mode)\n%!" spec5; - printf " Structure: %s\n\n%!" (Sexp.to_string_hum (Einsum_parser.sexp_of_parsed_axis_labels labels5)); + printf " Structure: %s\n\n%!" + (Sexp.to_string_hum (Einsum_parser.sexp_of_parsed_axis_labels labels5)); (* Test 6: Test in einsum notation with multichar conv *) let spec6 = "i, j -> 2*i+j" in let labels6 = Einsum_parser.axis_labels_of_spec spec6 in printf "Test 6: Parsed '%s' successfully\n%!" spec6; - printf " Structure: %s\n\n%!" (Sexp.to_string_hum (Einsum_parser.sexp_of_parsed_axis_labels labels6)); + printf " Structure: %s\n\n%!" + (Sexp.to_string_hum (Einsum_parser.sexp_of_parsed_axis_labels labels6)); (* Test 7: Complex batch-input-output spec with conv *) let spec7 = "batch|input->3*output+1*kernel," in let labels7 = Einsum_parser.axis_labels_of_spec spec7 in printf "Test 7: Parsed '%s' successfully\n%!" spec7; - printf " Structure: %s\n\n%!" (Sexp.to_string_hum (Einsum_parser.sexp_of_parsed_axis_labels labels7)); + printf " Structure: %s\n\n%!" + (Sexp.to_string_hum (Einsum_parser.sexp_of_parsed_axis_labels labels7)); printf "All conv syntax parsing tests passed!\n%!" @@ -55,25 +62,29 @@ let test_strided_iteration_parsing () = let spec1 = "2*output" in let labels1 = Einsum_parser.axis_labels_of_spec spec1 in printf "Test 1: Parsed strided iteration '%s' successfully\n%!" spec1; - printf " Structure: %s\n\n%!" (Sexp.to_string_hum (Einsum_parser.sexp_of_parsed_axis_labels labels1)); + printf " Structure: %s\n\n%!" + (Sexp.to_string_hum (Einsum_parser.sexp_of_parsed_axis_labels labels1)); (* Test 2: Strided iteration with single-char identifier (multichar mode) *) let spec2 = "3*i" in let labels2 = Einsum_parser.axis_labels_of_spec spec2 in printf "Test 2: Parsed strided iteration '%s' successfully\n%!" spec2; - printf " Structure: %s\n\n%!" (Sexp.to_string_hum (Einsum_parser.sexp_of_parsed_axis_labels labels2)); + printf " Structure: %s\n\n%!" + (Sexp.to_string_hum (Einsum_parser.sexp_of_parsed_axis_labels labels2)); (* Test 3: Strided iteration in einsum context (multichar due to multiplication) *) let spec3 = "input -> 2*output" in let labels3 = Einsum_parser.axis_labels_of_spec spec3 in printf "Test 3: Parsed einsum with strided iteration '%s' successfully\n%!" spec3; - printf " Structure: %s\n\n%!" (Sexp.to_string_hum (Einsum_parser.sexp_of_parsed_axis_labels labels3)); + printf " Structure: %s\n\n%!" + (Sexp.to_string_hum (Einsum_parser.sexp_of_parsed_axis_labels labels3)); (* Test 4: Mixed regular labels and strided iteration (multichar due to comma) *) let spec4 = "regular, 3*strided" in let labels4 = Einsum_parser.axis_labels_of_spec spec4 in printf "Test 4: Parsed mixed labels with strided iteration '%s' successfully\n%!" spec4; - printf " Structure: %s\n\n%!" (Sexp.to_string_hum (Einsum_parser.sexp_of_parsed_axis_labels labels4)); + printf " Structure: %s\n\n%!" + (Sexp.to_string_hum (Einsum_parser.sexp_of_parsed_axis_labels labels4)); printf "\nAll strided iteration parsing tests completed!\n%!" File "tensor/row.ml", line 1, characters 0-0: diff --git a/_build/default/tensor/row.ml b/_build/default/tensor/.formatted/row.ml index 1424f7b..43cf019 100644 --- a/_build/default/tensor/row.ml +++ b/_build/default/tensor/.formatted/row.ml @@ -124,13 +124,13 @@ let rec dim_to_string style = function | Dim solved_dim -> solved_dim_to_string style solved_dim | Var { id; name = Some n } -> [%string "$%{id#Int}:%{n}"] | Var { id; name = None } -> "$" ^ Int.to_string id - | Affine { stride; over; conv; stride_offset } -> + | Affine { stride; over; conv; stride_offset } -> ( let over_str = dim_to_string style over in let stride_str = if stride = 1 then over_str else Int.to_string stride ^ "*" ^ over_str in let offset_str = if stride_offset = 0 then stride_str else [%string "%{stride_str}+%{stride_offset#Int}"] in - (match conv with + match conv with | None -> offset_str | Some { dilation; kernel; use_padding = _ } -> let kernel_str = dim_to_string style kernel in @@ -828,7 +828,9 @@ let%track5_sexp rec apply_dim_constraint ~(source : source) ~(stage : stage) (di let d_min = d_min - (dilation * d_k) in if d_min <= 0 then ([], Unconstrained_dim) else - let quotient = if d_min % stride = 0 then d_min / stride else (d_min / stride) + 1 in + let quotient = + if d_min % stride = 0 then d_min / stride else (d_min / stride) + 1 + in apply_dim_constraint ~source ~stage over (At_least_dim quotient) env | _ -> apply_dim_constraint ~source ~stage over (At_least_dim quotient) env) | Var v, _ -> ( @@ -1566,10 +1568,8 @@ let%debug5_sexp rec unify_dim ~stage origin (eq : dim * dim) env : constraint_ l ("solved dimensions for axis: different labels", [ Dim_mismatch [ dim1; dim2 ] ]) | Dim { d = d1; _ }, Dim { d = d2; _ } when d1 = d2 -> ([], env) | Var v1, Var v2 when equal_dim_var v1 v2 -> ([], env) - | ( Affine { stride = 1; over; conv = Some { use_padding = true; _ }; stride_offset = 0 }, - dim ) - | ( dim, - Affine { stride = 1; over; conv = Some { use_padding = true; _ }; stride_offset = 0 } ) -> + | Affine { stride = 1; over; conv = Some { use_padding = true; _ }; stride_offset = 0 }, dim + | dim, Affine { stride = 1; over; conv = Some { use_padding = true; _ }; stride_offset = 0 } -> unify_dim ~stage origin (over, dim) env | Affine { stride = 1; over; conv = None; stride_offset = 0 }, dim | dim, Affine { stride = 1; over; conv = None; stride_offset = 0 } -> @@ -1600,16 +1600,12 @@ let%debug5_sexp rec unify_dim ~stage origin (eq : dim * dim) env : constraint_ l }, if stride1 > stride2 then over2 else over1 ) env - | ( Affine { stride; over = Dim s; conv = None | Some { use_padding = true; _ }; _ }, - dim ) - | ( dim, - Affine { stride; over = Dim s; conv = None | Some { use_padding = true; _ }; _ } ) -> + | Affine { stride; over = Dim s; conv = None | Some { use_padding = true; _ }; _ }, dim + | dim, Affine { stride; over = Dim s; conv = None | Some { use_padding = true; _ }; _ } -> (* stride_offset doesn't contribute to shapes when conv = None or use_padding = true *) unify_dim ~stage origin (get_dim ~d:(stride * s.d) (), dim) env - | ( Affine { stride; over; conv = None | Some { use_padding = true; _ }; _ }, - Dim s ) - | ( Dim s, - Affine { stride; over; conv = None | Some { use_padding = true; _ }; _ } ) -> + | Affine { stride; over; conv = None | Some { use_padding = true; _ }; _ }, Dim s + | Dim s, Affine { stride; over; conv = None | Some { use_padding = true; _ }; _ } -> (* stride_offset doesn't contribute to shapes when conv = None or use_padding = true *) if s.d >= 0 && s.d % stride = 0 then unify_dim ~stage origin (get_dim ~d:(s.d / stride) (), over) env @@ -1622,19 +1618,17 @@ let%debug5_sexp rec unify_dim ~stage origin (eq : dim * dim) env : constraint_ l dim ) | ( dim, Affine - { stride; over = Dim s; conv = Some { dilation; kernel = Dim k; use_padding = false }; _ } - ) -> - (* stride_offset doesn't affect dimension - it just shifts which elements are accessed. - Max index at stride_offset=stride-1: (s-1)*stride + (stride-1) + (k-1)*dilation - So input dim = s * stride + (k-1) * dilation *) + { stride; over = Dim s; conv = Some { dilation; kernel = Dim k; use_padding = false }; _ } ) + -> + (* stride_offset doesn't affect dimension - it just shifts which elements are accessed. Max + index at stride_offset=stride-1: (s-1)*stride + (stride-1) + (k-1)*dilation So input dim = + s * stride + (k-1) * dilation *) unify_dim ~stage origin (get_dim ~d:((stride * s.d) + (dilation * (k.d - 1))) (), dim) env - | ( Affine { stride; over; conv = Some { dilation; kernel = Dim k; use_padding = false }; _ }, - Dim s ) - | ( Dim s, - Affine { stride; over; conv = Some { dilation; kernel = Dim k; use_padding = false }; _ } ) -> - (* Reverse: solve for over given input dim s. - s = stride * over + dilation * (k - 1) - over = (s - dilation * (k - 1)) / stride *) + | Affine { stride; over; conv = Some { dilation; kernel = Dim k; use_padding = false }; _ }, Dim s + | Dim s, Affine { stride; over; conv = Some { dilation; kernel = Dim k; use_padding = false }; _ } + -> + (* Reverse: solve for over given input dim s. s = stride * over + dilation * (k - 1) over = (s + - dilation * (k - 1)) / stride *) let kernel_extent = dilation * (k.d - 1) in let over_times_stride = s.d - kernel_extent in if over_times_stride >= 0 && over_times_stride % stride = 0 then @@ -1643,13 +1637,14 @@ let%debug5_sexp rec unify_dim ~stage origin (eq : dim * dim) env : constraint_ l raise @@ Shape_error ("solved dimensions for axis: incompatible stride", [ Dim_mismatch [ dim1; dim2 ] ]) - | ( Affine { stride; over = Dim s; conv = Some { dilation; kernel = Var v; use_padding = false }; _ }, + | ( Affine + { stride; over = Dim s; conv = Some { dilation; kernel = Var v; use_padding = false }; _ }, Dim i ) | ( Dim i, - Affine { stride; over = Dim s; conv = Some { dilation; kernel = Var v; use_padding = false }; _ } - ) -> - (* Infer kernel dimension from the amount of contraction. - i = s * stride + dilation * (k - 1) + Affine + { stride; over = Dim s; conv = Some { dilation; kernel = Var v; use_padding = false }; _ } ) + -> + (* Infer kernel dimension from the amount of contraction. i = s * stride + dilation * (k - 1) k = 1 + (i - s * stride) / dilation *) let kernel_extent = i.d - (stride * s.d) in if kernel_extent >= 0 && kernel_extent % dilation = 0 then @@ -1677,10 +1672,19 @@ let%debug5_sexp rec unify_dim ~stage origin (eq : dim * dim) env : constraint_ l @@ Shape_error ("solved dimensions for axis: unresolvable strides", [ Dim_mismatch [ dim1; dim2 ] ]) | ( Affine - { stride = s1; over = o1; conv = Some { dilation = d1; kernel = Dim k1; use_padding = false }; _ }, + { + stride = s1; + over = o1; + conv = Some { dilation = d1; kernel = Dim k1; use_padding = false }; + _; + }, Affine - { stride = s2; over = o2; conv = Some { dilation = d2; kernel = Dim k2; use_padding = false }; _ } - ) -> + { + stride = s2; + over = o2; + conv = Some { dilation = d2; kernel = Dim k2; use_padding = false }; + _; + } ) -> (* stride_offset doesn't affect dimension - kernel extent is dilation * (k - 1) *) let extent1 = d1 * (k1.d - 1) and extent2 = d2 * (k2.d - 1) in if s1 = s2 && extent1 = extent2 then unify_dim ~stage origin (o1, o2) env @@ -1721,12 +1725,22 @@ let%debug5_sexp rec unify_dim ~stage origin (eq : dim * dim) env : constraint_ l ("solved dimensions for axis: unresolvable strides", [ Dim_mismatch [ dim1; dim2 ] ]) | ( Affine { stride = s1; over = o1; conv = None | Some { use_padding = true; _ }; _ }, Affine - { stride = s2; over = o2; conv = Some { dilation = d2; kernel = Dim k2; use_padding = false }; _ } - ) + { + stride = s2; + over = o2; + conv = Some { dilation = d2; kernel = Dim k2; use_padding = false }; + _; + } ) | ( Affine - { stride = s2; over = o2; conv = Some { dilation = d2; kernel = Dim k2; use_padding = false }; _ }, + { + stride = s2; + over = o2; + conv = Some { dilation = d2; kernel = Dim k2; use_padding = false }; + _; + }, Affine { stride = s1; over = o1; conv = None | Some { use_padding = true; _ }; _ } ) -> - (* conv = None and use_padding = true have extent 0; use_padding = false has extent dilation * (k-1) *) + (* conv = None and use_padding = true have extent 0; use_padding = false has extent dilation * + (k-1) *) let extent1 = 0 and extent2 = d2 * (k2.d - 1) in if s1 = s2 && extent1 = extent2 then unify_dim ~stage origin (o1, o2) env else if s1 >= s2 && s1 % s2 = 0 then @@ -3468,8 +3482,7 @@ let%track4_sexp get_proj_equations (inequalities : constraint_ list) proj_axis_e [] ) | Affine { stride; over; conv = None; stride_offset } -> (* Strided iteration: no convolution *) - Conv_input - { stride; over = to_proj over; conv = None; stride_offset; target_id = None } + Conv_input { stride; over = to_proj over; conv = None; stride_offset; target_id = None } | Affine { stride; over; conv = Some { dilation; kernel; use_padding = _ }; stride_offset } -> let kernel_size = match subst_dim ~keep_affine:true env kernel with @@ -3557,7 +3570,9 @@ let%track4_sexp get_proj_equations (inequalities : constraint_ list) proj_axis_e constr = Total_elems { numerator = Strided_var { coeff; var; denom }; divided_by }; origin = _; } -> ( - let divided_by = List.map divided_by ~f:(fun v -> subst_dim ~keep_affine:true env (Var v)) in + let divided_by = + List.map divided_by ~f:(fun v -> subst_dim ~keep_affine:true env (Var v)) + in match collect_factors divided_by with | Some (known_product, residual_vars) -> assert (List.is_empty residual_vars); dune build @fmt failed "/usr/bin/env" "bash" "-c" "opam exec -- dune build @fmt --ignore-promoted-rules || (echo "dune build @fmt failed"; exit 2)" failed with exit status 2 2025-11-30 13:28.44: Job failed: Failed: Build failed