From 00cd1d42ec45f75ff3cabccf48735eb420dfba38 Mon Sep 17 00:00:00 2001
From: wang <wang@broadinstitute.org>
Date: Mon, 19 Mar 2018 17:17:37 -0400
Subject: [PATCH] fix

---
 python/hail/tests/utils.py                   |  2 +-
 src/main/scala/is/hail/expr/Relational.scala | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/python/hail/tests/utils.py b/python/hail/tests/utils.py
index 5e05ba032d33..923e144f2688 100644
--- 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
index 828d8691f808..3226abd2ec87 100644
--- 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()