Clarify non-accumulating FMA. Prepare for release 0.5.2

lukstafi · lukstafi · commit 2e38b845947f · 2025-03-29T23:47:36.000+01:00
Signed-off-by: Lukasz Stafiniak &lt;lukstafi@gmail.com&gt;
diff --git a/CHANGES.md b/CHANGES.md
@@ -5,8 +5,7 @@
 - Lots of new primitive ops:
   - Unary: Satur01 | Exp | Log | Exp2 | Log2 | Sin | Cos | Sqrt | Recip | Recip_sqrt | Neg | Tanh_approx | Not
   - Binary: Satur01_gate | Max | Min | Mod | Cmplt | Cmpeq | Cmpne
-  - Ternary: Where | FMA
-    - TODO: ternary Mul_acc
+  - Ternary: Where | FMA (non-accumulating)
 - Ternary tensor operations.
   - A differentiable `where` operation.
 - More flexible gradient construction via the `%cd` syntax (better projections inference).
@@ -25,7 +24,7 @@
 ### Fixed
 
 - Numbers text rendering (consistent across OSes).
-
+- Moved closing row variables to stage 3, because stage 2 may need to process inequalities generating more LUBs.
 
 ## [0.5.1] -- 2025-01-01
 
diff --git a/arrayjit.opam b/arrayjit.opam
@@ -1,6 +1,6 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-version: "0.5.1"
+version: "0.5.2"
 synopsis:
   "An array language compiler with multiple backends (CPU, CUDA), staged compilation"
 description:
@@ -14,7 +14,7 @@ doc: "https://github.com/lukstafi/ocannl/blob/master/README.md"
 bug-reports: "https://github.com/lukstafi/ocannl/issues"
 depends: [
   "ocaml" {>= "5.2.0"}
-  "dune" {>= "3.11"}
+  "dune" {>= "3.16"}
   "base" {>= "v0.17.0"}
   "ctypes" {>= "0.23"}
   "ctypes-foreign" {>= "0.23"}
diff --git a/arrayjit/lib/ops.ml b/arrayjit/lib/ops.ml
@@ -174,7 +174,9 @@ type unop =
   | Not  (** 0. -> 1. | _ -> 0. *)
 [@@deriving sexp, compare, equal]
 
-type ternop = Where  (** Where(a,b,c): if a then b else c *) | FMA  (** FMA(a,b,c): (a * b) + c *)
+type ternop =
+  | Where  (** Where(a,b,c): if a then b else c *)
+  | FMA  (** FMA(a,b,c): (a * b) + c, non-accumulating *)
 [@@deriving sexp, compare, equal]
 
 type op = Ternop of ternop | Binop of binop | Unop of unop [@@deriving sexp, compare, equal]
diff --git a/dune-project b/dune-project
@@ -1,10 +1,10 @@
-(lang dune 3.11)
+(lang dune 3.16)
 
 (using ctypes 0.3)
 
 (name ocannl)
 
-(version 0.5.1)
+(version 0.5.2)
 
 (generate_opam_files true)
 
diff --git a/neural_nets_lib.opam b/neural_nets_lib.opam
@@ -1,6 +1,6 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-version: "0.5.1"
+version: "0.5.2"
 synopsis:
   "A from-scratch Deep Learning framework with an optimizing compiler, shape inference, concise syntax"
 description:
@@ -14,7 +14,7 @@ doc: "https://github.com/lukstafi/ocannl/blob/master/README.md"
 bug-reports: "https://github.com/lukstafi/ocannl/issues"
 depends: [
   "ocaml" {>= "5.2.0"}
-  "dune" {>= "3.11"}
+  "dune" {>= "3.16"}
   "base" {>= "v0.17.0"}
   "arrayjit" {>= "0.5.1"}
   "printbox" {>= "0.12"}
