From 4ccb514fb1d248ec4c56ff6b0819e20ed927d4ab Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Thu, 30 Apr 2015 13:51:56 -0500
Subject: [PATCH] Make sure that augment_domain_with_sweep inserts inames at
 the back

---
 loopy/array_buffer_map.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/loopy/array_buffer_map.py b/loopy/array_buffer_map.py
index 918942127..0be16ce5b 100644
--- a/loopy/array_buffer_map.py
+++ b/loopy/array_buffer_map.py
@@ -303,8 +303,7 @@ class ArrayToBufferMap(object):
             boxify_sweep=False):
 
         renamed_aug_domain = self.aug_domain
-        first_storage_index = (
-                renamed_aug_domain.dim(dim_type.set)
+        first_storage_index = (renamed_aug_domain.dim(dim_type.set)
                 - len(self.non1_storage_shape))
 
         inon1 = 0
@@ -323,7 +322,10 @@ class ArrayToBufferMap(object):
 
             inon1 += 1
 
-        domain, renamed_aug_domain = isl.align_two(domain, renamed_aug_domain)
+        # Order of arguments to align_two matters--'domain' should be the
+        # 'guiding' ordering.
+        renamed_aug_domain, domain = isl.align_two(renamed_aug_domain, domain)
+
         domain = domain & renamed_aug_domain
 
         from loopy.isl_helpers import convexify, boxify
-- 
GitLab