ruff fixes, revert broken change

inducer · dsding2 · Jun 2, 2025 · Jun 2, 2025 · Jun 4, 2025 · Jun 5, 2025
commit 612b2381c648b05baf433457298b4721f497a37e
diff --git a/loopy/schedule/tools.py b/loopy/schedule/tools.py
@@ -182,9 +182,12 @@ def get_sched_index_to_first_and_last_used(
         kernel: LoopKernel
     ) -> tuple[dict[int, frozenset[str]], dict[int, frozenset[str]]]:
     """
-    Returns the tuple (first_used, last_used), where first_used is a dict such that
-    first_used[sched_index] is the set of all temporary variable names first used at sched_index.
-    Likewise, last_used[sched_index] is the set of all temporary variable names last used at sched_index.
+    Returns the tuple (first_used, last_used), where first_used is
+    a dict such that first_used[sched_index] is the set of all temporary
+    variable names first used at sched_index.
+
+    Likewise, last_used[sched_index] is the set of all temporary variable names
+    last used at sched_index.
     """
     from loopy.kernel.data import AddressSpace
     from loopy.schedule import CallKernel, EnterLoop
@@ -221,7 +224,7 @@ def get_temporaries_in_bounds(
     sched_index = 0
     while sched_index < len(kernel.linearization):
         sched_item = kernel.linearization[sched_index]
-        if isinstance(sched_item, EnterLoop) or isinstance(sched_item, CallKernel):
+        if isinstance(sched_item, (EnterLoop, CallKernel)):
             if isinstance(sched_item, CallKernel):
                 block_end = block_boundaries[sched_index]
                 accessed_temporaries = (

diff --git a/loopy/target/pyopencl.py b/loopy/target/pyopencl.py
@@ -849,7 +849,9 @@ def get_temporary_decl_at_index(
             self, codegen_state: CodeGenerationState, sched_index: int
         ) -> tuple[genpy.Generable | None, genpy.Generable | None]:
         from loopy.schedule.tools import get_sched_index_to_first_and_last_used
-        first_accesses, last_accesses = get_sched_index_to_first_and_last_used(codegen_state.kernel)
+        first_accesses, last_accesses = get_sched_index_to_first_and_last_used(
+            codegen_state.kernel
+        )
         prefixes, suffixes = None, None
         if sched_index in first_accesses:
             prefix_lines: list[genpy.Generable] = []
@@ -910,8 +912,10 @@ def get_kernel_call(
             gsize: tuple[Expression, ...], lsize: tuple[Expression, ...]
             ) -> genpy.Suite:
         from genpy import Assert, Assign, Comment, Line, Suite
+        from pymbolic.mapper.stringifier import PREC_NONE
 
         kernel = codegen_state.kernel
+        ecm = self.get_expression_to_code_mapper(codegen_state)
 
         from loopy.schedule.tools import get_subkernel_arg_info
         skai = get_subkernel_arg_info(kernel, subkernel_name)

diff --git a/test/test_loopy.py b/test/test_loopy.py
@@ -3742,7 +3742,7 @@ def test_temporary_memory_allocation(ctx_factory: cl.CtxFactory):
 
     a = np.arange(n, dtype=np.float32)
     knl(cq, a=a, allocator=mem_pool_alloc)
-    
+
     # FIXME This relies on the memory pool not freeing any memory it allocates
     assert mem_pool_alloc.managed_bytes < len(temp_vars) * a.nbytes