From 6d93cbb5356fcd3819b0fe4dbe2ada0e9c436f4a Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Sun, 17 Dec 2017 17:44:40 -0600
Subject: [PATCH] Move GridOverride to testlib from
test_barrier_in_overridden_get_grid_size_expanded_kernel
---
test/test_loopy.py | 11 ++---------
test/testlib.py | 16 ++++++++++++++++
2 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/test/test_loopy.py b/test/test_loopy.py
index b78c754bd..e624ed346 100644
--- a/test/test_loopy.py
+++ b/test/test_loopy.py
@@ -2462,16 +2462,9 @@ def test_barrier_in_overridden_get_grid_size_expanded_kernel():
vecsize = 16
knl = lp.split_iname(knl, 'i', vecsize, inner_tag='l.0')
- # artifically expand via overridden_get_grid_sizes_for_insn_ids
- class GridOverride(object):
- def __init__(self, clean, vecsize=vecsize):
- self.clean = clean
- self.vecsize = vecsize
-
- def __call__(self, insn_ids, ignore_auto=True):
- gsize, _ = self.clean.get_grid_sizes_for_insn_ids(insn_ids, ignore_auto)
- return gsize, (self.vecsize,)
+ from testlib import GridOverride
+ # artifically expand via overridden_get_grid_sizes_for_insn_ids
knl = knl.copy(overridden_get_grid_sizes_for_insn_ids=GridOverride(
knl.copy(), vecsize))
# make sure we can generate the code
diff --git a/test/testlib.py b/test/testlib.py
index 3fae05a38..73de4199d 100644
--- a/test/testlib.py
+++ b/test/testlib.py
@@ -1,6 +1,20 @@
import loopy as lp
+# {{{ test_barrier_in_overridden_get_grid_size_expanded_kernel
+
+class GridOverride(object):
+ def __init__(self, clean, vecsize):
+ self.clean = clean
+ self.vecsize = vecsize
+
+ def __call__(self, insn_ids, ignore_auto=True):
+ gsize, _ = self.clean.get_grid_sizes_for_insn_ids(insn_ids, ignore_auto)
+ return gsize, (self.vecsize,)
+
+# }}}
+
+
# {{{ test_preamble_with_separate_temporaries
class SeparateTemporariesPreambleTestHelper:
@@ -99,3 +113,5 @@ class SeparateTemporariesPreambleTestHelper:
yield (desc, '\n'.join([str(decl), code]))
# }}}
+
+# vim: foldmethod=marker
--
GitLab