Enable ruff.isort

Author: inducer

experiments/traversal-benchmark.py

@@ -3,9 +3,9 @@
 import sys
 
 from pymbolic import parse
-from pymbolic.primitives import Variable
 from pymbolic.mapper import CachedIdentityMapper
 from pymbolic.mapper.optimize import optimize_mapper
+from pymbolic.primitives import Variable
 
 
 code = ("(-1)*((cse_577[_pt_data_48[((iface_ensm15*1075540 + iel_ensm15*10 + idof_ensm15) % 4302160) // 10, 0],"

pymbolic/__init__.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 __copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"
 
 __license__ = """

pymbolic/algorithm.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 __copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"
 
 __license__ = """
@@ -223,7 +226,7 @@ def sym_fft(x, sign=1):
     wrappers at opportune points.
     """
 
-    from pymbolic.mapper import IdentityMapper, CSECachingMapperMixin
+    from pymbolic.mapper import CSECachingMapperMixin, IdentityMapper
 
     class NearZeroKiller(CSECachingMapperMixin, IdentityMapper):
         map_common_subexpression_uncached = \

pymbolic/compiler.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 __copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"
 
 __license__ = """
@@ -21,10 +24,9 @@
 """
 
 import math
+
 import pymbolic
-from pymbolic.mapper.stringifier import (
-        StringifyMapper, PREC_NONE,
-        PREC_SUM, PREC_POWER)
+from pymbolic.mapper.stringifier import PREC_NONE, PREC_POWER, PREC_SUM, StringifyMapper
 
 
 class CompileMapper(StringifyMapper):

pymbolic/cse.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 __copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"
 
 __license__ = """
@@ -23,6 +26,7 @@
 import pymbolic.primitives as prim
 from pymbolic.mapper import IdentityMapper, WalkMapper
 
+
 COMMUTATIVE_CLASSES = (prim.Sum, prim.Product)
 
 

pymbolic/functions.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 __copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"
 
 __license__ = """

pymbolic/geometric_algebra/__init__.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 __copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"
 
 __license__ = """
@@ -20,9 +23,10 @@
 THE SOFTWARE.
 """
 
-from pytools import memoize, memoize_method
 import numpy as np
 
+from pytools import memoize, memoize_method
+
 
 __doc__ = """
 See `Wikipedia <https://en.wikipedia.org/wiki/Geometric_algebra>`__ for an idea
@@ -536,6 +540,7 @@ def __init__(self, data, space=None):
         # {{{ normalize data to bitmaps, if needed
 
         from pytools import single_valued
+
         from pymbolic.primitives import is_zero
         if data and single_valued(isinstance(k, tuple) for k in data.keys()):
             # data is in non-normalized non-bits tuple form

pymbolic/geometric_algebra/mapper.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 __copyright__ = "Copyright (C) 2014 Andreas Kloeckner"
 
 __license__ = """
@@ -23,27 +26,26 @@
 # This is experimental, undocumented, and could go away any second.
 # Consider yourself warned.
 
-from typing import ClassVar, Dict
+from typing import ClassVar
 
-from pymbolic.geometric_algebra import MultiVector
 import pymbolic.geometric_algebra.primitives as prim
+from pymbolic.geometric_algebra import MultiVector
 from pymbolic.mapper import (
-        CombineMapper as CombineMapperBase,
-        Collector as CollectorBase,
-        IdentityMapper as IdentityMapperBase,
-        WalkMapper as WalkMapperBase,
-        CachedMapper,
-        )
+    CachedMapper,
+    Collector as CollectorBase,
+    CombineMapper as CombineMapperBase,
+    IdentityMapper as IdentityMapperBase,
+    WalkMapper as WalkMapperBase,
+)
 from pymbolic.mapper.constant_folder import (
-        ConstantFoldingMapper as ConstantFoldingMapperBase)
-from pymbolic.mapper.graphviz import (
-        GraphvizMapper as GraphvizMapperBase)
+    ConstantFoldingMapper as ConstantFoldingMapperBase,
+)
+from pymbolic.mapper.evaluator import EvaluationMapper as EvaluationMapperBase
+from pymbolic.mapper.graphviz import GraphvizMapper as GraphvizMapperBase
 from pymbolic.mapper.stringifier import (
-        StringifyMapper as StringifyMapperBase,
-        PREC_NONE
-        )
-from pymbolic.mapper.evaluator import (
-        EvaluationMapper as EvaluationMapperBase)
+    PREC_NONE,
+    StringifyMapper as StringifyMapperBase,
+)
 
 
 class IdentityMapper(IdentityMapperBase):
@@ -105,7 +107,7 @@ def map_derivative_source(self, expr):
 
 
 class StringifyMapper(StringifyMapperBase):
-    AXES: ClassVar[Dict[int, str]] = {0: "x", 1: "y", 2: "z"}
+    AXES: ClassVar[dict[int, str]] = {0: "x", 1: "y", 2: "z"}
 
     def map_nabla(self, expr, enclosing_prec):
         return f"∇[{expr.nabla_id}]"

pymbolic/geometric_algebra/primitives.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 __copyright__ = "Copyright (C) 2014 Andreas Kloeckner"
 
 __license__ = """
@@ -23,7 +26,7 @@
 # This is experimental, undocumented, and could go away any second.
 # Consider yourself warned.
 
-from typing import ClassVar, Hashable, List
+from typing import ClassVar, Hashable
 
 from pymbolic.primitives import Expression, Variable, expr_dataclass
 from pymbolic.typing import ExpressionT
@@ -66,7 +69,7 @@ class Derivative:
     .. automethod:: dnabla
     .. automethod:: resolve
     """
-    _next_id: ClassVar[List[int]] = [0]
+    _next_id: ClassVar[list[int]] = [0]
 
     def __init__(self):
         self.my_id = f"id{self._next_id[0]}"
@@ -77,8 +80,9 @@ def nabla(self):
         return Nabla(self.my_id)
 
     def dnabla(self, ambient_dim):
-        from pymbolic.geometric_algebra import MultiVector
         from pytools.obj_array import make_obj_array
+
+        from pymbolic.geometric_algebra import MultiVector
         return MultiVector(make_obj_array(
             [NablaComponent(axis, self.my_id)
                 for axis in range(ambient_dim)]))

pymbolic/imperative/__init__.py

@@ -1,4 +1,6 @@
 """Imperative program representation"""
+from __future__ import annotations
+
 
 __copyright__ = "Copyright (C) 2015 Matt Wala, Andreas Kloeckner"
 

pymbolic/imperative/analysis.py

@@ -1,4 +1,6 @@
 """Fusion and other user-facing code transforms"""
+from __future__ import annotations
+
 
 __copyright__ = "Copyright (C) 2015 Matt Wala, Andreas Kloeckner"
 

pymbolic/imperative/instruction.py

@@ -1,4 +1,6 @@
 """Instruction types"""
+from __future__ import annotations
+
 
 __copyright__ = "Copyright (C) 2015 Matt Wala, Andreas Kloeckner"
 
@@ -29,5 +31,9 @@
         "to pymbolic.imperative.statement", DeprecationWarning, stacklevel=1)
 
 from pymbolic.imperative.statement import (  # noqa: F401
-        Instruction, ConditionalInstruction, Assignment, ConditionalAssignment,
-        Nop)
+        Assignment,
+        ConditionalAssignment,
+        ConditionalInstruction,
+        Instruction,
+        Nop,
+)

pymbolic/imperative/statement.py

@@ -1,4 +1,6 @@
 """Instruction types"""
+from __future__ import annotations
+
 
 __copyright__ = "Copyright (C) 2015 Matt Wala, Andreas Kloeckner"
 
@@ -23,7 +25,9 @@
 """
 
 from sys import intern
+
 from pytools import RecordWithoutPickling
+
 from pymbolic.typing import not_none
 
 
@@ -136,7 +140,7 @@ def __init__(self, lhs, rhs, **kwargs):
                 **kwargs)
 
     def get_written_variables(self):
