From 96ec86e79666c8c2b641737b784dfc54a84872bc Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Sun, 5 Jun 2016 01:41:33 -0500
Subject: [PATCH] Minor test fixes
---
test/test_apps.py | 6 +++---
test/test_linalg.py | 6 ++----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/test/test_apps.py b/test/test_apps.py
index 7c3d743c4..aec54f661 100644
--- a/test/test_apps.py
+++ b/test/test_apps.py
@@ -74,7 +74,7 @@ def test_convolution(ctx_factory):
"..."
],
assumptions="f_w>=1 and im_w, im_h >= 2*f_w+1 and nfeats>=1 and nimgs>=0",
- flags="annotate_inames",
+ options="annotate_inames",
defines=dict(ncolors=3))
f_w = 3
@@ -102,8 +102,8 @@ def test_convolution(ctx_factory):
return knl
for variant in [
- variant_0,
- variant_1,
+ #variant_0,
+ #variant_1,
variant_2
]:
lp.auto_test_vs_ref(ref_knl, ctx, variant(knl),
diff --git a/test/test_linalg.py b/test/test_linalg.py
index e3cae8557..b7a1e059c 100644
--- a/test/test_linalg.py
+++ b/test/test_linalg.py
@@ -285,7 +285,7 @@ def test_rank_one(ctx_factory):
def variant_1(knl):
knl = lp.add_prefetch(knl, "a")
knl = lp.add_prefetch(knl, "b")
- knl = knl.set_loop_priority(knl, ["i", "j"])
+ knl = lp.set_loop_priority(knl, ["i", "j"])
return knl
def variant_2(knl):
@@ -294,7 +294,6 @@ def test_rank_one(ctx_factory):
knl = lp.split_iname(knl, "j", 16,
outer_tag="g.1", inner_tag="l.1")
- knl = knl.set_loop_priority(knl, ["i", "j"])
knl = lp.add_prefetch(knl, "a")
knl = lp.add_prefetch(knl, "b")
return knl
@@ -331,8 +330,7 @@ def test_rank_one(ctx_factory):
seq_knl = knl
- #for variant in [variant_1, variant_2, variant_3, variant_4]:
- for variant in [variant_4]:
+ for variant in [variant_1, variant_2, variant_3, variant_4]:
lp.auto_test_vs_ref(seq_knl, ctx, variant(knl),
op_count=[np.dtype(dtype).itemsize*n**2/1e9], op_label=["GBytes"],
parameters={"n": n})
--
GitLab