2025-09-02 13:01.59: New job: test ahrefs/ocannl https://github.com/ahrefs/ocannl.git#refs/heads/master (cee3ab0be414c16e9055e091eae4e1924e5bd278) (linux-x86_64:(lint-fmt)) Base: ocaml/opam:debian-12-ocaml-4.08@sha256:1f8f583356b37c1cbcde061de13bfdb1a8963b80127e721c7ca17f4e884e669d ocamlformat version: version 0.27.0 (from opam) To reproduce locally: git clone --recursive "https://github.com/ahrefs/ocannl.git" -b "master" && cd "ocannl" && git reset --hard cee3ab0b cat > Dockerfile <<'END-OF-DOCKERFILE' FROM ocaml/opam:debian-12-ocaml-4.08@sha256:1f8f583356b37c1cbcde061de13bfdb1a8963b80127e721c7ca17f4e884e669d USER 1000:1000 RUN cd ~/opam-repository && (git cat-file -e b8021439f8c57ba6435bc2263f6596671f4f4466 || git fetch origin master) && git reset -q --hard b8021439f8c57ba6435bc2263f6596671f4f4466 && git log --no-decorate -n1 --oneline && opam update -u RUN opam depext -i dune WORKDIR /src RUN opam depext -i ocamlformat=0.27.0 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-09-02 13:01.59: Using cache hint "ahrefs/ocannl-ocaml/opam:debian-12-ocaml-4.08@sha256:1f8f583356b37c1cbcde061de13bfdb1a8963b80127e721c7ca17f4e884e669d-debian-12-4.08_opam-2.4-ocamlformat-b8021439f8c57ba6435bc2263f6596671f4f4466" 2025-09-02 13:01.59: Using OBuilder spec: ((from ocaml/opam:debian-12-ocaml-4.08@sha256:1f8f583356b37c1cbcde061de13bfdb1a8963b80127e721c7ca17f4e884e669d) (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 b8021439f8c57ba6435bc2263f6596671f4f4466 || git fetch origin master) && git reset -q --hard b8021439f8c57ba6435bc2263f6596671f4f4466 && 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.27.0")) (copy (src .) (dst /src/)) (run (shell "opam exec -- dune build @fmt --ignore-promoted-rules || (echo \"dune build @fmt failed\"; exit 2)")) ) 2025-09-02 13:01.59: Waiting for resource in pool OCluster 2025-09-02 13:01.59: Waiting for worker… 2025-09-02 13:02.00: Got resource from pool OCluster Building on doris.caelum.ci.dev All commits already cached HEAD is now at cee3ab0b Updated AGENTS.md, by GPT5-high (from ocaml/opam:debian-12-ocaml-4.08@sha256:1f8f583356b37c1cbcde061de13bfdb1a8963b80127e721c7ca17f4e884e669d) 2025-09-02 13:02.01 ---> using "b69d5f1106f8a1cfb35e904f37f2ccc38216aa61a22ee32dd7c324a91608cf44" 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 b8021439f8c57ba6435bc2263f6596671f4f4466 || git fetch origin master) && git reset -q --hard b8021439f8c57ba6435bc2263f6596671f4f4466 && git log --no-decorate -n1 --oneline && opam update -u")) b8021439f8 Merge pull request #28261 from kit-ty-kate/deploy-fix-25819 <><> 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-09-02 13:02.01 ---> using "1be76adbf83434462493f6d60d3a403af1e722bb13c1f26df1ed667dd3ad008c" 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.0 <><> Gathering sources ><><><><><><><><><><><><><><><><><><><><><><><><><><><><> [dune.3.20.0] found in cache <><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><> -> installed dune.3.20.0 Done. # Run eval $(opam env) to update the current shell environment 2025-09-02 13:02.01 ---> using "76384e7e1078506ef4c7e0c049f9a49f543e9fdc75f2cd2f57b1b769d15b1cc0" from cache /: (workdir /src) /src: (run (cache (opam-archives (target /home/opam/.opam/download-cache))) (network host) (shell "opam depext -i ocamlformat=0.27.0")) # 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 menhirLib 20240715 [required by ocamlformat-lib] - install menhirCST 20240715 [required by menhir] - install ocamlbuild 0.16.1 [required by fpath, astring, uuseg] - install cmdliner 1.3.0 [required by ocamlformat] - install menhirSdk 20240715 [required by ocamlformat-lib] - install either 1.0.0 [required by ocamlformat-lib] - install dune-build-info 3.20.0 [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 fix 20250428 [required by ocamlformat-lib] - install ocaml-version 4.0.1 [required by ocamlformat-lib] - install ocamlfind 1.9.8 [required by ocp-indent, astring, fpath, uuseg] - install menhir 20240715 [required by ocamlformat-lib] - install dune-configurator 3.20.0 [required by base] - install re 1.11.0 [required by ocamlformat] - install topkg 1.1.0 [required by fpath, astring, uuseg] - install base-bytes base [required by ocp-indent] - 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 ocp-indent 1.8.1 [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.27.0 [required by ocamlformat] - install ocamlformat 0.27.0 ===== 29 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.1.3.0] found in cache [csexp.1.5.2] found in cache [dune-build-info.3.20.0] found in cache [dune-configurator.3.20.0] found in cache [either.1.0.0] found in cache [fix.20250428] found in cache [fpath.0.7.3] found in cache [menhir.20240715] found in cache [menhirCST.20240715] found in cache [menhirLib.20240715] found in cache [menhirSdk.20240715] found in cache [ocaml-version.4.0.1] found in cache [ocamlbuild.0.16.1] found in cache [ocamlfind.1.9.8] found in cache [ocamlformat.0.27.0] found in cache [ocamlformat-lib.0.27.0] found in cache [ocp-indent.1.8.1] 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.0] 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 cmdliner.1.3.0 -> installed either.1.0.0 -> installed fix.20250428 -> installed menhirCST.20240715 -> installed menhirLib.20240715 -> installed menhirSdk.20240715 -> installed ocaml-version.4.0.1 -> installed re.1.11.0 -> installed sexplib0.v0.14.0 -> installed dune-build-info.3.20.0 -> installed dune-configurator.3.20.0 -> installed ocamlfind.1.9.8 -> installed base-bytes.base -> installed ocamlbuild.0.16.1 -> installed ocp-indent.1.8.1 -> installed base.v0.14.3 -> installed topkg.1.1.0 -> installed stdio.v0.14.0 -> installed uutf.1.0.4 -> installed astring.0.8.5 -> installed menhir.20240715 -> installed fpath.0.7.3 -> installed uucp.15.0.0 -> installed uuseg.15.0.0 -> installed ocamlformat-lib.0.27.0 -> installed ocamlformat.0.27.0 Done. <><> ocp-indent.1.8.1 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-09-02 13:02.01 ---> using "ee5f36fa10328bf844b6feeab861ac0336aa35be5e288d81331a0c9c26b8859a" from cache /src: (copy (src .) (dst /src/)) 2025-09-02 13:02.02 ---> saved as "1394829fe8c2fea9a5576501efd8a8f2932bef16976e89268f33b7572d8e1474" /src: (run (shell "opam exec -- dune build @fmt --ignore-promoted-rules || (echo \"dune build @fmt failed\"; exit 2)")) File "lib/row.mli", line 1, characters 0-0: diff --git a/_build/default/lib/row.mli b/_build/default/lib/.formatted/row.mli index 51461e8..3ed8ff8 100644 --- a/_build/default/lib/row.mli +++ b/_build/default/lib/.formatted/row.mli @@ -135,7 +135,6 @@ type stage = Stage1 | Stage2 | Stage3 | Stage4 | Stage5 | Stage6 | Stage7 val subst_row : environment -> t -> t val unify_row : stage:stage -> t * t -> environment -> constraint_ list * environment val empty_env : environment - val get_dim_from_env : environment -> dim_var -> int option val get_row_from_env : environment -> row_var -> t option File "test_record_syntax.pp.ml", line 1, characters 0-0: diff --git a/_build/default/test_record_syntax.pp.ml b/_build/default/.formatted/test_record_syntax.pp.ml index 64673ac..91e2cf2 100644 --- a/_build/default/test_record_syntax.pp.ml +++ b/_build/default/.formatted/test_record_syntax.pp.ml @@ -1,179 +1,198 @@ [@@@ocaml.ppx.context - { - tool_name = "ppx_driver"; - include_dirs = []; - hidden_include_dirs = []; - load_path = ([], []); - open_modules = []; - for_package = None; - debug = false; - use_threads = false; - use_vmthreads = false; - recursive_types = false; - principal = false; - transparent_modules = false; - unboxed_types = false; - unsafe_string = false; - cookies = [] - }] +{ + tool_name = "ppx_driver"; + include_dirs = []; + hidden_include_dirs = []; + load_path = ([], []); + open_modules = []; + for_package = None; + debug = false; + use_threads = false; + use_vmthreads = false; + recursive_types = false; + principal = false; + transparent_modules = false; + unboxed_types = false; + unsafe_string = false; + cookies = []; +}] + open Ocannl module Tensor = Tensor module TDSL = Operation.TDSL module NTDSL = Operation.NTDSL module PDSL = Operation.PDSL + let _test_op_uniform = let x = - (TDSL.param ?more_label:None ?value:None ?values:None - ?param_init:(Some (PDSL.uniform ())) "x") () in - let open! TDSL.O in x + (TDSL.param ?more_label:None ?value:None ?values:None ?param_init:(Some (PDSL.uniform ())) "x") + () + in + let open! TDSL.O in + x + let _test_op_float = - let y = - (TDSL.param ?more_label:None ?value:(Some 0.5) ?values:None - ?param_init:None "y") () in - let open! TDSL.O in y + let y = (TDSL.param ?more_label:None ?value:(Some 0.5) ?values:None ?param_init:None "y") () in + let open! TDSL.O in + y + let _test_op_int = let z = - (TDSL.param ?more_label:None ?value:(Some (Float.of_int 42)) ?values:None - ?param_init:None "z") () in - let open! TDSL.O in z + (TDSL.param ?more_label:None ?value:(Some (Float.of_int 42)) ?values:None ?param_init:None "z") + () + in + let open! TDSL.O in + z + let _test_op_list = let weights = - ((TDSL.param ?more_label:None ?value:None ?values:(Some [|0.1;0.2;0.3|]) - ?param_init:None "weights") ~input_dims:[] ~output_dims:[3]) () in - let open! TDSL.O in weights + ((TDSL.param ?more_label:None ?value:None + ?values:(Some [| 0.1; 0.2; 0.3 |]) + ?param_init:None "weights") + ~input_dims:[] ~output_dims:[ 3 ]) + () + in + let open! TDSL.O in + weights + let _test_op_nested = let biases = ((TDSL.param ?more_label:None ?value:None - ?values:(Some [|0.0;1.0;2.0;3.0|]) ?param_init:None "biases") - ~input_dims:[] ~output_dims:[2; 2]) () in - let open! TDSL.O in biases + ?values:(Some [| 0.0; 1.0; 2.0; 3.0 |]) + ?param_init:None "biases") + ~input_dims:[] ~output_dims:[ 2; 2 ]) + () + in + let open! TDSL.O in + biases + let _test_op_with_dims = let w = - ((TDSL.param ?more_label:None ?value:None ?values:None - ?param_init:(Some (PDSL.uniform ())) "w") ~input_dims:[2; 3] - ~output_dims:[4]) () in - let open! TDSL.O in w + ((TDSL.param ?more_label:None ?value:None ?values:None ?param_init:(Some (PDSL.uniform ())) "w") + ~input_dims:[ 2; 3 ] ~output_dims:[ 4 ]) + () + in + let open! TDSL.O in + w + let _test_op_shorthands = let v = - ((TDSL.param ?more_label:None ?value:None ?values:None - ?param_init:(Some (PDSL.uniform ())) "v") ~input_dims:[5] - ~output_dims:[6; 7]) () in - let open! TDSL.O in v + ((TDSL.param ?more_label:None ?value:None ?values:None ?param_init:(Some (PDSL.uniform ())) "v") + ~input_dims:[ 5 ] ~output_dims:[ 6; 7 ]) + () + in + let open! TDSL.O in + v + let _test_cd_computation () = - let temp = (NTDSL.term ~label:["temp"] ?fetch_op:None) () in + let temp = (NTDSL.term ~label:[ "temp" ] ?fetch_op:None) () in let result = let open! NTDSL.O in - let uncommented_comp = - let nondiff__for_rhs1 = NTDSL.O.(!.) 2.0 in - Ir.Assignments.sequence - [{ - Ir.Assignments.asgns = Ir.Assignments.Noop; - embedded_nodes = - (Base.Set.singleton (module Ir.Tnode) temp.Tensor.value) - }; - if Tensor.is_fwd_root nondiff__for_rhs1 - then - (Tensor.remove_fwd_root nondiff__for_rhs1; + let uncommented_comp = + let nondiff__for_rhs1 = NTDSL.O.( !. ) 2.0 in + Ir.Assignments.sequence + [ + { + Ir.Assignments.asgns = Ir.Assignments.Noop; + embedded_nodes = Base.Set.singleton (module Ir.Tnode) temp.Tensor.value; + }; + (if Tensor.is_fwd_root nondiff__for_rhs1 then ( + Tensor.remove_fwd_root nondiff__for_rhs1; nondiff__for_rhs1.Tensor.forward) - else - { - Ir.Assignments.asgns = Ir.Assignments.Noop; - embedded_nodes = (Base.Set.empty (module Ir.Tnode)) - }; + else + { + Ir.Assignments.asgns = Ir.Assignments.Noop; + embedded_nodes = Base.Set.empty (module Ir.Tnode); + }); { Ir.Assignments.asgns = - (Tensor.raw_unop ~initialize_neutral:false ~accum:Ir.Ops.Arg2 - ~t:temp ~lhs_is_grad:false ~op:Ir.Ops.Identity - ~t1:nondiff__for_rhs1 ~rhs_is_grad:false ~rhs_is_merge:false - ~logic:Shape.Pointwise_un); - embedded_nodes = (Base.Set.empty (module Ir.Tnode)) - }] in - { - Ir.Assignments.embedded_nodes = - (uncommented_comp.Ir.Assignments.embedded_nodes); - asgns = - (Ir.Assignments.Block_comment - ("result", (uncommented_comp.Ir.Assignments.asgns))) - } in + Tensor.raw_unop ~initialize_neutral:false ~accum:Ir.Ops.Arg2 ~t:temp + ~lhs_is_grad:false ~op:Ir.Ops.Identity ~t1:nondiff__for_rhs1 ~rhs_is_grad:false + ~rhs_is_merge:false ~logic:Shape.Pointwise_un; + embedded_nodes = Base.Set.empty (module Ir.Tnode); + }; + ] + in + { + Ir.Assignments.embedded_nodes = uncommented_comp.Ir.Assignments.embedded_nodes; + asgns = Ir.Assignments.Block_comment ("result", uncommented_comp.Ir.Assignments.asgns); + } + in result + let _test_cd_with_dims () = - let temp = - (NTDSL.term ~label:["temp"] ?fetch_op:None ~output_dims:[3; 4]) () in + let temp = (NTDSL.term ~label:[ "temp" ] ?fetch_op:None ~output_dims:[ 3; 4 ]) () in let result = let open! NTDSL.O in - let uncommented_comp = - let nondiff__for_rhs1 = NTDSL.O.(!.) 1.0 in - Ir.Assignments.sequence - [{ - Ir.Assignments.asgns = Ir.Assignments.Noop; - embedded_nodes = - (Base.Set.singleton (module Ir.Tnode) temp.Tensor.value) - }; - if Tensor.is_fwd_root nondiff__for_rhs1 - then - (Tensor.remove_fwd_root nondiff__for_rhs1; + let uncommented_comp = + let nondiff__for_rhs1 = NTDSL.O.( !. ) 1.0 in + Ir.Assignments.sequence + [ + { + Ir.Assignments.asgns = Ir.Assignments.Noop; + embedded_nodes = Base.Set.singleton (module Ir.Tnode) temp.Tensor.value; + }; + (if Tensor.is_fwd_root nondiff__for_rhs1 then ( + Tensor.remove_fwd_root nondiff__for_rhs1; nondiff__for_rhs1.Tensor.forward) - else - { - Ir.Assignments.asgns = Ir.Assignments.Noop; - embedded_nodes = (Base.Set.empty (module Ir.Tnode)) - }; + else + { + Ir.Assignments.asgns = Ir.Assignments.Noop; + embedded_nodes = Base.Set.empty (module Ir.Tnode); + }); { Ir.Assignments.asgns = - (Tensor.raw_unop ~initialize_neutral:false ~accum:Ir.Ops.Arg2 - ~t:temp ~lhs_is_grad:false ~op:Ir.Ops.Identity - ~t1:nondiff__for_rhs1 ~rhs_is_grad:false ~rhs_is_merge:false - ~logic:Shape.Pointwise_un); - embedded_nodes = (Base.Set.empty (module Ir.Tnode)) - }] in - { - Ir.Assignments.embedded_nodes = - (uncommented_comp.Ir.Assignments.embedded_nodes); - asgns = - (Ir.Assignments.Block_comment - ("result", (uncommented_comp.Ir.Assignments.asgns))) - } in + Tensor.raw_unop ~initialize_neutral:false ~accum:Ir.Ops.Arg2 ~t:temp + ~lhs_is_grad:false ~op:Ir.Ops.Identity ~t1:nondiff__for_rhs1 ~rhs_is_grad:false + ~rhs_is_merge:false ~logic:Shape.Pointwise_un; + embedded_nodes = Base.Set.empty (module Ir.Tnode); + }; + ] + in + { + Ir.Assignments.embedded_nodes = uncommented_comp.Ir.Assignments.embedded_nodes; + asgns = Ir.Assignments.Block_comment ("result", uncommented_comp.Ir.Assignments.asgns); + } + in result + let _test_cd_shorthands () = - let x = (NTDSL.term ~label:["x"] ?fetch_op:None ~output_dims:[10]) () in + let x = (NTDSL.term ~label:[ "x" ] ?fetch_op:None ~output_dims:[ 10 ]) () in let result = let open! NTDSL.O in - let uncommented_comp = - let nondiff__for_rhs1 = NTDSL.O.(!.) 3.0 in - Ir.Assignments.sequence - [{ - Ir.Assignments.asgns = Ir.Assignments.Noop; - embedded_nodes = - (Base.Set.singleton (module Ir.Tnode) x.Tensor.value) - }; - if Tensor.is_fwd_root nondiff__for_rhs1 - then - (Tensor.remove_fwd_root nondiff__for_rhs1; + let uncommented_comp = + let nondiff__for_rhs1 = NTDSL.O.( !. ) 3.0 in + Ir.Assignments.sequence + [ + { + Ir.Assignments.asgns = Ir.Assignments.Noop; + embedded_nodes = Base.Set.singleton (module Ir.Tnode) x.Tensor.value; + }; + (if Tensor.is_fwd_root nondiff__for_rhs1 then ( + Tensor.remove_fwd_root nondiff__for_rhs1; nondiff__for_rhs1.Tensor.forward) - else - { - Ir.Assignments.asgns = Ir.Assignments.Noop; - embedded_nodes = (Base.Set.empty (module Ir.Tnode)) - }; + else + { + Ir.Assignments.asgns = Ir.Assignments.Noop; + embedded_nodes = Base.Set.empty (module Ir.Tnode); + }); { Ir.Assignments.asgns = - (Tensor.raw_unop ~initialize_neutral:false ~accum:Ir.Ops.Arg2 - ~t:x ~lhs_is_grad:false ~op:Ir.Ops.Identity - ~t1:nondiff__for_rhs1 ~rhs_is_grad:false ~rhs_is_merge:false - ~logic:Shape.Pointwise_un); - embedded_nodes = (Base.Set.empty (module Ir.Tnode)) - }] in - { - Ir.Assignments.embedded_nodes = - (uncommented_comp.Ir.Assignments.embedded_nodes); - asgns = - (Ir.Assignments.Block_comment - ("result", (uncommented_comp.Ir.Assignments.asgns))) - } in + Tensor.raw_unop ~initialize_neutral:false ~accum:Ir.Ops.Arg2 ~t:x ~lhs_is_grad:false + ~op:Ir.Ops.Identity ~t1:nondiff__for_rhs1 ~rhs_is_grad:false ~rhs_is_merge:false + ~logic:Shape.Pointwise_un; + embedded_nodes = Base.Set.empty (module Ir.Tnode); + }; + ] + in + { + Ir.Assignments.embedded_nodes = uncommented_comp.Ir.Assignments.embedded_nodes; + asgns = Ir.Assignments.Block_comment ("result", uncommented_comp.Ir.Assignments.asgns); + } + in result + let () = Stdio.printf "Test compilation successful!\n"; - Stdio.printf - "Record syntax for both %%op and %%cd extensions works correctly.\n"; - Stdio.printf - "All initialization patterns and shorthand notation supported.\n" + Stdio.printf "Record syntax for both %%op and %%cd extensions works correctly.\n"; + Stdio.printf "All initialization patterns and shorthand notation supported.\n" File "test/operations/test_einsum_capture.ml", line 1, characters 0-0: diff --git a/_build/default/test/operations/test_einsum_capture.ml b/_build/default/test/operations/.formatted/test_einsum_capture.ml index 9772045..a6b8702 100644 --- a/_build/default/test/operations/test_einsum_capture.ml +++ b/_build/default/test/operations/.formatted/test_einsum_capture.ml @@ -37,14 +37,14 @@ let () = let%op x3 = { x3 = uniform1 (); o = [ 2; 3; 4 ] } in let%op y3 = { y3 = uniform1 (); o = [ 3; 4; 5 ] } in let%op z3 = x3 *+ "a..r..;..r..b=>ab" [ "r" ] y3 in - + (* Trigger shape inference *) let ctx = Train.forward_once (module Backend) ~ctx z3 in - + (* Check if row variable was captured *) Stdio.printf "Row variable r (product of dims): %s\n" (match r.solved_dim with Some d -> Int.to_string d | None -> "not resolved"); - + let%op dim_calc = dim a + dim j + dim r in let _ctx = Train.forward_once (module Backend) ~ctx dim_calc in File "lib/shape.ml", line 1, characters 0-0: diff --git a/_build/default/lib/shape.ml b/_build/default/lib/.formatted/shape.ml index b54268c..11c454c 100644 --- a/_build/default/lib/shape.ml +++ b/_build/default/lib/.formatted/shape.ml @@ -591,16 +591,14 @@ let%debug4_sexp get_inequalities ({ shape = cur_sh; logic; id = _ } as _upd : up in (* Bind delayed_var_refs to the variables after they are created *) List.iter dim_refs ~f:(fun delayed_ref -> - let label = delayed_ref.var_ref.ref_label in - (* Check if it's in one of the environments *) - match Hashtbl.find dim_var_env label with - | Some var -> delayed_ref.var <- `Dim var - | None -> ( - match Hashtbl.find row_var_env label with - | Some var -> delayed_ref.var <- `Row var - | None -> () - ) - ); + let label = delayed_ref.var_ref.ref_label in + (* Check if it's in one of the environments *) + match Hashtbl.find dim_var_env label with + | Some var -> delayed_ref.var <- `Dim var + | None -> ( + match Hashtbl.find row_var_env label with + | Some var -> delayed_ref.var <- `Row var + | None -> ())); let proj_env = let combine ~key:_ _ _ = assert false in Map.merge_skewed ~combine proj_env_rhs proj_env_lhs @@ -655,16 +653,14 @@ let%debug4_sexp get_inequalities ({ shape = cur_sh; logic; id = _ } as _upd : up in (* Bind delayed_var_refs to the variables after they are created *) List.iter dim_refs ~f:(fun delayed_ref -> - let label = delayed_ref.var_ref.ref_label in - (* Check if it's in one of the environments *) - match Hashtbl.find dim_var_env label with - | Some var -> delayed_ref.var <- `Dim var - | None -> ( - match Hashtbl.find row_var_env label with - | Some var -> delayed_ref.var <- `Row var - | None -> () - ) - ); + let label = delayed_ref.var_ref.ref_label in + (* Check if it's in one of the environments *) + match Hashtbl.find dim_var_env label with + | Some var -> delayed_ref.var <- `Dim var + | None -> ( + match Hashtbl.find row_var_env label with + | Some var -> delayed_ref.var <- `Row var + | None -> ())); let proj_env = let combine ~key:_ _ _ = assert false in Map.merge_skewed ~combine proj_env_rhs1 @@ -727,42 +723,36 @@ let rec compute_row_product env (row : Row.t) : int = match row.dims with | [] -> 1 | dim :: rest -> - let dim_val = + let dim_val = match dim with | Row.Dim { d; _ } -> d | Row.Var v -> ( match Row.get_dim_from_env env v with | Some d -> d - | None -> 1 (* Variable not yet resolved *) - ) - | Row.Conv_input _ -> 1 (* TODO: handle convolution input dimensions *) + | None -> 1 (* Variable not yet resolved *)) + | Row.Conv_input _ -> 1 (* TODO: handle convolution input dimensions *) in dim_val * compute_row_product env { row with dims = rest } let update_delayed_var_refs env update_step = let update_var_ref_list var_refs = List.iter var_refs ~f:(fun delayed_ref -> - match delayed_ref.var with - | `Not_set_yet -> () (* Variable not bound yet, will be set later *) - | `Dim dim_var -> ( - match Row.get_dim_from_env env dim_var with - | Some d -> delayed_ref.var_ref.solved_dim <- Some d - | None -> () (* Not yet resolved *) - ) - | `Row row_var -> ( - match Row.get_row_from_env env row_var with - | Some row -> - let product = compute_row_product env row in - delayed_ref.var_ref.solved_dim <- Some product - | None -> () (* Not yet resolved *) - ) - ) + match delayed_ref.var with + | `Not_set_yet -> () (* Variable not bound yet, will be set later *) + | `Dim dim_var -> ( + match Row.get_dim_from_env env dim_var with + | Some d -> delayed_ref.var_ref.solved_dim <- Some d + | None -> () (* Not yet resolved *)) + | `Row row_var -> ( + match Row.get_row_from_env env row_var with + | Some row -> + let product = compute_row_product env row in + delayed_ref.var_ref.solved_dim <- Some product + | None -> () (* Not yet resolved *))) in match update_step.logic with - | Transpose (Permute (_, var_refs), _) -> - update_var_ref_list var_refs - | Broadcast (Einsum (_, var_refs), _, _) -> - update_var_ref_list var_refs + | Transpose (Permute (_, var_refs), _) -> update_var_ref_list var_refs + | Broadcast (Einsum (_, var_refs), _, _) -> update_var_ref_list var_refs | _ -> () let apply_env_step env update_step = File "lib/ppx_cd.ml", line 1, characters 0-0: diff --git a/_build/default/lib/ppx_cd.ml b/_build/default/lib/.formatted/ppx_cd.ml index 5bed599..b6ce0ec 100644 --- a/_build/default/lib/ppx_cd.ml +++ b/_build/default/lib/.formatted/ppx_cd.ml @@ -1008,8 +1008,8 @@ let translate ?ident_label (expr : expression) : result = | [%expr [%e? expr1] *+ [%e? { pexp_desc = Pexp_constant (Pconst_string (spec_str, _, _)); _ }] - ([%e? { pexp_desc = Pexp_constant (Pconst_string _); _ } as head] :: [%e? rest]) - [%e? expr2]] + ([%e? { pexp_desc = Pexp_constant (Pconst_string _); _ } as head] :: [%e? rest]) + [%e? expr2]] when String.contains spec_str '>' -> let capture_vbs, capture_dims_expr = collect_capture_labels ~loc head rest in let res1 = loop ~proj_in_scope expr1 in @@ -1020,7 +1020,9 @@ let translate ?ident_label (expr : expression) : result = vbs = reduce_vbss [ res1.vbs; res2.vbs; capture_vbs ]; typ = Tensor; slot; - expr = [%expr einsum ~capture_dims:[%e capture_dims_expr] [%e spec] [%e res1.expr] [%e res2.expr]]; + expr = + [%expr + einsum ~capture_dims:[%e capture_dims_expr] [%e spec] [%e res1.expr] [%e res2.expr]]; array_opt_of_code = None; } | [%expr [%e? expr1] ++ [%e? { pexp_desc = Pexp_constant (Pconst_string (spec_str, _, _)); _ }]] @@ -1031,7 +1033,7 @@ let translate ?ident_label (expr : expression) : result = | [%expr [%e? expr1] ++ [%e? { pexp_desc = Pexp_constant (Pconst_string (spec_str, _, _)); _ }] - ([%e? { pexp_desc = Pexp_constant (Pconst_string _); _ } as head] :: [%e? rest])] + ([%e? { pexp_desc = Pexp_constant (Pconst_string _); _ } as head] :: [%e? rest])] when String.contains spec_str '>' -> let capture_vbs, capture_dims_expr = collect_capture_labels ~loc head rest in let res1 = loop ~proj_in_scope expr1 in 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-09-02 13:02.03: Job failed: Failed: Build failed