From df700d134f44de63a61347a08438d9c58e3df3e8 Mon Sep 17 00:00:00 2001
From: Kaushik Kulkarni <kaushikcfd@gmail.com>
Date: Wed, 26 May 2021 09:43:24 -0500
Subject: [PATCH] use make_callable_name_generator instead of construction
 UniqueNameGenerator by hand

make_callable_name_generator is better as it also accounts for possible
collissions with substitution rule names
---
 loopy/codegen/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/loopy/codegen/__init__.py b/loopy/codegen/__init__.py
index 86e18de34..0a849b44e 100644
--- a/loopy/codegen/__init__.py
+++ b/loopy/codegen/__init__.py
@@ -606,15 +606,15 @@ def diverge_callee_entrypoints(program):
     entrypoint and a callee, then rename the callee.
     """
     from loopy.translation_unit import (get_reachable_resolved_callable_ids,
-                                        rename_resolved_functions_in_a_single_kernel)
-    from pytools import UniqueNameGenerator
+                                        rename_resolved_functions_in_a_single_kernel,
+                                        make_callable_name_generator)
     callable_ids = get_reachable_resolved_callable_ids(program.callables_table,
                                                        program.entrypoints)
 
     new_callables = {}
     todo_renames = {}
 
-    vng = UniqueNameGenerator(set(program.callables_table.keys()))
+    vng = make_callable_name_generator(program.callables_table)
 
     for clbl_id in callable_ids & program.entrypoints:
         todo_renames[clbl_id] = vng(based_on=clbl_id)
-- 
GitLab