wip

Author: nicolasstucki

tests/run-with-compiler/shonan-hmm.check

@@ -254,3 +254,31 @@ List(25, 30, 20, 43, 44)
   })
   vout.update(4, v.apply(2).*(3).+(v.apply(4).*(7)))
 })
+
+
+
+{
+  val row: scala.Array[scala.Int] = {
+    val array: scala.Array[scala.Int] = new scala.Array[scala.Int](5)
+    array.update(0, 0)
+    array.update(1, 0)
+    array.update(2, 2)
+    array.update(3, 3)
+    array.update(4, 5)
+    array
+  }
+
+  ((vout: scala.Array[scala.Int], v: scala.Array[scala.Int]) => {
+    if (5.!=(vout.length)) throw new scala.IndexOutOfBoundsException("5") else ()
+    if (5.!=(v.length)) throw new scala.IndexOutOfBoundsException("5") else ()
+    vout.update(0, v.apply(0).*(5).+(v.apply(3).*(5)))
+    vout.update(1, v.apply(2).*(10))
+    vout.update(2, v.apply(1).*(10))
+    vout.update(3, {
+      var sum: scala.Int = 0
+      scala.Predef.intWrapper(0).until(5).foreach[scala.Unit](((i: scala.Int) => sum = sum.+(v.apply(i).*(row.apply(i)))))
+      (sum: scala.Int)
+    })
+    vout.update(4, v.apply(2).*(3).+(v.apply(4).*(7)))
+  })
+}

tests/run-with-compiler/shonan-hmm/MVmult.scala

@@ -93,8 +93,25 @@ object MVmult {
   }
 
   def mvmult_let(a: Array[Array[Int]]): Expr[(Array[Int], Array[Int]) => Unit] = {
-    val (n, m, a2) = amatCopy(a, copy_row_let)
-    mvmult_abs0(new RingIntOPExpr, new VecRStaOptDynInt(new RingIntPExpr))(n, m, a2)
+    initRows(a) { rows =>
+      val (n, m, a2) = amat2(a, rows)
+      mvmult_abs0(new RingIntOPExpr, new VecRStaOptDynInt(new RingIntPExpr))(n, m, a2)
+    }
+  }
+
+  def initRows[T](a: Array[Array[Int]])(cont: Array[Expr[Array[Int]]] => Expr[T]): Expr[T] = {
+    import Lifters._
+    def loop(i: Int, acc: List[Expr[Array[Int]]]): Expr[T] = {
+      if (i >= a.length) cont(acc.toArray.reverse)
+      else if (a(i).count(_ != 0) < VecRStaOptDynInt.threshold) {
+        val default: Expr[Array[Int]] = '(null.asInstanceOf[Array[Int]]) // never accessed
+        loop(i + 1, default :: acc)
+      } else '{
+        val row = ~a(i).toExpr
+        ~{ loop(i + 1, '(row) :: acc) }
+      }
+    }
+    loop(0, Nil)
   }
 
   def amat1(a: Array[Array[Int]], aa: Expr[Array[Array[Int]]]): (Int, Int, Vec[PV[Int], Vec[PV[Int], PV[Int]]]) = {
@@ -108,6 +125,16 @@ object MVmult {
     (n, m, vec)
   }
 
+  def amat2(a: Array[Array[Int]], refs: Array[Expr[Array[Int]]]): (Int, Int, Vec[PV[Int], Vec[PV[Int], PV[Int]]]) = {
+    val n = a.length
+    val m = a(0).length
+    val vec: Vec[PV[Int], Vec[PV[Int], PV[Int]]] = Vec(Sta(n), i => Vec(Sta(m), j => (i, j) match {
+      case (Sta(i), Sta(j)) => Sta(a(i)(j))
+      case (Sta(i), Dyn(j)) => Dyn('((~refs(i))(~j)))
+    }))
+    (n, m, vec)
+  }
+
   def amatCopy(a: Array[Array[Int]], copyRow: Array[Int] => (Expr[Int] => Expr[Int])): (Int, Int, Vec[PV[Int], Vec[PV[Int], PV[Int]]]) = {
     val n = a.length
     val m = a(0).length

tests/run-with-compiler/shonan-hmm/Test.scala

@@ -80,11 +80,11 @@ object Test {
     println()
 
     println(MVmult.mvmult_let1(a).show)
-//    println()
-//    println()
-//    println()
+    println()
+    println()
+    println()
 
-//    println(MVmult.mvmult_let(a).show)
+    println(MVmult.mvmult_let(a).show)
   }
 }
 

tests/run-with-compiler/shonan-hmm/VecROp.scala

@@ -66,14 +66,16 @@ class VecRStaDyn[T : Type : Liftable](r: Ring[PV[T]]) extends VecROp[PV[Int], PV
   override def toString(): String = s"VecRStaDim($r)"
 }
 
+object VecRStaOptDynInt {
+  val threshold = 3
+}
+
 class VecRStaOptDynInt(r: Ring[PV[Int]]) extends VecRStaDyn(r) {
   val M: VecROp[PV[Int], PV[Int], Expr[Unit]] = new VecRStaDyn(r)
 
-  private val threshold = 3
-
   override def reduce: ((PV[Int], PV[Int]) => PV[Int], PV[Int], Vec[PV[Int], PV[Int]]) => PV[Int] = (plus, zero, vec) => vec match {
     case Vec(Sta(n), vecf) =>
-      if (count_non_zeros(n, vecf) < threshold) M.reduce(plus, zero, vec)
+      if (count_non_zeros(n, vecf) < VecRStaOptDynInt.threshold) M.reduce(plus, zero, vec)
       else M.reduce(plus, zero, Vec(Dyn(n.toExpr), vecf))
     case _ => M.reduce(plus, zero, vec)
   }