From 154e5070d96aff4002aef228a30f227796de979f Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Thu, 19 Oct 2017 19:24:27 -0500
Subject: [PATCH] Fix TempVar.update_persistent_hashh to inlcude scope,
 base_storage and aliasing attributes

---
 loopy/kernel/data.py | 14 ++++++++++++++
 loopy/version.py     |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/loopy/kernel/data.py b/loopy/kernel/data.py
index 44cbdea49..96933f57a 100644
--- a/loopy/kernel/data.py
+++ b/loopy/kernel/data.py
@@ -534,6 +534,8 @@ class TemporaryVariable(ArrayBase):
         self.update_persistent_hash_for_shape(key_hash, key_builder,
                 self.storage_shape)
         key_builder.rec(key_hash, self.base_indices)
+        key_builder.rec(key_hash, self.scope)
+        key_builder.rec(key_hash, self.base_storage)
 
         initializer = self.initializer
         if initializer is not None:
@@ -541,10 +543,22 @@ class TemporaryVariable(ArrayBase):
         key_builder.rec(key_hash, initializer)
 
         key_builder.rec(key_hash, self.read_only)
+        key_builder.rec(key_hash, self._base_storage_access_may_be_aliasing)
 
 # }}}
 
 
+def iname_tag_to_temp_var_scope(iname_tag):
+    iname_tag = parse_tag(iname_tag)
+
+    if isinstance(iname_tag, GroupIndexTag):
+        return temp_var_scope.GLOBAL
+    elif isinstance(iname_tag, LocalIndexTag):
+        return temp_var_scope.LOCAL
+    else:
+        return temp_var_scope.PRIVATE
+
+
 # {{{ substitution rule
 
 class SubstitutionRule(ImmutableRecord):
diff --git a/loopy/version.py b/loopy/version.py
index ff92ae26d..5e07e979f 100644
--- a/loopy/version.py
+++ b/loopy/version.py
@@ -32,4 +32,4 @@ except ImportError:
 else:
     _islpy_version = islpy.version.VERSION_TEXT
 
-DATA_MODEL_VERSION = "v67-islpy%s" % _islpy_version
+DATA_MODEL_VERSION = "v68-islpy%s" % _islpy_version
-- 
GitLab