fix

hail-is · Mar 19, 2018 · 00cd1d4 · 00cd1d4
1 parent 31792c4
commit 00cd1d4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/python/hail/tests/utils.py b/python/hail/tests/utils.py
@@ -4,7 +4,7 @@
 
 
 def startTestHailContext():
-    hail.init(master='local[2]', min_block_size=0, quiet=True)
+    hail.init(master='local[2]', min_block_size=0)
 
 
 def stopTestHailContext():

diff --git a/src/main/scala/is/hail/expr/Relational.scala b/src/main/scala/is/hail/expr/Relational.scala
@@ -409,18 +409,18 @@ case class MapEntries(child: MatrixIR, newEntries: IR) extends MatrixIR {
   def execute(hc: HailContext): MatrixValue = {
     val prev = child.execute(hc)
 
-    val (rTyp, f) = ir.Compile[Long, Long, Long, Long](
-      "global", child.typ.globalType,
-      "va", child.typ.rvRowType,
-      "sa", child.typ.colType,
-      newRow)
-    assert(rTyp == typ.rvRowType)
-
     val localGlobalsType = typ.globalType
     val localColsType = TArray(typ.colType)
     val colValuesBc = prev.colValuesBc
     val globalsBc = prev.globals.broadcast
 
+    val (rTyp, f) = ir.Compile[Long, Long, Long, Long](
+      "global", localGlobalsType,
+      "va", prev.typ.rvRowType,
+      "sa", localColsType,
+      newRow)
+    assert(rTyp == typ.rvRowType)
+
     val newRVD = prev.rvd.mapPartitionsPreservesPartitioning(typ.orvdType) { it =>
       val rvb = new RegionValueBuilder()
       val newRV = RegionValue()