From 33e75c6dcd18b9ee4a029b9a81c17e88f36ece8a Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Thu, 23 Apr 2015 14:12:50 -0500
Subject: [PATCH] In buffer_array, deal with instructions that have insn_deps
equal to None when specifying dependencies on the init instruction
---
loopy/buffer.py | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/loopy/buffer.py b/loopy/buffer.py
index c64943f14..d155dba7e 100644
--- a/loopy/buffer.py
+++ b/loopy/buffer.py
@@ -337,11 +337,19 @@ def buffer_array(kernel, var_name, buffer_inames, init_expression=None,
new_insns = []
+ def none_to_empty_set(s):
+ if s is None:
+ return frozenset()
+ else:
+ return s
+
for insn in kernel.instructions:
if insn.id in aar.modified_insn_ids:
new_insns.append(
insn.copy(
- insn_deps=insn.insn_deps | frozenset([init_insn_id])))
+ insn_deps=(
+ none_to_empty_set(insn.insn_deps)
+ | frozenset([init_insn_id]))))
else:
new_insns.append(insn)
--
GitLab