From ee0ec76042b89fdd7bfceeebd5e100ec212d4164 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Wed, 28 Aug 2019 12:45:11 -0500
Subject: [PATCH 1/2] Fix error msg typo

---
 loopy/check.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/loopy/check.py b/loopy/check.py
index e11aafab0..81b384a38 100644
--- a/loopy/check.py
+++ b/loopy/check.py
@@ -73,7 +73,7 @@ class SubscriptIndicesIsIntChecker(TypeInferenceMapper):
     def map_subscript(self, expr):
         for idx in expr.index_tuple:
             if not self.rec(idx)[0].is_integral():
-                raise LoopyError("Non integral array indices obtained in"
+                raise LoopyError("Non-integral array indices obtained in"
                         " {}.".format(expr))
 
         return self.rec(expr.aggregate)
-- 
GitLab


From def571bf7b25a9536dfe3cb91e79249cf6e114a4 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Wed, 28 Aug 2019 12:45:13 -0500
Subject: [PATCH 2/2] Fix test_integer_associativity to not use float division

---
 test/test_expression.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/test/test_expression.py b/test/test_expression.py
index 7a26e7e2e..752d9ab2d 100644
--- a/test/test_expression.py
+++ b/test/test_expression.py
@@ -445,15 +445,23 @@ def test_integer_associativity():
     knl = lp.make_kernel(
             "{[i] : 0<=i<arraylen}",
             """
-            e := (i / (ncomp * elemsize))
-            d := ((i / elemsize) % ncomp)
+            e := (i // (ncomp * elemsize))
+            d := ((i // elemsize) % ncomp)
             s := (i % elemsize)
             v[i] = u[ncomp * indices[(s) + elemsize*(e)] + (d)]
             """)
 
     knl = lp.add_and_infer_dtypes(
             knl, {"u": np.float64, "elemsize, ncomp, indices": np.int32})
-    assert ("elemsize * (i / (ncomp * elemsize))"
+    import islpy as isl
+    knl = lp.assume(
+            knl, isl.BasicSet("[elemsize, ncomp] -> "
+            "{ : elemsize>= 0 and ncomp >= 0}"))
+    print(lp.generate_code_v2(knl).device_code())
+    assert (
+            "u[ncomp * indices[i % elemsize + elemsize "
+            "* loopy_floor_div_int32(i, ncomp * elemsize)] "
+            "+ loopy_mod_pos_b_int32(i / elemsize, ncomp)]"
             in lp.generate_code_v2(knl).device_code())
 
 
-- 
GitLab