2025-05-26 14:28.42: New job: test ahrefs/ocannl https://github.com/ahrefs/ocannl.git#refs/heads/master (1daf45cc2e0001ceee5e611e71916b8b963cde8d) (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 1daf45cc 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-26 14:28.42: 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-26 14:28.42: 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-26 14:28.42: Waiting for resource in pool OCluster 2025-05-26 14:28.42: Waiting for worker… 2025-05-26 14:28.42: Got resource from pool OCluster Building on asteria.caelum.ci.dev HEAD is now at 98e7ca73 Improved formatting for generated code (by Claude) HEAD is now at 1daf45cc Try pinning printbox-text for the latest bug fix (from ocaml/opam:debian-12-ocaml-4.08@sha256:48fa4a7216c3973bb95572cf5dca98cbbcefe90f288f552e7ac70a8ccd438aa7) 2025-05-26 14:28.43 ---> 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-26 14:28.43 ---> 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-26 14:28.43 ---> 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 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-05-26 14:28.43 ---> using "5e3a5282f655843df8e02a2497598f2918acc59345107286c51ff04d386b492b" from cache /src: (copy (src .) (dst /src/)) 2025-05-26 14:28.44 ---> saved as "94413e87c26aa4ad8a22bb1c36f7145d13d3399614d2de157990539c1c7036e8" /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 "lib/tensor.mli", line 1, characters 0-0: diff --git a/_build/default/lib/tensor.mli b/_build/default/lib/.formatted/tensor.mli index 2b10084..c42347f 100644 --- a/_build/default/lib/tensor.mli +++ b/_build/default/lib/.formatted/tensor.mli @@ -299,7 +299,7 @@ val to_doc : t -> PPrint.document - val print : +val print : ?spy:bool -> with_grad:bool -> with_code:bool -> 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 "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 "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 "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/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 78781f1..2b771e8 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 to_doc ?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 @@ -298,76 +298,83 @@ let to_doc ?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) : 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/metal_backend.ml", line 1, characters 0-0: diff --git a/_build/default/arrayjit/lib/metal_backend.ml b/_build/default/arrayjit/lib/.formatted/metal_backend.ml index 029fbe7..bb39eb9 100644 --- a/_build/default/arrayjit/lib/metal_backend.ml +++ b/_build/default/arrayjit/lib/.formatted/metal_backend.ml @@ -480,32 +480,41 @@ end) : Ir.Backend_impl.Lowered_backend = struct | Or, _ -> f "||" | Relu_gate, Ops.Half_prec _ -> fun v1 v2 -> - group (parens - (group (parens (v1 ^^ string " > 0.0h")) ^^ space ^^ string "?" ^^ space - ^^ v2 ^^ space ^^ string ":" ^^ space ^^ string "0.0h")) + group + (parens + (group (parens (v1 ^^ string " > 0.0h")) + ^^ space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space + ^^ string "0.0h")) | Relu_gate, Ops.Single_prec _ -> fun v1 v2 -> - group (parens - (group (parens (v1 ^^ string " > 0.0f")) ^^ space ^^ string "?" ^^ space - ^^ v2 ^^ space ^^ string ":" ^^ space ^^ string "0.0f")) + group + (parens + (group (parens (v1 ^^ string " > 0.0f")) + ^^ space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space + ^^ string "0.0f")) | Relu_gate, Ops.Double_prec _ -> fun v1 v2 -> - group (parens - (group (parens (v1 ^^ string " > 0.0")) ^^ space ^^ string "?" ^^ space - ^^ v2 ^^ space ^^ string ":" ^^ space ^^ string "0.0")) + group + (parens + (group (parens (v1 ^^ string " > 0.0")) + ^^ space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space + ^^ string "0.0")) | Relu_gate, _ (* Byte_prec, Void_prec *) -> fun v1 v2 -> - group (parens - (group (parens (v1 ^^ string " > 0")) ^^ space ^^ string "?" ^^ space - ^^ v2 ^^ space ^^ string ":" ^^ space ^^ string "0")) + group + (parens + (group (parens (v1 ^^ string " > 0")) + ^^ space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space ^^ string "0" + )) | Satur01_gate, p_res -> let s = metal_prec_suffix_float p_res in fun v1 v2 -> - group (parens - (group (parens - (v1 ^^ string (" > 0.0" ^ s ^ " && ") ^^ v1 ^^ string (" < 1.0" ^ s))) - ^^ space ^^ string "?" ^^ space ^^ v2 - ^^ space ^^ string ":" ^^ space ^^ string ("0.0" ^ s))) + group + (parens + (group + (parens (v1 ^^ string (" > 0.0" ^ s ^ " && ") ^^ v1 ^^ string (" < 1.0" ^ s))) + ^^ space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space + ^^ string ("0.0" ^ s))) | ToPowOf, _ -> func "pow" | Arg1, _ | Arg2, _ -> invalid_arg "Metal C_syntax_config: Arg1/Arg2 not operators" 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 7a2e3cd..789b212 100644 --- a/_build/default/arrayjit/lib/cuda_backend.ml +++ b/_build/default/arrayjit/lib/.formatted/cuda_backend.ml @@ -287,11 +287,16 @@ 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 ^^ string (" " ^ op_str) ^^ ifflat (space ^^ v2) (nest 2 (break 1 ^^ v2)))) in - let func fn v1 v2 = group (string fn ^^ parens (v1 ^^ comma ^^ ifflat (space ^^ v2) (nest 2 (break 1 ^^ v2)))) in + let f op_str v1 v2 = + group + (parens (v1 ^^ string (" " ^ op_str) ^^ ifflat (space ^^ v2) (nest 2 (break 1 ^^ v2)))) + in + let func fn v1 v2 = + group (string fn ^^ parens (v1 ^^ comma ^^ ifflat (space ^^ v2) (nest 2 (break 1 ^^ v2)))) + in match (v, prec) with | Ops.Arg1, _ -> invalid_arg "Cuda_backend.binop_syntax: Arg1 is not an operator" | Arg2, _ -> invalid_arg "Cuda_backend.binop_syntax: Arg2 is not an operator" @@ -307,55 +312,101 @@ end) : Ir.Backend_impl.Lowered_backend = struct | ToPowOf, Double_prec _ -> func "pow" | ToPowOf, Single_prec _ -> func "powf" | ToPowOf, Half_prec _ -> - fun v1 v2 -> group (string "hexp2(hlog2(" ^^ v1 ^^ string ")," ^^ ifflat (space ^^ v2) (nest 2 (break 1 ^^ v2)) ^^ string ")") + fun v1 v2 -> + group + (string "hexp2(hlog2(" ^^ v1 ^^ string ")," + ^^ ifflat (space ^^ v2) (nest 2 (break 1 ^^ v2)) + ^^ string ")") | ToPowOf, Byte_prec _ -> invalid_arg "Cuda_backend.binop_syntax: ToPowOf not supported for byte/integer precisions" | Relu_gate, Byte_prec _ -> fun v1 v2 -> - group (parens (group (parens (v1 ^^ string " > 0")) - ^^ ifflat (space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space ^^ string "0") - (nest 2 (break 1 ^^ string "?" ^^ space ^^ v2 ^^ break 1 ^^ string ":" ^^ space ^^ string "0")))) + group + (parens + (group (parens (v1 ^^ string " > 0")) + ^^ ifflat + (space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space + ^^ string "0") + (nest 2 + (break 1 ^^ string "?" ^^ space ^^ v2 ^^ break 1 ^^ string ":" ^^ space + ^^ string "0")))) | Relu_gate, Half_prec _ -> fun v1 v2 -> - group (parens - (group (parens - (string "__hgt(" ^^ v1 ^^ comma - ^^ string " __ushort_as_half((unsigned short)0x0000U))")) - ^^ ifflat (space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space ^^ string "__ushort_as_half((unsigned short)0x0000U)") - (nest 2 (break 1 ^^ string "?" ^^ space ^^ v2 ^^ break 1 ^^ string ":" ^^ space ^^ string "__ushort_as_half((unsigned short)0x0000U)")))) + group + (parens + (group + (parens + (string "__hgt(" ^^ v1 ^^ comma + ^^ string " __ushort_as_half((unsigned short)0x0000U))")) + ^^ ifflat + (space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space + ^^ string "__ushort_as_half((unsigned short)0x0000U)") + (nest 2 + (break 1 ^^ string "?" ^^ space ^^ v2 ^^ break 1 ^^ string ":" ^^ space + ^^ string "__ushort_as_half((unsigned short)0x0000U)")))) | Relu_gate, _ -> fun v1 v2 -> - group (parens (group (parens (v1 ^^ string " > 0.0")) - ^^ ifflat (space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space ^^ string "0.0") - (nest 2 (break 1 ^^ string "?" ^^ space ^^ v2 ^^ break 1 ^^ string ":" ^^ space ^^ string "0.0")))) + group + (parens + (group (parens (v1 ^^ string " > 0.0")) + ^^ ifflat + (space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space + ^^ string "0.0") + (nest 2 + (break 1 ^^ string "?" ^^ space ^^ v2 ^^ break 1 ^^ string ":" ^^ space + ^^ string "0.0")))) | Satur01_gate, Byte_prec _ -> fun v1 v2 -> - group (parens - (group (parens - (string "(float)" ^^ v1 ^^ string " > 0.0f && (float)" ^^ v1 ^^ string " < 1.0f")) - ^^ ifflat (space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space ^^ string "(unsigned char)0") - (nest 2 (break 1 ^^ string "?" ^^ space ^^ v2 ^^ break 1 ^^ string ":" ^^ space ^^ string "(unsigned char)0")))) + group + (parens + (group + (parens + (string "(float)" ^^ v1 ^^ string " > 0.0f && (float)" ^^ v1 + ^^ string " < 1.0f")) + ^^ ifflat + (space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space + ^^ string "(unsigned char)0") + (nest 2 + (break 1 ^^ string "?" ^^ space ^^ v2 ^^ break 1 ^^ string ":" ^^ space + ^^ string "(unsigned char)0")))) | Satur01_gate, Half_prec _ -> fun v1 v2 -> - group (parens - (group (parens (string "__hgt(" ^^ v1 ^^ comma - ^^ string " __ushort_as_half((unsigned short)0x0000U)) && __hlt(" - ^^ v1 ^^ comma - ^^ string " __ushort_as_half((unsigned short)0x3C00U))")) - ^^ ifflat (space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space ^^ string "__ushort_as_half((unsigned short)0x0000U)") - (nest 2 (break 1 ^^ string "?" ^^ space ^^ v2 ^^ break 1 ^^ string ":" ^^ space ^^ string "__ushort_as_half((unsigned short)0x0000U)")))) + group + (parens + (group + (parens + (string "__hgt(" ^^ v1 ^^ comma + ^^ string " __ushort_as_half((unsigned short)0x0000U)) && __hlt(" + ^^ v1 ^^ comma + ^^ string " __ushort_as_half((unsigned short)0x3C00U))")) + ^^ ifflat + (space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space + ^^ string "__ushort_as_half((unsigned short)0x0000U)") + (nest 2 + (break 1 ^^ string "?" ^^ space ^^ v2 ^^ break 1 ^^ string ":" ^^ space + ^^ string "__ushort_as_half((unsigned short)0x0000U)")))) | Satur01_gate, Single_prec _ -> fun v1 v2 -> - group (parens - (group (parens (v1 ^^ string " > 0.0f && " ^^ v1 ^^ string " < 1.0f")) - ^^ ifflat (space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space ^^ string "0.0f") - (nest 2 (break 1 ^^ string "?" ^^ space ^^ v2 ^^ break 1 ^^ string ":" ^^ space ^^ string "0.0f")))) + group + (parens + (group (parens (v1 ^^ string " > 0.0f && " ^^ v1 ^^ string " < 1.0f")) + ^^ ifflat + (space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space + ^^ string "0.0f") + (nest 2 + (break 1 ^^ string "?" ^^ space ^^ v2 ^^ break 1 ^^ string ":" ^^ space + ^^ string "0.0f")))) | Satur01_gate, Double_prec _ -> fun v1 v2 -> - group (parens - (group (parens (v1 ^^ string " > 0.0 && " ^^ v1 ^^ string " < 1.0")) - ^^ ifflat (space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space ^^ string "0.0") - (nest 2 (break 1 ^^ string "?" ^^ space ^^ v2 ^^ break 1 ^^ string ":" ^^ space ^^ string "0.0")))) + group + (parens + (group (parens (v1 ^^ string " > 0.0 && " ^^ v1 ^^ string " < 1.0")) + ^^ ifflat + (space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space + ^^ string "0.0") + (nest 2 + (break 1 ^^ string "?" ^^ space ^^ v2 ^^ break 1 ^^ string ":" ^^ space + ^^ string "0.0")))) | Max, Byte_prec _ -> func "max" | Max, Half_prec _ -> func "__hmax" | Max, Double_prec _ -> func "fmax" 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 c2d190b..3d32810 100644 --- a/_build/default/arrayjit/lib/c_syntax.ml +++ b/_build/default/arrayjit/lib/.formatted/c_syntax.ml @@ -164,11 +164,12 @@ struct let ternop_syntax prec op v1 v2 v3 = let op_prefix, op_infix1, op_infix2, op_suffix = Ops.ternop_c_syntax prec op in let open PPrint in - group (string op_prefix ^^ v1 ^^ string op_infix1 - ^^ ifflat (space ^^ v2) (nest 2 (break 1 ^^ v2)) - ^^ string op_infix2 - ^^ ifflat (space ^^ v3) (nest 2 (break 1 ^^ v3)) - ^^ string op_suffix) + group + (string op_prefix ^^ v1 ^^ string op_infix1 + ^^ ifflat (space ^^ v2) (nest 2 (break 1 ^^ v2)) + ^^ string op_infix2 + ^^ ifflat (space ^^ v3) (nest 2 (break 1 ^^ v3)) + ^^ string op_suffix) let binop_syntax prec op v1 v2 = match op with @@ -176,36 +177,59 @@ struct match prec with | Ops.Byte_prec _ -> let open PPrint in - group (parens - (group (parens - (string "(float)" ^^ v1 ^^ string " > 0.0f && (float)" ^^ v1 ^^ string " < 1.0f")) - ^^ ifflat (space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space ^^ string "(unsigned char)0") - (nest 2 (break 1 ^^ string "?" ^^ space ^^ v2 ^^ break 1 ^^ string ":" ^^ space ^^ string "(unsigned char)0")))) + group + (parens + (group + (parens + (string "(float)" ^^ v1 ^^ string " > 0.0f && (float)" ^^ v1 + ^^ string " < 1.0f")) + ^^ ifflat + (space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space + ^^ string "(unsigned char)0") + (nest 2 + (break 1 ^^ string "?" ^^ space ^^ v2 ^^ break 1 ^^ string ":" ^^ space + ^^ string "(unsigned char)0")))) | Ops.Half_prec _ -> let open PPrint in - group (parens - (group (parens (v1 ^^ string " > 0.0f16 && " ^^ v1 ^^ string " < 1.0f16")) - ^^ ifflat (space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space ^^ string "0.0f16") - (nest 2 (break 1 ^^ string "?" ^^ space ^^ v2 ^^ break 1 ^^ string ":" ^^ space ^^ string "0.0f16")))) + group + (parens + (group (parens (v1 ^^ string " > 0.0f16 && " ^^ v1 ^^ string " < 1.0f16")) + ^^ ifflat + (space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space + ^^ string "0.0f16") + (nest 2 + (break 1 ^^ string "?" ^^ space ^^ v2 ^^ break 1 ^^ string ":" ^^ space + ^^ string "0.0f16")))) | Ops.Single_prec _ -> let open PPrint in - group (parens - (group (parens (v1 ^^ string " > 0.0f && " ^^ v1 ^^ string " < 1.0f")) - ^^ ifflat (space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space ^^ string "0.0f") - (nest 2 (break 1 ^^ string "?" ^^ space ^^ v2 ^^ break 1 ^^ string ":" ^^ space ^^ string "0.0f")))) + group + (parens + (group (parens (v1 ^^ string " > 0.0f && " ^^ v1 ^^ string " < 1.0f")) + ^^ ifflat + (space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space + ^^ string "0.0f") + (nest 2 + (break 1 ^^ string "?" ^^ space ^^ v2 ^^ break 1 ^^ string ":" ^^ space + ^^ string "0.0f")))) | Ops.Double_prec _ -> let open PPrint in - group (parens - (group (parens (v1 ^^ string " > 0.0 && " ^^ v1 ^^ string " < 1.0")) - ^^ ifflat (space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space ^^ string "0.0") - (nest 2 (break 1 ^^ string "?" ^^ space ^^ v2 ^^ break 1 ^^ string ":" ^^ space ^^ string "0.0")))) + group + (parens + (group (parens (v1 ^^ string " > 0.0 && " ^^ v1 ^^ string " < 1.0")) + ^^ ifflat + (space ^^ string "?" ^^ space ^^ v2 ^^ space ^^ string ":" ^^ space + ^^ string "0.0") + (nest 2 + (break 1 ^^ string "?" ^^ space ^^ v2 ^^ break 1 ^^ string ":" ^^ space + ^^ string "0.0")))) | Ops.Void_prec -> invalid_arg "Pure_C_config.binop_syntax: Satur01_gate on Void_prec") | _ -> let op_prefix, op_infix, op_suffix = Ops.binop_c_syntax prec op in let open PPrint in - group (string op_prefix ^^ v1 ^^ string op_infix - ^^ ifflat (space ^^ v2) (nest 2 (break 1 ^^ v2)) - ^^ string op_suffix) + group + (string op_prefix ^^ v1 ^^ string op_infix + ^^ ifflat (space ^^ v2) (nest 2 (break 1 ^^ v2)) + ^^ string op_suffix) let unop_syntax prec op v = let op_prefix, op_suffix = Ops.unop_c_syntax prec op in @@ -234,8 +258,7 @@ struct String.drop_suffix res 1 ^ "\\n" else res in - log_file_check - ^^ string "fprintf(log_file, " + log_file_check ^^ string "fprintf(log_file, " ^^ dquotes (string base_message_literal) ^^ (if List.is_empty args_docs then empty else comma ^^ space) ^^ separate (comma ^^ space) args_docs @@ -284,14 +307,12 @@ module C_syntax (B : C_syntax_config) = struct let d1 = pp_ll c1 in let d2 = pp_ll c2 in (* Avoid extra hardlines if one side is empty *) - if PPrint.is_empty d1 then d2 - else if PPrint.is_empty d2 then d1 - else d1 ^^ hardline ^^ d2 + if PPrint.is_empty d1 then d2 else if PPrint.is_empty d2 then d1 else d1 ^^ hardline ^^ d2 | For_loop { index = i; from_; to_; body; trace_it = _ } -> let header = string "for (int " ^^ pp_symbol i ^^ string " = " ^^ PPrint.OCaml.int from_ ^^ semi - ^^ space ^^ pp_symbol i ^^ string " <= " ^^ PPrint.OCaml.int to_ ^^ semi - ^^ space ^^ string "++" ^^ pp_symbol i ^^ string ")" + ^^ space ^^ pp_symbol i ^^ string " <= " ^^ PPrint.OCaml.int to_ ^^ semi ^^ space + ^^ string "++" ^^ pp_symbol i ^^ string ")" in let body_doc = ref (pp_ll body) in (if Utils.debug_log_from_routines () then @@ -314,9 +335,11 @@ module C_syntax (B : C_syntax_config) = struct let prec = Lazy.force tn.prec in let local_defs, val_doc = pp_float prec llv in let offset_doc = pp_array_offset (idcs, dims) in - let assignment = - group (ident_doc ^^ brackets offset_doc ^^ string " =" - ^^ ifflat (space ^^ val_doc) (nest 4 (hardline ^^ val_doc)) ^^ semi) + let assignment = + group + (ident_doc ^^ brackets offset_doc ^^ string " =" + ^^ ifflat (space ^^ val_doc) (nest 4 (hardline ^^ val_doc)) + ^^ semi) in if Utils.debug_log_from_routines () then let num_typ = string (B.typ_of_prec prec) in @@ -355,14 +378,14 @@ module C_syntax (B : C_syntax_config) = struct comment_log ^^ hardline ^^ value_log ^^ hardline ^^ flush_log in let assignment' = ident_doc ^^ brackets offset_doc ^^ string " = " ^^ new_var ^^ semi in - let block_content = - if PPrint.is_empty local_defs then decl ^^ hardline ^^ log_doc ^^ hardline ^^ assignment' + let block_content = + if PPrint.is_empty local_defs then + decl ^^ hardline ^^ log_doc ^^ hardline ^^ assignment' else local_defs ^^ hardline ^^ decl ^^ hardline ^^ log_doc ^^ hardline ^^ assignment' in lbrace ^^ nest 2 (hardline ^^ block_content) ^^ hardline ^^ rbrace - else - if PPrint.is_empty local_defs then assignment - else local_defs ^^ hardline ^^ assignment + else if PPrint.is_empty local_defs then assignment + else local_defs ^^ hardline ^^ assignment | Comment message -> if Utils.debug_log_from_routines () then let base_message = "COMMENT: " ^ message ^ "\n" in @@ -370,13 +393,13 @@ 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 = string ("v" ^ Int.to_string scope_id) ^^ string " = " ^^ value_doc ^^ semi in - if PPrint.is_empty local_defs then assignment - else local_defs ^^ hardline ^^ assignment + let assignment = + string ("v" ^ Int.to_string scope_id) ^^ string " = " ^^ value_doc ^^ semi + in + if PPrint.is_empty local_defs then assignment else local_defs ^^ hardline ^^ assignment and pp_float (prec : Ops.prec) (vcomp : Low_level.float_t) : PPrint.document * PPrint.document = (* Returns (local definitions, value expression) *) @@ -384,7 +407,9 @@ module C_syntax (B : C_syntax_config) = struct match vcomp with | Local_scope { id = { scope_id; tn = { prec = scope_prec; _ } }; body; orig_indices = _ } -> let num_typ = string (B.typ_of_prec @@ Lazy.force scope_prec) in - let decl = num_typ ^^ space ^^ string ("v" ^ Int.to_string scope_id) ^^ string " = 0" ^^ semi in + let decl = + num_typ ^^ space ^^ string ("v" ^ Int.to_string scope_id) ^^ string " = 0" ^^ semi + in let body_doc = pp_ll body in let defs = decl ^^ hardline ^^ body_doc in let prefix, postfix = B.convert_precision ~from:(Lazy.force scope_prec) ~to_:prec in @@ -400,7 +425,9 @@ module C_syntax (B : C_syntax_config) = struct let from_prec = Lazy.force tn.prec in let prefix, postfix = B.convert_precision ~from:from_prec ~to_:prec in let offset_doc = pp_array_offset (idcs, Lazy.force tn.dims) in - let expr = string prefix ^^ string "merge_buffer" ^^ brackets offset_doc ^^ string postfix in + let expr = + string prefix ^^ string "merge_buffer" ^^ brackets offset_doc ^^ string postfix + in (empty, expr) | Get_global _ -> failwith "C_syntax: Get_global / FFI NOT IMPLEMENTED YET" | Get (tn, idcs) -> @@ -431,7 +458,7 @@ module C_syntax (B : C_syntax_config) = struct let d1, e1 = pp_float prec v1 in let d2, e2 = pp_float prec v2 in let d3, e3 = pp_float prec v3 in - let defs = + let defs = List.filter_map [ d1; d2; d3 ] ~f:(fun d -> if PPrint.is_empty d then None else Some d) |> separate hardline in @@ -440,7 +467,7 @@ module C_syntax (B : C_syntax_config) = struct | Binop (op, v1, v2) -> let d1, e1 = pp_float prec v1 in let d2, e2 = pp_float prec v2 in - let defs = + let defs = List.filter_map [ d1; d2 ] ~f:(fun d -> if PPrint.is_empty d then None else Some d) |> separate hardline in @@ -472,7 +499,9 @@ module C_syntax (B : C_syntax_config) = struct let dims = Lazy.force tn.dims in let prefix, postfix = B.convert_precision ~from:from_prec ~to_:prec in let offset_doc = pp_array_offset (idcs, dims) in - let access_doc = string prefix ^^ string "merge_buffer" ^^ brackets offset_doc ^^ string postfix in + let access_doc = + string prefix ^^ string "merge_buffer" ^^ brackets offset_doc ^^ string postfix + in let expr_doc = string prefix ^^ string "merge_buffer" ^^ brackets (string "%u") @@ -582,11 +611,10 @@ module C_syntax (B : C_syntax_config) = struct body := !body ^^ string "FILE* log_file = NULL;" ^^ hardline ^^ string ("if (" ^ log_file_var_name ^ ") ") - ^^ lbrace ^^ nest 2 (hardline - ^^ string ("log_file = fopen(" ^ log_file_var_name ^ ", \"w\");")) + ^^ lbrace + ^^ nest 2 (hardline ^^ string ("log_file = fopen(" ^ log_file_var_name ^ ", \"w\");")) ^^ hardline ^^ rbrace ^^ hardline - else - body := !body ^^ hardline; + else body := !body ^^ hardline; (if Utils.debug_log_from_routines () then let debug_init_doc = @@ -649,6 +677,8 @@ module C_syntax (B : C_syntax_config) = struct ^^ string "if (log_file) { fclose(log_file); log_file = NULL; }" ^^ hardline; - let func_doc = func_header ^^ space ^^ lbrace ^^ nest 2 (hardline ^^ !body) ^^ hardline ^^ rbrace in + let func_doc = + func_header ^^ space ^^ lbrace ^^ nest 2 (hardline ^^ !body) ^^ hardline ^^ rbrace + in (sorted_params, func_doc) end 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-26 14:28.45: Job failed: Failed: Build failed