2025-05-22 12:20.03: New job: test ahrefs/ocannl https://github.com/ahrefs/ocannl.git#refs/heads/master (9afb61d245b2724d2132450805c8b080ac7e0c9a) (linux-x86_64:(lint-fmt)) Base: ocaml/opam:debian-12-ocaml-4.08@sha256:48fa4a7216c3973bb95572cf5dca98cbbcefe90f288f552e7ac70a8ccd438aa7 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 9afb61d2 cat > Dockerfile <<'END-OF-DOCKERFILE' FROM ocaml/opam:debian-12-ocaml-4.08@sha256:48fa4a7216c3973bb95572cf5dca98cbbcefe90f288f552e7ac70a8ccd438aa7 USER 1000:1000 RUN cd ~/opam-repository && (git cat-file -e 35eb2f107a989a2d623b0bbe170696398fcb9b1e || git fetch origin master) && git reset -q --hard 35eb2f107a989a2d623b0bbe170696398fcb9b1e && 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-05-22 12:20.03: Using cache hint "ahrefs/ocannl-ocaml/opam:debian-12-ocaml-4.08@sha256:48fa4a7216c3973bb95572cf5dca98cbbcefe90f288f552e7ac70a8ccd438aa7-debian-12-4.08_opam-2.3-ocamlformat-35eb2f107a989a2d623b0bbe170696398fcb9b1e" 2025-05-22 12:20.03: Using OBuilder spec: ((from ocaml/opam:debian-12-ocaml-4.08@sha256:48fa4a7216c3973bb95572cf5dca98cbbcefe90f288f552e7ac70a8ccd438aa7) (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 35eb2f107a989a2d623b0bbe170696398fcb9b1e || git fetch origin master) && git reset -q --hard 35eb2f107a989a2d623b0bbe170696398fcb9b1e && 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-05-22 12:20.03: Waiting for resource in pool OCluster 2025-05-22 12:20.03: Waiting for worker… 2025-05-22 12:20.04: Got resource from pool OCluster Building on asteria.caelum.ci.dev All commits already cached HEAD is now at 9afb61d2 In progress / broken: Format -> PPrint migration first pass by Claude (from ocaml/opam:debian-12-ocaml-4.08@sha256:48fa4a7216c3973bb95572cf5dca98cbbcefe90f288f552e7ac70a8ccd438aa7) 2025-05-22 12:20.05 ---> using "d1b97f3f32fc7cff4791d73e3fff398d19cc5b0541c709028ff05a921e22d2c8" 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 35eb2f107a989a2d623b0bbe170696398fcb9b1e || git fetch origin master) && git reset -q --hard 35eb2f107a989a2d623b0bbe170696398fcb9b1e && git log --no-decorate -n1 --oneline && opam update -u")) 35eb2f107a Merge pull request #27838 from maiste/release-dune-3.18.2 <><> 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-05-22 12:20.05 ---> using "0ed37ff9180ea5331ab17e3106ce3fc10bf21b69021c66107f159798cee036fc" 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.18.2 <><> Gathering sources ><><><><><><><><><><><><><><><><><><><><><><><><><><><><> [dune.3.18.2] found in cache <><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><> -> installed dune.3.18.2 Done. # Run eval $(opam env) to update the current shell environment 2025-05-22 12:20.05 ---> using "dc3dc92082cbd6b1d2902dc06db6b555f449a0b1c6f054b5888f3ddab10a5d9e" 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 dune-build-info 3.18.2 [required by ocamlformat-lib] - install cmdliner 1.3.0 [required by ocamlformat] - install menhirLib 20240715 [required by ocamlformat-lib] - install menhirCST 20240715 [required by menhir] - install ocamlbuild 0.16.1 [required by fpath, astring, uuseg] - install menhirSdk 20240715 [required by ocamlformat-lib] - install either 1.0.0 [required by ocamlformat-lib] - install ocaml-version 4.0.0 [required by ocamlformat-lib] - install camlp-streams 5.0.1 [required by ocamlformat-lib] - install csexp 1.5.2 [required by ocamlformat] - install seq base [required by re] - install fix 20250428 [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.18.2 [required by base] - install re 1.11.0 [required by ocamlformat] - install topkg 1.0.8 [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.18.2] found in cache [dune-configurator.3.18.2] 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.0] 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.0.8] 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.0 -> installed re.1.11.0 -> installed sexplib0.v0.14.0 -> installed dune-build-info.3.18.2 -> installed dune-configurator.3.18.2 -> 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.0.8 -> installed stdio.v0.14.0 -> installed uutf.1.0.4 -> installed astring.0.8.5 -> installed fpath.0.7.3 -> installed menhir.20240715 -> 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-05-22 12:20.05 ---> using "5e3a5282f655843df8e02a2497598f2918acc59345107286c51ff04d386b492b" from cache /src: (copy (src .) (dst /src/)) 2025-05-22 12:20.05 ---> saved as "a3a44c0125982661ae21f8be878fa0629468241cb9c31933a5b4ee95da852d2a" /src: (run (shell "opam exec -- dune build @fmt --ignore-promoted-rules || (echo \"dune build @fmt failed\"; exit 2)")) File "arrayjit/bin/dune", line 6, characters 21-34: 6 | (pps ppx_minidebug ppx_sexp_conv)) ^^^^^^^^^^^^^ Error: Library "ppx_sexp_conv" not found. -> required by _build/default/arrayjit/bin/read_config.exe -> required by %{dep:../../arrayjit/bin/read_config.exe} at test/dune:25 -> required by _build/default/test/config/ocannl_backend.txt -> required by %{read:config/ocannl_backend.txt} at test/dune:44 -> required by Computing directory contents of _build/default/test File "arrayjit/bin/dune", line 6, characters 7-20: 6 | (pps ppx_minidebug ppx_sexp_conv)) ^^^^^^^^^^^^^ Error: Library "ppx_minidebug" not found. -> required by _build/default/arrayjit/bin/.merlin-conf/exe-read_config -> required by _build/default/arrayjit/bin/read_config.exe -> required by %{dep:../../arrayjit/bin/read_config.exe} at test/dune:25 -> required by _build/default/test/config/ocannl_backend.txt -> required by %{read:config/ocannl_backend.txt} at test/dune:44 -> required by Computing directory contents of _build/default/test File "arrayjit/bin/dune", line 1, characters 0-0: diff --git a/_build/default/arrayjit/bin/dune b/_build/default/arrayjit/bin/.formatted/dune index c96c606..a066be4 100644 --- a/_build/default/arrayjit/bin/dune +++ b/_build/default/arrayjit/bin/.formatted/dune @@ -4,4 +4,4 @@ (libraries utils) (preprocess (pps ppx_minidebug ppx_sexp_conv)) - (modes exe)) \ No newline at end of file + (modes exe)) File "arrayjit/bin/read_config.ml", line 1, characters 0-0: diff --git a/_build/default/arrayjit/bin/read_config.ml b/_build/default/arrayjit/bin/.formatted/read_config.ml index 7e0ed33..a0e7afe 100644 --- a/_build/default/arrayjit/bin/read_config.ml +++ b/_build/default/arrayjit/bin/.formatted/read_config.ml @@ -2,22 +2,18 @@ open Base open Stdio let extract_config arg = - let prefixes = ["--read="; "--read-"; "--read_"] in + let prefixes = [ "--read="; "--read-"; "--read_" ] in List.find_map prefixes ~f:(fun prefix -> - Option.map (String.chop_prefix arg ~prefix) ~f:(fun config -> config)) + Option.map (String.chop_prefix arg ~prefix) ~f:(fun config -> config)) let () = - let config_opt = - Array.find_map Stdlib.Sys.argv ~f:extract_config - in + let config_opt = Array.find_map Stdlib.Sys.argv ~f:extract_config in match config_opt with - | Some config -> + | Some config -> ( let value = Utils.get_global_arg ~default:"" ~arg_name:config in let filename = "ocannl_" ^ config ^ ".txt" in - (try - Out_channel.write_all filename ~data:value; - printf "Wrote value of '%s' to %s\n" config filename - with exn -> - eprintf "Error writing to %s: %s\n" filename (Exn.to_string exn)) - | None -> - printf "No --read=<config>, --read-<config>, or --read_<config> argument found.\n" + try + Out_channel.write_all filename ~data:value; + printf "Wrote value of '%s' to %s\n" config filename + with exn -> eprintf "Error writing to %s: %s\n" filename (Exn.to_string exn)) + | None -> printf "No --read=<config>, --read-<config>, or --read_<config> argument found.\n" File "arrayjit/lib/low_level.mli", line 1, characters 0-0: diff --git a/_build/default/arrayjit/lib/low_level.mli b/_build/default/arrayjit/lib/.formatted/low_level.mli index c649b1a..e94fff3 100644 --- a/_build/default/arrayjit/lib/low_level.mli +++ b/_build/default/arrayjit/lib/.formatted/low_level.mli @@ -110,10 +110,7 @@ val input_and_output_nodes : optimized -> (Set.M(Tnode).t * Set.M(Tnode).t) * Tn val code_hum_margin : int ref val function_header_doc : - ?name:string -> - ?static_indices:Indexing.static_symbol list -> - unit -> - PPrint.document + ?name:string -> ?static_indices:Indexing.static_symbol list -> unit -> PPrint.document val get_ident_within_code : ?no_dots:bool -> ?blacklist:string list -> t array -> Tnode.t -> string @@ -136,9 +133,5 @@ val fprint_hum : (** Adheres more to the %cd syntax, does not output implicit type casts. *) val doc_hum : - ?name:string -> - ?static_indices:Indexing.static_symbol list -> - unit -> - t -> - PPrint.document + ?name:string -> ?static_indices:Indexing.static_symbol list -> unit -> t -> PPrint.document (** Returns a PPrint document for the given low-level code. Adheres to the %cd syntax. *) File "arrayjit/lib/lowered_backend_missing.ml", line 1, characters 0-0: diff --git a/_build/default/arrayjit/lib/lowered_backend_missing.ml b/_build/default/arrayjit/lib/.formatted/lowered_backend_missing.ml index cb9affa..a5b0e8c 100644 --- a/_build/default/arrayjit/lib/lowered_backend_missing.ml +++ b/_build/default/arrayjit/lib/.formatted/lowered_backend_missing.ml @@ -95,13 +95,15 @@ struct failwith @@ "Backend " ^ Config.name ^ " missing -- install the corresponding library" let static_properties = - Sexp.List [ - Sexp.Atom (Config.name ^ "_missing"); - Sexp.List [ - Sexp.Atom "error"; - Sexp.Atom ("Backend " ^ Config.name ^ " missing -- install the corresponding library") + Sexp.List + [ + Sexp.Atom (Config.name ^ "_missing"); + Sexp.List + [ + Sexp.Atom "error"; + Sexp.Atom ("Backend " ^ Config.name ^ " missing -- install the corresponding library"); + ]; ] - ] let get_debug_info _stream = failwith @@ "Backend " ^ Config.name ^ " missing -- install the corresponding library" File "arrayjit/lib/cc_backend.ml", line 1, characters 0-0: diff --git a/_build/default/arrayjit/lib/cc_backend.ml b/_build/default/arrayjit/lib/.formatted/cc_backend.ml index 7e1200b..16382fa 100644 --- a/_build/default/arrayjit/lib/cc_backend.ml +++ b/_build/default/arrayjit/lib/.formatted/cc_backend.ml @@ -89,6 +89,7 @@ let%diagn_sexp compile ~(name : string) bindings (lowered : Low_level.optimized) let use_host_memory = use_host_memory let procs = [| lowered |] + let full_printf_support = not @@ Bool.of_string @@ Utils.get_global_arg ~default:"false" ~arg_name:"prefer_backend_uniformity" File "bin/micrograd_demo_logging.ml", line 1, characters 0-0: diff --git a/_build/default/bin/micrograd_demo_logging.ml b/_build/default/bin/.formatted/micrograd_demo_logging.ml index ff983c1..bd11af4 100644 --- a/_build/default/bin/micrograd_demo_logging.ml +++ b/_build/default/bin/.formatted/micrograd_demo_logging.ml @@ -36,4 +36,4 @@ let () = Train.run step; Tensor.print ~with_code:false ~with_grad:false `Default g; Tensor.print ~with_code:false ~with_grad:true `Default a; - Tensor.print ~with_code:false ~with_grad:true `Default b \ No newline at end of file + Tensor.print ~with_code:false ~with_grad:true `Default b File "bin/micrograd_basic.ml", line 1, characters 0-0: diff --git a/_build/default/bin/micrograd_basic.ml b/_build/default/bin/.formatted/micrograd_basic.ml index 382f09a..66ad733 100644 --- a/_build/default/bin/micrograd_basic.ml +++ b/_build/default/bin/.formatted/micrograd_basic.ml @@ -8,7 +8,7 @@ module Rand = Ir.Rand.Lib let _get_local_debug_runtime = Utils.get_local_debug_runtime -let%diagn_sexp _suspended() = +let%diagn_sexp _suspended () = let module Backend = (val Backends.fresh_backend ~backend_name:"multicore_cc" ()) in let stream = Backend.(new_stream @@ get_device ~ordinal:0) in let ctx = Backend.make_context stream in @@ -33,7 +33,7 @@ let%diagn_sexp _suspended() = Tensor.print ~with_code:false ~with_grad:true `Default @@ a; Tensor.print ~with_code:false ~with_grad:true `Default @@ b -let%diagn_sexp () : unit = +let%diagn_sexp () : unit = let module Backend = (val Backends.fresh_backend ()) in let stream = Backend.(new_stream @@ get_device ~ordinal:0) in let ctx = Backend.make_context stream in File "arrayjit/lib/indexing.ml", line 1, characters 0-0: diff --git a/_build/default/arrayjit/lib/indexing.ml b/_build/default/arrayjit/lib/.formatted/indexing.ml index 566bb07..1c35dc1 100644 --- a/_build/default/arrayjit/lib/indexing.ml +++ b/_build/default/arrayjit/lib/.formatted/indexing.ml @@ -199,24 +199,18 @@ let derive_index ~product_syms ~(projection : axis_index array) = module Pp_helpers = struct open PPrint - + let pp_comma () = comma ^^ space let pp_symbol sym = string (symbol_ident sym) let pp_static_symbol { static_symbol; static_range } = match static_range with | None -> pp_symbol static_symbol - | Some range -> - infix 4 1 colon (pp_symbol static_symbol) - (brackets (string "0.." ^^ OCaml.int (range - 1))) - - let pp_axis_index = function - | Iterator sym -> pp_symbol sym - | Fixed_idx i -> OCaml.int i + | Some range -> + infix 4 1 colon (pp_symbol static_symbol) (brackets (string "0.." ^^ OCaml.int (range - 1))) - let pp_indices idcs = - separate (pp_comma ()) (Array.to_list idcs |> List.map ~f:pp_axis_index) - + let pp_axis_index = function Iterator sym -> pp_symbol sym | Fixed_idx i -> OCaml.int i + let pp_indices idcs = separate (pp_comma ()) (Array.to_list idcs |> List.map ~f:pp_axis_index) let print ppf doc = ToFormatter.pretty 1.0 80 ppf doc end @@ -238,5 +232,6 @@ module Doc_helpers = struct let pp_axis_index idx = match idx with Iterator sym -> pp_symbol sym | Fixed_idx i -> PPrint.OCaml.int i - let pp_indices idcs = PPrint.separate (pp_comma ()) (Array.to_list idcs |> List.map ~f:pp_axis_index) + let pp_indices idcs = + PPrint.separate (pp_comma ()) (Array.to_list idcs |> List.map ~f:pp_axis_index) end File "arrayjit/lib/schedulers.ml", line 1, characters 0-0: diff --git a/_build/default/arrayjit/lib/schedulers.ml b/_build/default/arrayjit/lib/.formatted/schedulers.ml index 556961e..e497391 100644 --- a/_build/default/arrayjit/lib/schedulers.ml +++ b/_build/default/arrayjit/lib/.formatted/schedulers.ml @@ -188,17 +188,21 @@ module Multicore (Backend : For_add_scheduler) : let suggested_num_streams _device = Domain.recommended_domain_count () - 2 let static_properties = - Sexp.List [ - Sexp.Atom "multicore_devices"; - Sexp.List [ - Sexp.Atom "device"; - Sexp.List [ - Sexp.List [Sexp.Atom "device_name"; Sexp.Atom "CPU"]; - Sexp.List [Sexp.Atom "device_ordinal"; [%sexp_of: int] 0]; - Sexp.List [Sexp.Atom "num_domains"; [%sexp_of: int] (Domain.recommended_domain_count ())]; - ] + Sexp.List + [ + Sexp.Atom "multicore_devices"; + Sexp.List + [ + Sexp.Atom "device"; + Sexp.List + [ + Sexp.List [ Sexp.Atom "device_name"; Sexp.Atom "CPU" ]; + Sexp.List [ Sexp.Atom "device_ordinal"; [%sexp_of: int] 0 ]; + Sexp.List + [ Sexp.Atom "num_domains"; [%sexp_of: int] (Domain.recommended_domain_count ()) ]; + ]; + ]; ] - ] let%track7_sexp cleanup_stream (stream : stream) : unit = (* Allow running in parallel. *) @@ -274,17 +278,20 @@ module Sync (Backend : For_add_scheduler) = struct let await _stream = () let static_properties = - Sexp.List [ - Sexp.Atom "sync_devices"; - Sexp.List [ - Sexp.Atom "device"; - Sexp.List [ - Sexp.List [Sexp.Atom "device_name"; Sexp.Atom "CPU"]; - Sexp.List [Sexp.Atom "device_ordinal"; Sexp.Atom "0"]; - Sexp.List [Sexp.Atom "threads"; Sexp.Atom "1"]; - ] + Sexp.List + [ + Sexp.Atom "sync_devices"; + Sexp.List + [ + Sexp.Atom "device"; + Sexp.List + [ + Sexp.List [ Sexp.Atom "device_name"; Sexp.Atom "CPU" ]; + Sexp.List [ Sexp.Atom "device_ordinal"; Sexp.Atom "0" ]; + Sexp.List [ Sexp.Atom "threads"; Sexp.Atom "1" ]; + ]; + ]; ] - ] (* let global_run_no = ref 0 *) let schedule_task _stream task = Ir.Task.run task File "bin/moons_benchmark.ml", line 1, characters 0-0: diff --git a/_build/default/bin/moons_benchmark.ml b/_build/default/bin/.formatted/moons_benchmark.ml index 0f55116..1bcb12e 100644 --- a/_build/default/bin/moons_benchmark.ml +++ b/_build/default/bin/.formatted/moons_benchmark.ml @@ -264,7 +264,8 @@ let _mem_benchmarks = ~f:(fun batch_size -> List.concat_map [ 0; (* 1; 2; *) 3 ] ~f:(fun inlining_cutoff -> List.concat_map [ (* 1; 3; *) 7 (* *) ] ~f:(fun seed -> - List.concat_map [ (* "gccjit" ; *) "multicore_cc"; "cuda" ] ~f:(fun backend_name -> + List.concat_map [ (* "gccjit" ; *) "multicore_cc"; "cuda" ] + ~f:(fun backend_name -> List.concat_map [ (* CDSL.double; *) CDSL.single; CDSL.half ] ~f:(fun value_prec -> [ File "arrayjit/lib/assignments.ml", line 1, characters 0-0: diff --git a/_build/default/arrayjit/lib/assignments.ml b/_build/default/arrayjit/lib/.formatted/assignments.ml index ad0860a..3a9359c 100644 --- a/_build/default/arrayjit/lib/assignments.ml +++ b/_build/default/arrayjit/lib/.formatted/assignments.ml @@ -282,7 +282,7 @@ let get_ident_within_code ?no_dots c = let fprint_hum ?name ?static_indices () ppf c = let ident = get_ident_within_code c in let buffer_ident = function Node tn -> ident tn | Merge_buffer tn -> ident tn ^ ".merge" in - + let open PPrint in let doc_of_fetch_op (op : fetch_op) = match op with @@ -298,83 +298,91 @@ let fprint_hum ?name ?static_indices () ppf c = | Embed_symbol { static_symbol; static_range = _ } -> string ("!@" ^ Indexing.symbol_ident static_symbol) in - + let rec doc_of_code = function | Noop -> empty - | Seq (c1, c2) -> - doc_of_code c1 ^^ doc_of_code c2 + | Seq (c1, c2) -> doc_of_code c1 ^^ doc_of_code c2 | Block_comment (s, Noop) -> string ("# \"" ^ s ^ "\";") ^^ break 1 - | Block_comment (s, c) -> - string ("# \"" ^ s ^ "\";") ^^ break 1 ^^ doc_of_code c + | Block_comment (s, c) -> string ("# \"" ^ s ^ "\";") ^^ break 1 ^^ doc_of_code c | Accum_ternop { initialize_neutral; accum; op; lhs; rhs1; rhs2; rhs3; projections } -> let proj_spec = if Lazy.is_val projections then (Lazy.force projections).debug_info.spec else "<not-in-yet>" in (* Uncurried syntax for ternary operations. *) - string (ident lhs) ^^ space ^^ - string (Ops.assign_op_cd_syntax ~initialize_neutral accum) ^^ space ^^ - string (Ops.ternop_cd_syntax op) ^^ - string "(" ^^ string (buffer_ident rhs1) ^^ string ", " ^^ - string (buffer_ident rhs2) ^^ string ", " ^^ - string (buffer_ident rhs3) ^^ string ")" ^^ - (if not (String.equal proj_spec ".") then - string (" ~logic:\"" ^ proj_spec ^ "\"") - else empty) ^^ - string ";" ^^ break 1 + string (ident lhs) + ^^ space + ^^ string (Ops.assign_op_cd_syntax ~initialize_neutral accum) + ^^ space + ^^ string (Ops.ternop_cd_syntax op) + ^^ string "(" + ^^ string (buffer_ident rhs1) + ^^ string ", " + ^^ string (buffer_ident rhs2) + ^^ string ", " + ^^ string (buffer_ident rhs3) + ^^ string ")" + ^^ (if not (String.equal proj_spec ".") then string (" ~logic:\"" ^ proj_spec ^ "\"") + else empty) + ^^ string ";" ^^ break 1 | Accum_binop { initialize_neutral; accum; op; lhs; rhs1; rhs2; projections } -> let proj_spec = if Lazy.is_val projections then (Lazy.force projections).debug_info.spec else "<not-in-yet>" in - string (ident lhs) ^^ space ^^ - string (Ops.assign_op_cd_syntax ~initialize_neutral accum) ^^ space ^^ - string (buffer_ident rhs1) ^^ space ^^ - string (Ops.binop_cd_syntax op) ^^ space ^^ - string (buffer_ident rhs2) ^^ - (if (not (String.equal proj_spec ".")) || - List.mem ~equal:Ops.equal_binop Ops.[ Mul; Div ] op - then string (" ~logic:\"" ^ proj_spec ^ "\"") - else empty) ^^ - string ";" ^^ break 1 + string (ident lhs) + ^^ space + ^^ string (Ops.assign_op_cd_syntax ~initialize_neutral accum) + ^^ space + ^^ string (buffer_ident rhs1) + ^^ space + ^^ string (Ops.binop_cd_syntax op) + ^^ space + ^^ string (buffer_ident rhs2) + ^^ (if + (not (String.equal proj_spec ".")) + || List.mem ~equal:Ops.equal_binop Ops.[ Mul; Div ] op + then string (" ~logic:\"" ^ proj_spec ^ "\"") + else empty) + ^^ string ";" ^^ break 1 | Accum_unop { initialize_neutral; accum; op; lhs; rhs; projections } -> let proj_spec = if Lazy.is_val projections then (Lazy.force projections).debug_info.spec else "<not-in-yet>" in - string (ident lhs) ^^ space ^^ - string (Ops.assign_op_cd_syntax ~initialize_neutral accum) ^^ space ^^ - (if not @@ Ops.equal_unop op Ops.Identity then - string (Ops.unop_cd_syntax op ^ " ") - else empty) ^^ - string (buffer_ident rhs) ^^ - (if not (String.equal proj_spec ".") then - string (" ~logic:\"" ^ proj_spec ^ "\"") - else empty) ^^ - string ";" ^^ break 1 + string (ident lhs) + ^^ space + ^^ string (Ops.assign_op_cd_syntax ~initialize_neutral accum) + ^^ space + ^^ (if not @@ Ops.equal_unop op Ops.Identity then string (Ops.unop_cd_syntax op ^ " ") + else empty) + ^^ string (buffer_ident rhs) + ^^ (if not (String.equal proj_spec ".") then string (" ~logic:\"" ^ proj_spec ^ "\"") + else empty) + ^^ string ";" ^^ break 1 | Fetch { array; fetch_op; dims = _ } -> string (ident array) ^^ string " := " ^^ doc_of_fetch_op fetch_op ^^ string ";" ^^ break 1 in - - (* Create the header document using Low_level.fprint_function_header which will be converted later *) - let header_doc = - match name, static_indices with - | Some n, Some si -> - string (n ^ " (") ^^ - separate (comma ^^ space) - (List.map si ~f:Indexing.Doc_helpers.pp_static_symbol) ^^ - string "):" ^^ space + + (* Create the header document using Low_level.fprint_function_header which will be converted + later *) + let header_doc = + match (name, static_indices) with + | Some n, Some si -> + string (n ^ " (") + ^^ separate (comma ^^ space) (List.map si ~f:Indexing.Doc_helpers.pp_static_symbol) + ^^ string "):" ^^ space | Some n, None -> string (n ^ ":") ^^ space | _ -> empty in - + let doc = header_doc ^^ nest 2 (doc_of_code c) in ToFormatter.pretty 1.0 80 ppf doc let doc_hum ?name ?static_indices () c = let ident = get_ident_within_code c in let buffer_ident = function Node tn -> ident tn | Merge_buffer tn -> ident tn ^ ".merge" in - + let open PPrint in let doc_of_fetch_op (op : fetch_op) = match op with @@ -390,84 +398,88 @@ let doc_hum ?name ?static_indices () c = | Embed_symbol { static_symbol; static_range = _ } -> string ("!@" ^ Indexing.symbol_ident static_symbol) in - + let rec doc_of_code = function | Noop -> empty - | Seq (c1, c2) -> - doc_of_code c1 ^^ doc_of_code c2 + | Seq (c1, c2) -> doc_of_code c1 ^^ doc_of_code c2 | Block_comment (s, Noop) -> string ("# \"" ^ s ^ "\";") ^^ break 1 - | Block_comment (s, c) -> - string ("# \"" ^ s ^ "\";") ^^ break 1 ^^ doc_of_code c + | Block_comment (s, c) -> string ("# \"" ^ s ^ "\";") ^^ break 1 ^^ doc_of_code c | Accum_ternop { initialize_neutral; accum; op; lhs; rhs1; rhs2; rhs3; projections } -> let proj_spec = if Lazy.is_val projections then (Lazy.force projections).debug_info.spec else "<not-in-yet>" in (* Uncurried syntax for ternary operations. *) - string (ident lhs) ^^ space ^^ - string (Ops.assign_op_cd_syntax ~initialize_neutral accum) ^^ space ^^ - string (Ops.ternop_cd_syntax op) ^^ - string "(" ^^ string (buffer_ident rhs1) ^^ string ", " ^^ - string (buffer_ident rhs2) ^^ string ", " ^^ - string (buffer_ident rhs3) ^^ string ")" ^^ - (if not (String.equal proj_spec ".") then - string (" ~logic:\"" ^ proj_spec ^ "\"") - else empty) ^^ - string ";" ^^ break 1 + string (ident lhs) + ^^ space + ^^ string (Ops.assign_op_cd_syntax ~initialize_neutral accum) + ^^ space + ^^ string (Ops.ternop_cd_syntax op) + ^^ string "(" + ^^ string (buffer_ident rhs1) + ^^ string ", " + ^^ string (buffer_ident rhs2) + ^^ string ", " + ^^ string (buffer_ident rhs3) + ^^ string ")" + ^^ (if not (String.equal proj_spec ".") then string (" ~logic:\"" ^ proj_spec ^ "\"") + else empty) + ^^ string ";" ^^ break 1 | Accum_binop { initialize_neutral; accum; op; lhs; rhs1; rhs2; projections } -> let proj_spec = if Lazy.is_val projections then (Lazy.force projections).debug_info.spec else "<not-in-yet>" in - string (ident lhs) ^^ space ^^ - string (Ops.assign_op_cd_syntax ~initialize_neutral accum) ^^ space ^^ - string (buffer_ident rhs1) ^^ space ^^ - string (Ops.binop_cd_syntax op) ^^ space ^^ - string (buffer_ident rhs2) ^^ - (if (not (String.equal proj_spec ".")) || - List.mem ~equal:Ops.equal_binop Ops.[ Mul; Div ] op - then string (" ~logic:\"" ^ proj_spec ^ "\"") - else empty) ^^ - string ";" ^^ break 1 + string (ident lhs) + ^^ space + ^^ string (Ops.assign_op_cd_syntax ~initialize_neutral accum) + ^^ space + ^^ string (buffer_ident rhs1) + ^^ space + ^^ string (Ops.binop_cd_syntax op) + ^^ space + ^^ string (buffer_ident rhs2) + ^^ (if + (not (String.equal proj_spec ".")) + || List.mem ~equal:Ops.equal_binop Ops.[ Mul; Div ] op + then string (" ~logic:\"" ^ proj_spec ^ "\"") + else empty) + ^^ string ";" ^^ break 1 | Accum_unop { initialize_neutral; accum; op; lhs; rhs; projections } -> let proj_spec = if Lazy.is_val projections then (Lazy.force projections).debug_info.spec else "<not-in-yet>" in - string (ident lhs) ^^ space ^^ - string (Ops.assign_op_cd_syntax ~initialize_neutral accum) ^^ space ^^ - (if not @@ Ops.equal_unop op Ops.Identity then - string (Ops.unop_cd_syntax op ^ " ") - else empty) ^^ - string (buffer_ident rhs) ^^ - (if not (String.equal proj_spec ".") then - string (" ~logic:\"" ^ proj_spec ^ "\"") - else empty) ^^ - string ";" ^^ break 1 + string (ident lhs) + ^^ space + ^^ string (Ops.assign_op_cd_syntax ~initialize_neutral accum) + ^^ space + ^^ (if not @@ Ops.equal_unop op Ops.Identity then string (Ops.unop_cd_syntax op ^ " ") + else empty) + ^^ string (buffer_ident rhs) + ^^ (if not (String.equal proj_spec ".") then string (" ~logic:\"" ^ proj_spec ^ "\"") + else empty) + ^^ string ";" ^^ break 1 | Fetch { array; fetch_op; dims = _ } -> string (ident array) ^^ string " := " ^^ doc_of_fetch_op fetch_op ^^ string ";" ^^ break 1 in - + (* Create the header document *) - let header_doc = - match name, static_indices with - | Some n, Some si -> - string (n ^ " (") ^^ - separate (comma ^^ space) - (List.map si ~f:Indexing.Doc_helpers.pp_static_symbol) ^^ - string "):" ^^ space + let header_doc = + match (name, static_indices) with + | Some n, Some si -> + string (n ^ " (") + ^^ separate (comma ^^ space) (List.map si ~f:Indexing.Doc_helpers.pp_static_symbol) + ^^ string "):" ^^ space | Some n, None -> string (n ^ ":") ^^ space | _ -> empty in - + header_doc ^^ nest 2 (doc_of_code c) let%track6_sexp lower ~unoptim_ll_source ~ll_source ~cd_source ~name static_indices (proc : t) : Low_level.optimized = let llc : Low_level.t = to_low_level proc in (* Generate the low-level code before outputting the assignments, to force projections. *) - (match cd_source with - | None -> () - | Some ppf -> - fprint_hum ~name ~static_indices () ppf proc); + (match cd_source with None -> () | Some ppf -> fprint_hum ~name ~static_indices () ppf proc); Low_level.optimize ~unoptim_ll_source ~ll_source ~name static_indices llc File "arrayjit/lib/cuda_backend.ml", line 1, characters 0-0: diff --git a/_build/default/arrayjit/lib/cuda_backend.ml b/_build/default/arrayjit/lib/.formatted/cuda_backend.ml index dc74b88..7f1247e 100644 --- a/_build/default/arrayjit/lib/cuda_backend.ml +++ b/_build/default/arrayjit/lib/.formatted/cuda_backend.ml @@ -287,8 +287,8 @@ end) : Ir.Backend_impl.Lowered_backend = struct | Void_prec -> "void" let binop_syntax prec v = - (* TODO: consider using binop_syntax inherited from Pure_C_config and overriding only - where different. *) + (* TODO: consider using binop_syntax inherited from Pure_C_config and overriding only where + different. *) let open PPrint in let f op_str v1 v2 = group @@ parens (v1 ^^ space ^^ string op_str ^^ space ^^ v2) in let func fn v1 v2 = group (string fn ^^ parens (separate comma [ v1; v2 ])) in File "arrayjit/lib/c_syntax.ml", line 1, characters 0-0: diff --git a/_build/default/arrayjit/lib/c_syntax.ml b/_build/default/arrayjit/lib/.formatted/c_syntax.ml index db4196f..f18f001 100644 --- a/_build/default/arrayjit/lib/c_syntax.ml +++ b/_build/default/arrayjit/lib/.formatted/c_syntax.ml @@ -355,8 +355,7 @@ module C_syntax (B : C_syntax_config) = struct B.pp_log_statement ~log_param_c_expr_doc:log_param_doc ~base_message_literal:base_message ~args_docs:[] else string "/* " ^^ string message ^^ string " */" - | Staged_compilation callback -> - callback () + | Staged_compilation callback -> callback () | Set_local ({ scope_id; tn = { prec; _ } }, value) -> let local_defs, value_doc = pp_float (Lazy.force prec) value in let assignment = File "lib/tensor.ml", line 1, characters 0-0: diff --git a/_build/default/lib/tensor.ml b/_build/default/lib/.formatted/tensor.ml index c560da1..84f295c 100644 --- a/_build/default/lib/tensor.ml +++ b/_build/default/lib/.formatted/tensor.ml @@ -630,110 +630,118 @@ let print ?(spy = false) ~with_grad ~with_code ?(with_low_level = false) (style let num_batch_axes = List.length sh.batch.dims in let num_input_axes = List.length sh.input.dims in let num_output_axes = List.length sh.output.dims in - + let open PPrint in let fmt = Stdlib.Format.get_std_formatter () in - + (* Create document for tensor value *) let value_doc = - if spy && not (Lazy.is_val t.value.array) then + if spy && not (Lazy.is_val t.value.array) then string prefix_str ^^ string " <not-in-yet>" ^^ space else match (style, Lazy.force t.value.array) with - | (_, None) -> string prefix_str ^^ string " <virtual>" ^^ space - | (`Inline, Some arr) -> + | _, None -> string prefix_str ^^ string " <virtual>" ^^ space + | `Inline, Some arr -> Tn.do_read t.value; - string prefix_str ^^ space ^^ - (let doc_fmt = PPrint.ToFormatter.pretty 0.9 80 in - doc_fmt fmt empty; (* Ensure buffer is clear *) - Nd.pp_array_inline fmt ~num_batch_axes ~num_input_axes ~num_output_axes ?axes_spec arr; - empty) - | (_, Some arr) -> + string prefix_str ^^ space + ^^ + let doc_fmt = PPrint.ToFormatter.pretty 0.9 80 in + doc_fmt fmt empty; + (* Ensure buffer is clear *) + Nd.pp_array_inline fmt ~num_batch_axes ~num_input_axes ~num_output_axes ?axes_spec arr; + empty + | _, Some arr -> Tn.do_read t.value; let doc_fmt = PPrint.ToFormatter.pretty 0.9 80 in - doc_fmt fmt empty; (* Ensure buffer is clear *) + doc_fmt fmt empty; + (* Ensure buffer is clear *) Nd.pp_array fmt ~prefix:prefix_str ~labels ~indices arr; string "\n" in - + (* Create document for gradient *) - let grad_doc = + let grad_doc = if with_grad then match t.diff with - | Some diff -> + | Some diff -> ( if spy && not (Lazy.is_val diff.grad.array) then string (grad_txt diff) ^^ string " <not-in-yet>" ^^ space else - (match Lazy.force diff.grad.array with + match Lazy.force diff.grad.array with | None -> string (grad_txt diff) ^^ string " <virtual>" ^^ space - | Some arr -> - (match style with - | `Inline -> - Tn.do_read diff.grad; - string (grad_txt diff) ^^ space ^^ - (let doc_fmt = PPrint.ToFormatter.pretty 0.9 80 in - doc_fmt fmt empty; (* Ensure buffer is clear *) - Nd.pp_array_inline fmt ~num_batch_axes ~num_input_axes ~num_output_axes ?axes_spec arr; - empty) ^^ string "\n" + | Some arr -> ( + match style with + | `Inline -> + Tn.do_read diff.grad; + string (grad_txt diff) + ^^ space + ^^ (let doc_fmt = PPrint.ToFormatter.pretty 0.9 80 in + doc_fmt fmt empty; + (* Ensure buffer is clear *) + Nd.pp_array_inline fmt ~num_batch_axes ~num_input_axes ~num_output_axes + ?axes_spec arr; + empty) + ^^ string "\n" | `Default | `N5_layout _ | `Label_layout _ -> - Tn.do_read diff.grad; - let prefix = prefix_str ^ " " ^ grad_txt diff in - let doc_fmt = PPrint.ToFormatter.pretty 0.9 80 in - doc_fmt fmt empty; (* Ensure buffer is clear *) - Nd.pp_array fmt ~prefix ~labels ~indices arr; - string "\n")) + Tn.do_read diff.grad; + let prefix = prefix_str ^ " " ^ grad_txt diff in + let doc_fmt = PPrint.ToFormatter.pretty 0.9 80 in + doc_fmt fmt empty; + (* Ensure buffer is clear *) + Nd.pp_array fmt ~prefix ~labels ~indices arr; + string "\n")) | None -> empty else empty in - + (* Create document for code *) let code_doc = if with_code then - let fwd_doc = + let fwd_doc = match t.forward.asgns with | Noop -> empty | fwd_code -> - string "@[<v 2>Current forward body:" ^^ hardline ^^ - Asgns.doc_hum () fwd_code ^^ - string "@]" ^^ hardline + string "@[<v 2>Current forward body:" + ^^ hardline ^^ Asgns.doc_hum () fwd_code ^^ string "@]" ^^ hardline in - let bwd_doc = + let bwd_doc = match t.diff with | Some { backprop = { asgns = Noop; _ }; _ } -> empty | Some { backprop = { asgns = bwd_code; _ }; _ } -> - string "@[<v 2>Current backprop body:" ^^ hardline ^^ - Asgns.doc_hum () bwd_code ^^ - string "@]" ^^ hardline + string "@[<v 2>Current backprop body:" + ^^ hardline ^^ Asgns.doc_hum () bwd_code ^^ string "@]" ^^ hardline | None -> empty in fwd_doc ^^ bwd_doc else empty in - + (* Create document for low-level code *) let low_level_doc = if with_low_level then - let fwd_doc = + let fwd_doc = match t.forward.asgns with | Noop -> empty | fwd_code -> - string "@[<v 2>Current forward low-level body:" ^^ hardline ^^ - Ir.Low_level.doc_hum () (Asgns.to_low_level fwd_code) ^^ - string "@]" ^^ hardline + string "@[<v 2>Current forward low-level body:" + ^^ hardline + ^^ Ir.Low_level.doc_hum () (Asgns.to_low_level fwd_code) + ^^ string "@]" ^^ hardline in - let bwd_doc = + let bwd_doc = match t.diff with | Some { backprop = { asgns = Noop; _ }; _ } -> empty | Some { backprop = { asgns = bwd_code; _ }; _ } -> - string "@[<v 2>Current backprop low-level body:" ^^ hardline ^^ - Ir.Low_level.doc_hum () (Asgns.to_low_level bwd_code) ^^ - string "@]" ^^ hardline + string "@[<v 2>Current backprop low-level body:" + ^^ hardline + ^^ Ir.Low_level.doc_hum () (Asgns.to_low_level bwd_code) + ^^ string "@]" ^^ hardline | None -> empty in fwd_doc ^^ bwd_doc else empty in - + (* Combine all documents and print *) let final_doc = value_doc ^^ grad_doc ^^ code_doc ^^ low_level_doc ^^ string "\n" in PPrint.ToFormatter.pretty 0.9 80 fmt final_doc File "arrayjit/lib/ndarray.ml", line 1, characters 0-0: diff --git a/_build/default/arrayjit/lib/ndarray.ml b/_build/default/arrayjit/lib/.formatted/ndarray.ml index 42f14a7..c9122bb 100644 --- a/_build/default/arrayjit/lib/ndarray.ml +++ b/_build/default/arrayjit/lib/.formatted/ndarray.ml @@ -597,11 +597,10 @@ let pp_array_inline fmt ~num_batch_axes ~num_output_axes ~num_input_axes ?axes_s let dims = dims arr in let num_all_axes = num_batch_axes + num_output_axes + num_input_axes in let open PPrint in - let doc = + let doc = let ind = Array.copy dims in - let spec_doc = match axes_spec with - | None -> empty - | Some spec -> dquotes (string spec) ^^ space + let spec_doc = + match axes_spec with None -> empty | Some spec -> dquotes (string spec) ^^ space in let rec loop axis = let sep = @@ -622,22 +621,20 @@ let pp_array_inline fmt ~num_batch_axes ~num_output_axes ~num_input_axes ?axes_s else string ")" in if axis = num_all_axes then - string (Printf.sprintf "%.*f" Utils.settings.print_decimals_precision (get_as_float arr ind)) + string + (Printf.sprintf "%.*f" Utils.settings.print_decimals_precision (get_as_float arr ind)) else - group ( - open_delim ^^ - nest 2 ( - break 1 ^^ - separate_map (break 1 ^^ sep ^^ space) - (fun i -> - ind.(axis) <- i; - loop (axis + 1) - ) - (List.init dims.(axis) ~f:(fun i -> i)) - ) ^^ - break 1 ^^ - close_delim - ) + group + (open_delim + ^^ nest 2 + (break 1 + ^^ separate_map + (break 1 ^^ sep ^^ space) + (fun i -> + ind.(axis) <- i; + loop (axis + 1)) + (List.init dims.(axis) ~f:(fun i -> i))) + ^^ break 1 ^^ close_delim) in spec_doc ^^ loop 0 in File "arrayjit/lib/utils.ml", line 1, characters 0-0: diff --git a/_build/default/arrayjit/lib/utils.ml b/_build/default/arrayjit/lib/.formatted/utils.ml index 0d79036..503367c 100644 --- a/_build/default/arrayjit/lib/utils.ml +++ b/_build/default/arrayjit/lib/.formatted/utils.ml @@ -804,22 +804,17 @@ let doc_of_sexp sexp = (* the leading space is to line up the lines *) string " \"" ^^ loop 0 empty ^^ string "\"" in - + let rec doc_of_sexp_indent indent = function | Atom str -> doc_maybe_esc_str str - | List (h :: t) -> - group ( - string "(" ^^ - nest indent (doc_of_sexp_indent indent h ^^ doc_of_sexp_rest indent t) - ) + | List (h :: t) -> + group (string "(" ^^ nest indent (doc_of_sexp_indent indent h ^^ doc_of_sexp_rest indent t)) | List [] -> string "()" - and doc_of_sexp_rest indent = function - | h :: t -> - space ^^ doc_of_sexp_indent indent h ^^ doc_of_sexp_rest indent t + | h :: t -> space ^^ doc_of_sexp_indent indent h ^^ doc_of_sexp_rest indent t | [] -> string ")" in - + doc_of_sexp_indent !default_indent sexp let get_debug_formatter ~fname = File "arrayjit/lib/low_level.ml", line 1, characters 0-0: diff --git a/_build/default/arrayjit/lib/low_level.ml b/_build/default/arrayjit/lib/.formatted/low_level.ml index 6e5f673..3b25a1e 100644 --- a/_build/default/arrayjit/lib/low_level.ml +++ b/_build/default/arrayjit/lib/.formatted/low_level.ml @@ -826,11 +826,10 @@ let function_header_doc ?name ?static_indices () = let open PPrint in match (name, static_indices) with | Some name, Some static_indices -> - !^name ^^ space ^^ - parens (separate comma_sep (List.map ~f:pp_static_symbol static_indices)) ^^ - colon ^^ space - | Some name, None -> - !^name ^^ colon ^^ space + !^name ^^ space + ^^ parens (separate comma_sep (List.map ~f:pp_static_symbol static_indices)) + ^^ colon ^^ space + | Some name, None -> !^name ^^ colon ^^ space | _ -> empty let get_ident_within_code ?no_dots ?(blacklist = []) llcs = @@ -897,53 +896,48 @@ let get_ident_within_code ?no_dots ?(blacklist = []) llcs = let fprint_cstyle ?name ?static_indices () ppf llc = let ident_label = get_ident_within_code [| llc |] in let open PPrint in - let doc_ident la = string (ident_label la) in let doc_local { tn; scope_id } = string ("v" ^ Int.to_string scope_id ^ "_") ^^ doc_ident tn in - + let rec doc_of_code c = match c with | Noop -> empty | Seq (c1, c2) -> - let docs = List.filter_map [c1; c2] ~f:(function - | Noop -> None - | c -> Some (doc_of_code c)) + let docs = + List.filter_map [ c1; c2 ] ~f:(function Noop -> None | c -> Some (doc_of_code c)) in separate hardline docs | For_loop { index = i; from_; to_; body; trace_it = _ } -> - let header = string "for " ^^ pp_symbol i ^^ string " = " ^^ - int from_ ^^ string " to " ^^ int to_ ^^ string " {" in + let header = + string "for " ^^ pp_symbol i ^^ string " = " ^^ int from_ ^^ string " to " ^^ int to_ + ^^ string " {" + in let body_doc = nest 2 (break 1 ^^ doc_of_code body) in group (header ^^ body_doc ^^ break 1 ^^ string "}") | Zero_out tn -> string "zero_out " ^^ doc_ident tn ^^ string ";" | Set p -> - p.debug <- ""; (* We don't use debug string in PPrint version *) + p.debug <- ""; + (* We don't use debug string in PPrint version *) let prec = Lazy.force p.tn.prec in - group ( - doc_ident p.tn ^^ - brackets (pp_indices p.idcs) ^^ - string " := " ^^ - doc_of_float prec p.llv ^^ - string ";" - ) + group + (doc_ident p.tn + ^^ brackets (pp_indices p.idcs) + ^^ string " := " ^^ doc_of_float prec p.llv ^^ string ";") | Comment message -> string ("/* " ^ message ^ " */") | Staged_compilation callback -> callback () | Set_local (id, llv) -> let prec = Lazy.force id.tn.prec in group (doc_local id ^^ string " := " ^^ doc_of_float prec llv ^^ string ";") - and doc_of_float prec value = match value with - | Local_scope { id; body; _ } -> - group ( - doc_local id ^^ string " {" ^^ - nest 2 (break 1 ^^ doc_of_code body) ^^ - break 1 ^^ string "}" - ) + | Local_scope { id; body; _ } -> + group + (doc_local id ^^ string " {" + ^^ nest 2 (break 1 ^^ doc_of_code body) + ^^ break 1 ^^ string "}") | Get_local id -> doc_local id | Get_global (Ops.C_function s, None) -> string (s ^ "()") - | Get_global (Ops.C_function s, Some idcs) -> - string s ^^ parens (pp_indices idcs) + | Get_global (Ops.C_function s, Some idcs) -> string s ^^ parens (pp_indices idcs) | Get_global (Ops.External_unsafe { ptr; prec; dims = _ }, None) -> string (Ops.ptr_to_string_hum ptr prec) | Get_global (Ops.External_unsafe { ptr; prec; dims = _ }, Some idcs) -> @@ -954,96 +948,73 @@ let fprint_cstyle ?name ?static_indices () ppf llc = | Get_global (Ops.Merge_buffer { source_node_id }, Some idcs) -> let tn = Option.value_exn ~here:[%here] @@ Tnode.find ~id:source_node_id in group (doc_ident tn ^^ string ".merge" ^^ brackets (pp_indices idcs)) - | Get (tn, idcs) -> - group (doc_ident tn ^^ brackets (pp_indices idcs)) + | Get (tn, idcs) -> group (doc_ident tn ^^ brackets (pp_indices idcs)) | Constant c -> string (Printf.sprintf "%.16g" c) | Embed_index idx -> pp_axis_index idx | Ternop (op, v1, v2, v3) -> let prefix, comma1, comma2, postfix = Ops.ternop_c_syntax prec op in - group ( - string prefix ^^ - doc_of_float prec v1 ^^ - string comma1 ^^ space ^^ - doc_of_float prec v2 ^^ - string comma2 ^^ space ^^ - doc_of_float prec v3 ^^ - string postfix - ) + group + (string prefix ^^ doc_of_float prec v1 ^^ string comma1 ^^ space ^^ doc_of_float prec v2 + ^^ string comma2 ^^ space ^^ doc_of_float prec v3 ^^ string postfix) | Binop (Arg1, v1, _v2) -> doc_of_float prec v1 | Binop (Arg2, _v1, v2) -> doc_of_float prec v2 | Binop (op, v1, v2) -> let prefix, infix, postfix = Ops.binop_c_syntax prec op in - group ( - string prefix ^^ - doc_of_float prec v1 ^^ - string infix ^^ space ^^ - doc_of_float prec v2 ^^ - string postfix - ) + group + (string prefix ^^ doc_of_float prec v1 ^^ string infix ^^ space ^^ doc_of_float prec v2 + ^^ string postfix) | Unop (Identity, v) -> doc_of_float prec v | Unop (op, v) -> let prefix, postfix = Ops.unop_c_syntax prec op in string prefix ^^ doc_of_float prec v ^^ string postfix in - - let doc = - hardline ^^ - nest 2 ( - function_header_doc ?name ?static_indices () ^^ - doc_of_code llc - ) - in - + + let doc = hardline ^^ nest 2 (function_header_doc ?name ?static_indices () ^^ doc_of_code llc) in + ToFormatter.pretty 1.0 !code_hum_margin ppf doc let fprint_hum ?name ?static_indices () ppf llc = let ident_label = get_ident_within_code [| llc |] in let open PPrint in - let doc_ident la = string (ident_label la) in let doc_local { tn; scope_id } = string ("v" ^ Int.to_string scope_id ^ "_") ^^ doc_ident tn in - + let rec doc_of_code c = match c with | Noop -> empty | Seq (c1, c2) -> - let docs = List.filter_map [c1; c2] ~f:(function - | Noop -> None - | c -> Some (doc_of_code c)) + let docs = + List.filter_map [ c1; c2 ] ~f:(function Noop -> None | c -> Some (doc_of_code c)) in separate hardline docs | For_loop { index = i; from_; to_; body; trace_it = _ } -> - let header = string "for " ^^ pp_symbol i ^^ string " = " ^^ - int from_ ^^ string " to " ^^ int to_ ^^ string " {" in + let header = + string "for " ^^ pp_symbol i ^^ string " = " ^^ int from_ ^^ string " to " ^^ int to_ + ^^ string " {" + in let body_doc = nest 2 (break 1 ^^ doc_of_code body) in group (header ^^ body_doc ^^ break 1 ^^ string "}") | Zero_out tn -> string "zero_out " ^^ doc_ident tn ^^ string ";" | Set p -> - p.debug <- ""; (* We don't use debug string in PPrint version *) - group ( - doc_ident p.tn ^^ - brackets (pp_indices p.idcs) ^^ - string " := " ^^ - doc_of_float p.llv ^^ - string ";" - ) + p.debug <- ""; + (* We don't use debug string in PPrint version *) + group + (doc_ident p.tn + ^^ brackets (pp_indices p.idcs) + ^^ string " := " ^^ doc_of_float p.llv ^^ string ";") | Comment message -> string ("/* " ^ message ^ " */") | Staged_compilation callback -> callback () - | Set_local (id, llv) -> - group (doc_local id ^^ string " := " ^^ doc_of_float llv ^^ string ";") - + | Set_local (id, llv) -> group (doc_local id ^^ string " := " ^^ doc_of_float llv ^^ string ";") and doc_of_float value = match value with - | Local_scope { id; body; _ } -> - group ( - doc_local id ^^ string " {" ^^ - nest 2 (break 1 ^^ doc_of_code body) ^^ - break 1 ^^ string "}" - ) + | Local_scope { id; body; _ } -> + group + (doc_local id ^^ string " {" + ^^ nest 2 (break 1 ^^ doc_of_code body) + ^^ break 1 ^^ string "}") | Get_local id -> doc_local id | Get_global (Ops.C_function s, None) -> string (s ^ "()") - | Get_global (Ops.C_function s, Some idcs) -> - string s ^^ parens (pp_indices idcs) + | Get_global (Ops.C_function s, Some idcs) -> string s ^^ parens (pp_indices idcs) | Get_global (Ops.External_unsafe { ptr; prec; dims = _ }, None) -> string (Ops.ptr_to_string_hum ptr prec) | Get_global (Ops.External_unsafe { ptr; prec; dims = _ }, Some idcs) -> @@ -1054,105 +1025,76 @@ let fprint_hum ?name ?static_indices () ppf llc = | Get_global (Ops.Merge_buffer { source_node_id }, Some idcs) -> let tn = Option.value_exn ~here:[%here] @@ Tnode.find ~id:source_node_id in group (doc_ident tn ^^ string ".merge" ^^ brackets (pp_indices idcs)) - | Get (tn, idcs) -> - group (doc_ident tn ^^ brackets (pp_indices idcs)) + | Get (tn, idcs) -> group (doc_ident tn ^^ brackets (pp_indices idcs)) | Constant c -> string (Printf.sprintf "%.16g" c) | Embed_index idx -> pp_axis_index idx | Ternop (op, v1, v2, v3) -> let prefix = Ops.ternop_cd_syntax op in - group ( - string prefix ^^ - parens ( - doc_of_float v1 ^^ string "," ^^ space ^^ - doc_of_float v2 ^^ string "," ^^ space ^^ - doc_of_float v3 - ) - ) + group + (string prefix + ^^ parens + (doc_of_float v1 ^^ string "," ^^ space ^^ doc_of_float v2 ^^ string "," ^^ space + ^^ doc_of_float v3)) | Binop (Arg1, v1, _v2) -> doc_of_float v1 | Binop (Arg2, _v1, v2) -> doc_of_float v2 | Binop (op, v1, v2) -> if Ops.is_binop_nice_infix op then let infix = Ops.binop_cd_syntax op in - group ( - parens ( - doc_of_float v1 ^^ space ^^ - string infix ^^ space ^^ - doc_of_float v2 - ) - ) + group (parens (doc_of_float v1 ^^ space ^^ string infix ^^ space ^^ doc_of_float v2)) else let prefix = Ops.binop_cd_fallback_syntax op in - group ( - string prefix ^^ - parens ( - doc_of_float v1 ^^ string "," ^^ space ^^ - doc_of_float v2 - ) - ) + group (string prefix ^^ parens (doc_of_float v1 ^^ string "," ^^ space ^^ doc_of_float v2)) | Unop (Identity, v) -> doc_of_float v | Unop (op, v) -> let prefix = Ops.unop_cd_syntax op in string prefix ^^ parens (doc_of_float v) in - - let doc = - hardline ^^ - nest 2 ( - function_header_doc ?name ?static_indices () ^^ - doc_of_code llc - ) - in - + + let doc = hardline ^^ nest 2 (function_header_doc ?name ?static_indices () ^^ doc_of_code llc) in + ToFormatter.pretty 1.0 !code_hum_margin ppf doc let doc_hum ?name ?static_indices () llc = let ident_label = get_ident_within_code [| llc |] in let open PPrint in - let doc_ident la = string (ident_label la) in let doc_local { tn; scope_id } = string ("v" ^ Int.to_string scope_id ^ "_") ^^ doc_ident tn in - + let rec doc_of_code c = match c with | Noop -> empty | Seq (c1, c2) -> - let docs = List.filter_map [c1; c2] ~f:(function - | Noop -> None - | c -> Some (doc_of_code c)) + let docs = + List.filter_map [ c1; c2 ] ~f:(function Noop -> None | c -> Some (doc_of_code c)) in separate hardline docs | For_loop { index = i; from_; to_; body; trace_it = _ } -> - let header = string "for " ^^ pp_symbol i ^^ string " = " ^^ - int from_ ^^ string " to " ^^ int to_ ^^ string " {" in + let header = + string "for " ^^ pp_symbol i ^^ string " = " ^^ int from_ ^^ string " to " ^^ int to_ + ^^ string " {" + in let body_doc = nest 2 (break 1 ^^ doc_of_code body) in group (header ^^ body_doc ^^ break 1 ^^ string "}") | Zero_out tn -> string "zero_out " ^^ doc_ident tn ^^ string ";" | Set p -> (* We don't use debug string in PPrint version *) - group ( - doc_ident p.tn ^^ - brackets (pp_indices p.idcs) ^^ - string " := " ^^ - doc_of_float p.llv ^^ - string ";" - ) + group + (doc_ident p.tn + ^^ brackets (pp_indices p.idcs) + ^^ string " := " ^^ doc_of_float p.llv ^^ string ";") | Comment message -> string ("/* " ^ message ^ " */") | Staged_compilation callback -> callback () - | Set_local (id, llv) -> - group (doc_local id ^^ string " := " ^^ doc_of_float llv ^^ string ";") - + | Set_local (id, llv) -> group (doc_local id ^^ string " := " ^^ doc_of_float llv ^^ string ";") and doc_of_float value = match value with - | Local_scope { id; body; _ } -> - group ( - doc_local id ^^ string " {" ^^ - nest 2 (break 1 ^^ doc_of_code body) ^^ - break 1 ^^ string "}" - ) + | Local_scope { id; body; _ } -> + group + (doc_local id ^^ string " {" + ^^ nest 2 (break 1 ^^ doc_of_code body) + ^^ break 1 ^^ string "}") | Get_local id -> doc_local id | Get_global (Ops.C_function s, None) -> string (s ^ "()") - | Get_global (Ops.C_function s, Some idcs) -> - string s ^^ parens (pp_indices idcs) + | Get_global (Ops.C_function s, Some idcs) -> string s ^^ parens (pp_indices idcs) | Get_global (Ops.External_unsafe { ptr; prec; dims = _ }, None) -> string (Ops.ptr_to_string_hum ptr prec) | Get_global (Ops.External_unsafe { ptr; prec; dims = _ }, Some idcs) -> @@ -1163,60 +1105,38 @@ let doc_hum ?name ?static_indices () llc = | Get_global (Ops.Merge_buffer { source_node_id }, Some idcs) -> let tn = Option.value_exn ~here:[%here] @@ Tnode.find ~id:source_node_id in group (doc_ident tn ^^ string ".merge" ^^ brackets (pp_indices idcs)) - | Get (tn, idcs) -> - group (doc_ident tn ^^ brackets (pp_indices idcs)) + | Get (tn, idcs) -> group (doc_ident tn ^^ brackets (pp_indices idcs)) | Constant c -> string (Printf.sprintf "%.16g" c) | Embed_index idx -> pp_axis_index idx | Ternop (op, v1, v2, v3) -> let prefix = Ops.ternop_cd_syntax op in - group ( - string prefix ^^ - parens ( - doc_of_float v1 ^^ string "," ^^ space ^^ - doc_of_float v2 ^^ string "," ^^ space ^^ - doc_of_float v3 - ) - ) + group + (string prefix + ^^ parens + (doc_of_float v1 ^^ string "," ^^ space ^^ doc_of_float v2 ^^ string "," ^^ space + ^^ doc_of_float v3)) | Binop (Arg1, v1, _v2) -> doc_of_float v1 | Binop (Arg2, _v1, v2) -> doc_of_float v2 | Binop (op, v1, v2) -> if Ops.is_binop_nice_infix op then let infix = Ops.binop_cd_syntax op in - group ( - parens ( - doc_of_float v1 ^^ space ^^ - string infix ^^ space ^^ - doc_of_float v2 - ) - ) + group (parens (doc_of_float v1 ^^ space ^^ string infix ^^ space ^^ doc_of_float v2)) else let prefix = Ops.binop_cd_fallback_syntax op in - group ( - string prefix ^^ - parens ( - doc_of_float v1 ^^ string "," ^^ space ^^ - doc_of_float v2 - ) - ) + group (string prefix ^^ parens (doc_of_float v1 ^^ string "," ^^ space ^^ doc_of_float v2)) | Unop (Identity, v) -> doc_of_float v | Unop (op, v) -> let prefix = Ops.unop_cd_syntax op in string prefix ^^ parens (doc_of_float v) in - - hardline ^^ - nest 2 ( - function_header_doc ?name ?static_indices () ^^ - doc_of_code llc - ) + + hardline ^^ nest 2 (function_header_doc ?name ?static_indices () ^^ doc_of_code llc) let%diagn2_sexp optimize ~unoptim_ll_source ~ll_source ~(name : string) (static_indices : Indexing.static_symbol list) (llc : t) : optimized = - Option.iter unoptim_ll_source ~f:(fun ppf -> - fprint_hum ~name ~static_indices () ppf llc); + Option.iter unoptim_ll_source ~f:(fun ppf -> fprint_hum ~name ~static_indices () ppf llc); let result = optimize_proc static_indices llc in - Option.iter ll_source ~f:(fun ppf -> - fprint_hum ~name ~static_indices () ppf result.llc); + Option.iter ll_source ~f:(fun ppf -> fprint_hum ~name ~static_indices () ppf result.llc); result let loop_over_dims dims ~body = 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-05-22 12:20.06: Job failed: Failed: Build failed