-        from pymbolic.primitives import Variable, Subscript
+        from pymbolic.primitives import Subscript, Variable
         if isinstance(self.lhs, Variable):
             return frozenset([self.lhs.name])
         elif isinstance(self.lhs, Subscript):

pymbolic/imperative/transform.py

@@ -1,4 +1,6 @@
 """Imperative program representation: transformations"""
+from __future__ import annotations
+
 
 __copyright__ = "Copyright (C) 2015 Matt Wala, Andreas Kloeckner"
 
@@ -85,8 +87,7 @@ def should_disambiguate_name(name):  # pylint:disable=function-redefined
             unclash = vng(clash)
             subst_b[clash] = var(unclash)
 
-    from pymbolic.mapper.substitutor import (
-            make_subst_func, SubstitutionMapper)
+    from pymbolic.mapper.substitutor import SubstitutionMapper, make_subst_func
     subst_map = SubstitutionMapper(make_subst_func(subst_b))
 
     statements_b = [

pymbolic/imperative/utils.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 __copyright__ = """
 Copyright (C) 2013 Andreas Kloeckner
 Copyright (C) 2014 Matt Wala
@@ -24,6 +27,8 @@
 """
 
 import logging
+
+
 logger = logging.getLogger(__name__)
 
 

pymbolic/interop/ast.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 __copyright__ = """
 Copyright (C) 2015 Andreas Kloeckner
 Copyright (C) 2022 Kaushik Kulkarni
@@ -24,11 +27,12 @@
 """
 
 import ast
-from typing import Any, ClassVar, Dict, List, Tuple, Type
+from typing import Any, ClassVar
 
 import pymbolic.primitives as p
-from pymbolic.typing import ExpressionT, ScalarT
 from pymbolic.mapper import CachedMapper
+from pymbolic.typing import ExpressionT, ScalarT
+
 
 __doc__ = r'''
 
@@ -113,7 +117,7 @@ def _neg(x):
 
 class ASTToPymbolic(ASTMapper):
 
-    bin_op_map: ClassVar[Dict[Type[ast.operator], Any]] = {
+    bin_op_map: ClassVar[dict[type[ast.operator], Any]] = {
             ast.Add: _add,
             ast.Sub: _sub,
             ast.Mult: _mult,
@@ -139,7 +143,7 @@ def map_BinOp(self, expr):  # noqa
 
         return op_constructor(self.rec(expr.left), self.rec(expr.right))
 
-    unary_op_map: ClassVar[Dict[Type[ast.unaryop], Any]] = {
+    unary_op_map: ClassVar[dict[type[ast.unaryop], Any]] = {
             ast.Invert: _neg,
             ast.Not: p.LogicalNot,
             # ast.UAdd:
@@ -160,7 +164,7 @@ def map_IfExp(self, expr):  # noqa
         # (expr test, expr body, expr orelse)
         return p.If(self.rec(expr.test), self.rec(expr.body), self.rec(expr.orelse))
 
-    comparison_op_map: ClassVar[Dict[Type[ast.cmpop], str]] = {
+    comparison_op_map: ClassVar[dict[type[ast.cmpop], str]] = {
             ast.Eq: "==",
             ast.NotEq: "!=",
             ast.Lt: "<",
@@ -264,7 +268,7 @@ def map_variable(self, expr) -> ast.expr:
         return ast.Name(id=expr.name)
 
     def _map_multi_children_op(self,
-                               children: Tuple[ExpressionT, ...],
+                               children: tuple[ExpressionT, ...],
                                op_type: ast.operator) -> ast.expr:
         rec_children = [self.rec(child) for child in children]
         result = rec_children[-1]
@@ -366,10 +370,10 @@ def map_logical_and(self, expr) -> ast.expr:
         return ast.BoolOp(ast.And(), [self.rec(child)
                                      for child in expr.children])
 
-    def map_list(self, expr: List[Any]) -> ast.expr:
+    def map_list(self, expr: list[Any]) -> ast.expr:
         return ast.List([self.rec(el) for el in expr])
 
-    def map_tuple(self, expr: Tuple[Any, ...]) -> ast.expr:
+    def map_tuple(self, expr: tuple[Any, ...]) -> ast.expr:
         return ast.Tuple([self.rec(el) for el in expr])
 
     def map_if(self, expr: p.If) -> ast.expr:
@@ -465,6 +469,7 @@ def foo(*, E, S):
             return S // 32 + E % 32
     """
     import sys
+
     from pymbolic.mapper.dependency import CachedDependencyMapper
 
     if sys.version_info < (3, 9):

pymbolic/interop/common.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 __copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"
 
 __license__ = """
@@ -20,9 +23,10 @@
 THE SOFTWARE.
 """
 
+from functools import partial
+
 import pymbolic.primitives as prim
 from pymbolic.mapper.evaluator import EvaluationMapper
-from functools import partial
 
 
 class SympyLikeMapperBase: