Merge branch 'main' of https://github.com/google-research/dex-lang in…

…to tutorialfinal

README.md

@@ -16,7 +16,7 @@ or these example programs:
   * [Ray tracer](https://google-research.github.io/dex-lang/examples/raytrace.html)
   * [Estimating pi](https://google-research.github.io/dex-lang/examples/pi.html)
   * [Hamiltonian Monte Carlo](https://google-research.github.io/dex-lang/examples/mcmc.html)
-  * [ODE integrator](https://google-research.github.io/dex-lang/oexamples/de-integrator.html)
+  * [ODE integrator](https://google-research.github.io/dex-lang/examples/ode-integrator.html)
   * [Sierpinski triangle](https://google-research.github.io/dex-lang/examples/sierpinski.html)
   * [Basis function regression](https://google-research.github.io/dex-lang/examples/regression.html)
   * [Brownian bridge](https://google-research.github.io/dex-lang/examples/brownian_motion.html)
@@ -56,10 +56,10 @@ development mode:
 
 ```console
 # Linux:
-alias dex="stack exec dex --"
+alias dex="stack exec dex -- --lib-path lib"
 
 # macOS:
-alias dex="stack exec --stack-yaml=stack-macos.yaml dex --"
+alias dex="stack exec --stack-yaml=stack-macos.yaml dex -- --lib-path lib"
 ```
 
 ## Running

dex.cabal

@@ -13,6 +13,8 @@ maintainer:          [email protected]
 license-file:        LICENSE
 build-type:          Simple
 
+data-files:          lib/*.dx
+
 flag cuda
   description:         Enables building with CUDA support
   default:             False
@@ -31,9 +33,9 @@ library dex-resources
 
 library
   exposed-modules:     Env, Syntax, Type, Inference, JIT, LLVMExec,
-                       Parser, Util, Imp, Imp.Embed, Imp.Optimize,
+                       Parser, Util, Imp, Imp.Builder, Imp.Optimize,
                        PPrint, Algebra, Parallelize, Optimize, Serialize
-                       Actor, Cat, Embed, Export,
+                       Actor, Builder, Cat, Export,
                        RenderHtml, LiveOutput, Simplify, TopLevel,
                        Autodiff, Interpreter, Logging, CUDA,
                        LLVM.JIT, LLVM.Shims
@@ -49,6 +51,7 @@ library
                        store,
                        -- Notebook support
                        warp, wai, blaze-html, aeson, http-types, cmark, binary
+  other-modules:       Paths_dex
   if !os(darwin)
     exposed-modules:   Resources
     hs-source-dirs:    src/resources

examples/brownian_motion.dx

@@ -1,5 +1,5 @@
 
-include "plot.dx"
+import plot
 
 UnitInterval = Float
 

examples/fluidsim.dx

@@ -2,7 +2,7 @@
 Fluid simulation code based on
 [Real-Time Fluid Dynamics for Games](https://www.josstam.com/publications) by Jos Stam
 
-include "plot.dx"
+import plot
 
 def wrapidx (n:Type) -> (i:Int) : n =
   -- Index wrapping around at ends.

examples/isomorphisms.dx

@@ -46,15 +46,15 @@ that produce isos. We will start with the first two:
 :t #b : Iso {a:Int & b:Float & c:Unit} _
 > (Iso {a: Int32 & b: Float32 & c: Unit} (Float32 & {a: Int32 & c: Unit}))
 > === parse ===
-> _ans_ =
+>  _ans_ =
 >   MkIso {bwd = \(x, r). {b = x, ...r}, fwd = \{b = x, ...r}. (,) x r}
 >   : Iso {a: Int & b: Float & c: Unit} _
 
 %passes parse
 :t #?b : Iso {a:Int | b:Float | c:Unit} _
 > (Iso {a: Int32 | b: Float32 | c: Unit} (Float32 | {a: Int32 | c: Unit}))
 > === parse ===
-> _ans_ =
+>  _ans_ =
 >   MkIso
 >     { bwd = \v. case v
 >                 ((Left x)) -> {| b = x |}
@@ -142,7 +142,7 @@ another. For instance:
 >    ({ &} & {a: Int32 & b: Float32 & c: Unit})
 >    ({a: Int32} & {b: Float32 & c: Unit}))
 > === parse ===
-> _ans_ =
+>  _ans_ =
 >   MkIso
 >     { bwd = \({a = x, ...l}, {, ...r}). (,) {, ...l} {a = x, ...r}
 >     , fwd = \({, ...l}, {a = x, ...r}). (,) {a = x, ...l} {, ...r}}
@@ -212,7 +212,7 @@ zipper isomorphisms:
 >    ({ |} | {a: Int32 | b: Float32 | c: Unit})
 >    ({a: Int32} | {b: Float32 | c: Unit}))
 > === parse ===
-> _ans_ =
+>  _ans_ =
 >   MkIso
 >     { bwd = \v. case v
 >                 ((Left w)) -> (case w

examples/mandelbrot.dx

@@ -1,6 +1,6 @@
 '# Mandelbrot set
 
-include "plot.dx"
+import plot
 
 'Escape time algorithm
 

examples/mcmc.dx

@@ -2,7 +2,7 @@
 
 '## General MCMC utilities
 
-include "plot.dx"
+import plot
 
 LogProb : Type = Float
 

examples/ode-integrator.dx

@@ -4,7 +4,7 @@ This version is a port of the [Jax implementation](https://github.com/google/jax
 One difference is that it uses a lower-triangular
 matrix type for the Butcher tableau, and so avoids zero-padding everywhere.
 
-include "plot.dx"
+import plot
 
 Time = Float
 

examples/raytrace.dx

@@ -5,7 +5,7 @@
 described
 [here](https://blog.evjang.com/2019/11/jaxpt.html).
 
-include "plot.dx"
+import plot
 
 ' ### Generic Helper Functions
 Some of these should probably go in prelude.
@@ -212,7 +212,7 @@ def sampleLightRadiance
   (surfNor, surf) = osurf
   (rayPos, _) = inRay
   (MkScene objs) = scene
-  yieldAccum \radiance.
+  yieldAccum (AddMonoid Float) \radiance.
     for i. case objs.i of
       PassiveObject _ _ -> ()
       Light lightPos hw _ ->
@@ -227,7 +227,7 @@ def sampleLightRadiance
 
 def trace (params:Params) (scene:Scene n) (initRay:Ray) (k:Key) : Color =
   noFilter = [1.0, 1.0, 1.0]
-  yieldAccum \radiance.
+  yieldAccum (AddMonoid Float) \radiance.
     runState  noFilter \filter.
      runState initRay  \ray.
       boundedIter (getAt #maxBounces params) () \i.

examples/regression.dx

@@ -1,6 +1,6 @@
 '# Basis function regression
 
-include "plot.dx"
+import plot
 
 -- Conjugate gradients solver
 def solve (mat:m=>m=>Float) (b:m=>Float) : m=>Float =

examples/sierpinski.dx

@@ -1,6 +1,6 @@
 '# Sierpinski triangle ("chaos game")
 
-include "plot.dx"
+import plot
 
 def update (points:n=>Point) (key:Key) ((x,y):Point) : Point =
   (x', y') = points.(randIdx key)

examples/tiled-matmul.dx

@@ -16,7 +16,7 @@ def matmul (k : Type) ?-> (n : Type) ?-> (m : Type) ?->
   vectorTile = Fin VectorWidth
   colTile = (colVectors & vectorTile)
   (tile2d (\nt:(Tile n rowTile). \mt:(Tile m colTile).
-             ct = yieldAccum \acc.
+             ct = yieldAccum (AddMonoid Float) \acc.
                for l:k.
                  for i:rowTile.
                    ail = broadcastVector a.(nt +> i).l

lib/diagram.dx

@@ -1,5 +1,7 @@
 '# Vector graphics library
 
+import png
+
 Point : Type = (Float & Float)
 
 data Geom =

lib/plot.dx

@@ -1,7 +1,7 @@
 '# Plotting library
 
-include "diagram.dx"
-include "png.dx"
+import diagram
+import png
 
 data CompactSet a:Type =
   Interval a a