From 5979b90a25ed511c65fac3cf3bbf46c13c73d578 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Thu, 29 Mar 2012 01:32:33 -0400
Subject: [PATCH] Be more flexible when accepting shape tuples of arrays: ("n",
 expr) is now ok.

---
 loopy/kernel.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/loopy/kernel.py b/loopy/kernel.py
index 4c90e1eec..bef788c0d 100644
--- a/loopy/kernel.py
+++ b/loopy/kernel.py
@@ -141,13 +141,19 @@ class ArrayArg:
                 shape = (shape,)
 
         if shape is not None:
-            if isinstance(shape, str):
-                from pymbolic import parse
-                shape = parse(shape)
+            def parse_if_necessary(x):
+                if isinstance(x, str):
+                    from pymbolic import parse
+                    return parse(x)
+                else:
+                    return x
 
+            shape = parse_if_necessary(shape)
             if not isinstance(shape, tuple):
                 shape = (shape,)
 
+            shape = tuple(parse_if_necessary(si) for si in shape)
+
             from pyopencl.compyte.array import (
                     f_contiguous_strides,
                     c_contiguous_strides)
-- 
GitLab