From a42c18dec79f4a3cd593716f68fc4abb68e6c00f Mon Sep 17 00:00:00 2001
From: Matt Wala <wala1@illinois.edu>
Date: Tue, 17 May 2016 15:42:01 -0500
Subject: [PATCH] Restore name generator.

---
 loopy/schedule/device_mapping.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/loopy/schedule/device_mapping.py b/loopy/schedule/device_mapping.py
index 6b56ca67a..c877f1c17 100644
--- a/loopy/schedule/device_mapping.py
+++ b/loopy/schedule/device_mapping.py
@@ -669,8 +669,10 @@ def map_schedule_onto_host_or_device_impl(kernel):
 
     # Assign names, inames to CallKernel / ReturnFromKernel instructions
     inames = []
-    from pytools import UniqueNameGenerator
-    kernel_name_gen = UniqueNameGenerator(forced_prefix=kernel.name)
+    from functools import partial
+    kernel_name_gen = partial(
+                kernel.get_var_name_generator(),
+                kernel.name + kernel.target.device_program_name_suffix)
     for idx, sched_item in enumerate(new_schedule):
         if isinstance(sched_item, CallKernel):
             last_kernel_name = kernel_name_gen()
-- 
GitLab