From ce7087199e25299d6e158e9bdaf6e764076ce395 Mon Sep 17 00:00:00 2001
From: "Timothy A. Smith" <tasmith4@illinois.edu>
Date: Tue, 28 May 2019 22:36:03 -0500
Subject: [PATCH] move with_root_kernel to kernel_fixtures, possibly breaks
 skipped tests

---
 fixtures.py        | 12 ------------
 kernel_fixtures.py | 14 +++++++++++++-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/fixtures.py b/fixtures.py
index c5737db..6a1e791 100644
--- a/fixtures.py
+++ b/fixtures.py
@@ -58,18 +58,6 @@ def get_gpu_transformed_weno():
 
 
 
-def with_root_kernel(prg, root_name):
-    # FIXME This is a little less beautiful than it could be
-    new_prg = prg.copy(name=root_name)
-    for name in prg:
-        clbl = new_prg[name]
-        if isinstance(clbl, lp.LoopKernel) and clbl.is_called_from_host:
-            new_prg = new_prg.with_kernel(clbl.copy(is_called_from_host=False))
-
-    new_prg = new_prg.with_kernel(prg[root_name].copy(is_called_from_host=True))
-    return new_prg
-
-
 def get_weno_program():
     if _WENO_PRG:
         return _WENO_PRG[0]
diff --git a/kernel_fixtures.py b/kernel_fixtures.py
index 610e469..cbef8a3 100644
--- a/kernel_fixtures.py
+++ b/kernel_fixtures.py
@@ -5,10 +5,22 @@ import loopy as lp  # noqa
 import fixtures
 
 
+def with_root_kernel(prg, root_name):
+    # FIXME This is a little less beautiful than it could be
+    new_prg = prg.copy(name=root_name)
+    for name in prg:
+        clbl = new_prg[name]
+        if isinstance(clbl, lp.LoopKernel) and clbl.is_called_from_host:
+            new_prg = new_prg.with_kernel(clbl.copy(is_called_from_host=False))
+
+    new_prg = new_prg.with_kernel(prg[root_name].copy(is_called_from_host=True))
+    return new_prg
+
+
 def mult_mat_vec(queue, prg, alpha, a, b):
     c_dev = cl.array.empty(queue, 10, dtype=np.float32)
 
-    prg = fixtures.with_root_kernel(prg, "mult_mat_vec")
+    prg = with_root_kernel(prg, "mult_mat_vec")
     prg(queue, a=a, b=b, c=c_dev, alpha=alpha)
 
     return c_dev.get()
-- 
GitLab