提交: 1afe5549ea065f418310c47a71c3b222a30945a2 - cammy (git)

A categorical programming language

Commit MetaInfo

• 修订版: 1afe5549ea065f418310c47a71c3b222a30945a2 (tree)
• 时间: 2021-11-14 05:52:34
• 作者: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

cammy-run: Multiple JIT drivers.

更改概述

• modified: cammy-run/main.py

差异

--- a/cammy-run/main.py
+++ b/cammy-run/main.py
@@ -200,6 +200,10 @@ class Succ(Arrow):
     _immutable_ = True
     def run(self, x): return N(x.n().int_add(1))
 
+pr_driver = JitDriver(name="pr",
+        greens=["pr"], reds=["n", "rv"],
+        is_recursive=True)
+
 class PrimRec(Arrow):
     _immutable_ = True
     def __init__(self, x, f):
@@ -210,6 +214,7 @@ class PrimRec(Arrow):
         n = x.n()
         rv = self._x.run(T())
         while n.tobool():
+            pr_driver.jit_merge_point(pr=self, n=n, rv=rv)
             n = n.int_sub(1)
             rv = self._f.run(rv)
         return rv
@@ -222,6 +227,14 @@ class Cons(Arrow):
     _immutable_ = True
     def run(self, x): return Xs([x.first()] + x.second().l())
 
+fold_driver = JitDriver(name="fold",
+        greens=["fold"], reds=["element"],
+        is_recursive=True)
+
+def driveFold(fold, element):
+    fold_driver.jit_merge_point(fold=fold, element=element)
+    return fold.run(element)
+
 class Fold(Arrow):
     _immutable_ = True
     def __init__(self, n, c):
@@ -230,7 +243,7 @@ class Fold(Arrow):
     def run(self, x):
         rv = self._n.run(T())
         for e in x.l():
-            rv = self._c.run(P(e, rv))
+            rv = driveFold(self._c, P(e, rv))
         return rv
 
 class FZero(Arrow):
@@ -465,11 +478,12 @@ class Window(object):
         c2 = scale(self._corners[1], self._corners[3], dh + ih * h)
         return c1, c2
 
-driver = JitDriver(greens=["program"],
-        reds=["x", "y"])
+sample_driver = JitDriver(name="sample",
+        greens=["program"], reds=["x", "y"],
+        is_recursive=True)
 
 def sample(program, x, y):
-    driver.jit_merge_point(program=program, x=x, y=y)
+    sample_driver.jit_merge_point(program=program, x=x, y=y)
     rgb = program.run(P(F(x), F(y)))
     r = rgb.first().f()
     g = rgb.second().first().f()
@@ -508,7 +522,7 @@ def drawPNG(program, filename, corners, width, height):
 
 
 def main(argv):
-    set_param(driver, "trace_limit", 50001)
+    set_param(None, "trace_limit", 50001)
 
     prog = argv[1]
     window = [string_to_float(s) for s in split(argv[2])]