From 26ccb262eab73b9a6648f0568ebf525e48b3a293 Mon Sep 17 00:00:00 2001
From: Matt Wala <wala1@illinois.edu>
Date: Wed, 23 Jan 2019 15:20:56 -0600
Subject: [PATCH] Fix the case that temp_var_type is supplied as a dtype

---
 loopy/kernel/instruction.py | 47 +++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/loopy/kernel/instruction.py b/loopy/kernel/instruction.py
index 6b0fa64db..bfc06cff5 100644
--- a/loopy/kernel/instruction.py
+++ b/loopy/kernel/instruction.py
@@ -933,14 +933,7 @@ class Assignment(MultiAssignmentBase):
         self.assignee = assignee
         self.expression = expression
 
-        import loopy as lp
-        if temp_var_type is lp.auto:
-            warn("temp_var_type should be Optional(None) if "
-                 "unspecified, not auto. This usage will be disallowed soon.",
-                 DeprecationWarning, stacklevel=2)
-            temp_var_type = lp.Optional(None)
-
-        self.temp_var_type = temp_var_type
+        self.temp_var_type = _check_and_fix_temp_var_type(temp_var_type)
         self.atomicity = atomicity
 
     # {{{ implement InstructionBase interface
@@ -1092,18 +1085,8 @@ class CallInstruction(MultiAssignmentBase):
         if temp_var_types is None:
             self.temp_var_types = (Optional(),) * len(self.assignees)
         else:
-            import loopy as lp
-            processed_temp_var_types = []
-            for temp_var_type in temp_var_types:
-                if temp_var_type is lp.auto:
-                    warn("temp_var_type should be Optional(None) if "
-                         "unspecified, not auto. "
-                         "This usage will be disallowed soon.",
-                         DeprecationWarning, stacklevel=2)
-                    temp_var_type = lp.Optional(None)
-                processed_temp_var_types.append(temp_var_type)
-
-            self.temp_var_types = tuple(processed_temp_var_types)
+            self.temp_var_types = tuple(
+                    _check_and_fix_temp_var_type(tvt) for tvt in temp_var_types)
 
     # {{{ implement InstructionBase interface
 
@@ -1512,4 +1495,28 @@ def _get_insn_hash_key(insn):
 # }}}
 
 
+# {{{ _check_and_fix_temp_var_type
+
+def _check_and_fix_temp_var_type(temp_var_type):
+    """Check temp_var_type for deprecated usage, and convert to the right value.
+    """
+
+    if temp_var_type is not None:
+        import loopy as lp
+        if temp_var_type is lp.auto:
+            warn("temp_var_type should be Optional(None) if "
+                 "unspecified, not auto. This usage will be disallowed soon.",
+                 DeprecationWarning, stacklevel=3)
+            temp_var_type = lp.Optional(None)
+        elif not isinstance(temp_var_type, lp.Optional):
+            warn("temp_var_type should be None or an instance of Optional. "
+                 "Other values for temp_var_type will be disallowed soon.",
+                 DeprecationWarning, stacklevel=3)
+            temp_var_type = lp.Optional(temp_var_type)
+
+    return temp_var_type
+
+# }}}
+
+
 # vim: foldmethod=marker
-- 
GitLab